From 39874a8c0d22f58ab5eda9ba6dc81dcfa8c22125 Mon Sep 17 00:00:00 2001
From: malinajirka <malinajirka@gmail.com>
Date: Tue, 21 May 2019 09:54:41 +0200
Subject: [PATCH] Fix import ordering for androidx

---
 .idea/codeStyles/Project.xml     | 2 ++
 config/checkstyle.xml            | 2 +-
 libs/login/config/checkstyle.xml | 2 +-
 libs/utils/config/checkstyle.xml | 2 +-
 4 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/.idea/codeStyles/Project.xml b/.idea/codeStyles/Project.xml
index 98147e59085d..40146908b459 100644
--- a/.idea/codeStyles/Project.xml
+++ b/.idea/codeStyles/Project.xml
@@ -17,6 +17,8 @@
         <value>
           <package name="android" withSubpackages="true" static="false" />
           <emptyLine />
+          <package name="androidx" withSubpackages="true" static="false" />
+          <emptyLine />
           <package name="com" withSubpackages="true" static="false" />
           <emptyLine />
           <package name="junit" withSubpackages="true" static="false" />
diff --git a/config/checkstyle.xml b/config/checkstyle.xml
index 391dbe28f4fc..7e0f4d19236a 100644
--- a/config/checkstyle.xml
+++ b/config/checkstyle.xml
@@ -162,7 +162,7 @@
         </module>
 
         <module name="ImportOrder">
-            <property name="groups" value="android,com,junit,net,org,java,javax"/>
+            <property name="groups" value="android,androidx,com,junit,net,org,java,javax"/>
             <property name="ordered" value="false"/>
             <property name="separated" value="true"/>
             <property name="option" value="bottom"/>
diff --git a/libs/login/config/checkstyle.xml b/libs/login/config/checkstyle.xml
index ae088941c51b..2ebaaac1412c 100644
--- a/libs/login/config/checkstyle.xml
+++ b/libs/login/config/checkstyle.xml
@@ -154,7 +154,7 @@
         </module>
 
         <module name="ImportOrder">
-            <property name="groups" value="android,com,junit,net,org,java,javax"/>
+            <property name="groups" value="android,androidx,com,junit,net,org,java,javax"/>
             <property name="ordered" value="false"/>
             <property name="separated" value="true"/>
             <property name="option" value="bottom"/>
diff --git a/libs/utils/config/checkstyle.xml b/libs/utils/config/checkstyle.xml
index ae088941c51b..2ebaaac1412c 100644
--- a/libs/utils/config/checkstyle.xml
+++ b/libs/utils/config/checkstyle.xml
@@ -154,7 +154,7 @@
         </module>
 
         <module name="ImportOrder">
-            <property name="groups" value="android,com,junit,net,org,java,javax"/>
+            <property name="groups" value="android,androidx,com,junit,net,org,java,javax"/>
             <property name="ordered" value="false"/>
             <property name="separated" value="true"/>
             <property name="option" value="bottom"/>