Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6ca7acc4 authored by KOUSHIK PANUGANTI's avatar KOUSHIK PANUGANTI
Browse files

Migrated various apps under packages/apps/DocumentsUI/ to androidx 

Bug: 76692459
Test: mmma packages/apps/DocumentsUI
Change-Id: Ie4d4dc1fc15c27a567d47ce28baec26ab5076f83
parent e9e858a9

app-perf-tests/Android.mk

+1 −1
Original line number Diff line number Diff line
@@ -8,7 +8,7 @@ LOCAL_PRIVATE_PLATFORM_APIS := true 
LOCAL_SRC_FILES := $(call all-java-files-under, src) \



LOCAL_JAVA_LIBRARIES := android.test.runner android.test.base

LOCAL_STATIC_ANDROID_LIBRARIES := android-support-v4

LOCAL_STATIC_ANDROID_LIBRARIES := androidx.legacy_legacy-support-v4

LOCAL_STATIC_JAVA_LIBRARIES := \

    mockito-target \

    ub-uiautomator

build_apk.mk

+7 −7
Original line number Diff line number Diff line
@@ -4,13 +4,13 @@ LOCAL_PRIVILEGED_MODULE := true 
LOCAL_STATIC_JAVA_LIBRARIES += guava



LOCAL_STATIC_ANDROID_LIBRARIES := \

        android-support-core-ui \

        android-support-v4 \

        android-support-v7-appcompat \

        android-support-v13 \

        $(ANDROID_SUPPORT_DESIGN_TARGETS) \

        android-support-transition \

        android-support-v7-recyclerview

        androidx.legacy_legacy-support-core-ui \

        androidx.legacy_legacy-support-v4 \

        androidx.appcompat_appcompat \

        androidx.legacy_legacy-support-v13 \

        androidx.design_design \

        androidx.transition_transition \

        androidx.recyclerview_recyclerview



LOCAL_USE_AAPT2 := true

proguard.flags

+2 −2
Original line number Diff line number Diff line
@@ -13,6 +13,6 @@ 
# limitations under the License.



# Keep

-keep public class android.support.v4.view.accessibility.AccessibilityNodeInfoCompat {

   public static android.support.v4.view.accessibility.AccessibilityNodeInfoCompat obtain();

-keep public class androidx.core.view.accessibility.AccessibilityNodeInfoCompat {

   public static androidx.core.view.accessibility.AccessibilityNodeInfoCompat obtain();

}
 
 No newline at end of file

res/layout/drawer_layout.xml

+4 −4
Original line number Diff line number Diff line
@@ -16,13 +16,13 @@ 


<!-- CoordinatorLayout is necessary for various components (e.g. Snackbars, and

     floating action buttons) to operate correctly. -->

<android.support.design.widget.CoordinatorLayout

<androidx.coordinatorlayout.widget.CoordinatorLayout

    xmlns:android="http://schemas.android.com/apk/res/android"

    android:layout_width="match_parent"

    android:layout_height="match_parent"

    android:id="@+id/coordinator_layout">



    <android.support.v4.widget.DrawerLayout

    <androidx.drawerlayout.widget.DrawerLayout

        android:id="@+id/drawer_layout"

        android:layout_width="match_parent"

        android:layout_height="match_parent">
@@ -95,5 +95,5 @@ 


        </LinearLayout>



    </android.support.v4.widget.DrawerLayout>

</android.support.design.widget.CoordinatorLayout>
 
    </androidx.drawerlayout.widget.DrawerLayout>

</androidx.coordinatorlayout.widget.CoordinatorLayout>

res/layout/fixed_layout.xml

+2 −2
Original line number Diff line number Diff line
@@ -16,7 +16,7 @@ 


<!-- CoordinatorLayout is necessary for various components (e.g. Snackbars, and

     floating action buttons) to operate correctly. -->

<android.support.design.widget.CoordinatorLayout

<androidx.coordinatorlayout.widget.CoordinatorLayout

    xmlns:android="http://schemas.android.com/apk/res/android"

    android:layout_width="match_parent"

    android:layout_height="match_parent"
@@ -65,4 +65,4 @@ 


    </LinearLayout>



</android.support.design.widget.CoordinatorLayout>
 
</androidx.coordinatorlayout.widget.CoordinatorLayout>