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

Commit 3214aa8b authored by Xin Li's avatar Xin Li
Browse files

DO NOT MERGE - Merge qt-dev-plus-aosp-without-vendor (5699924) into stage-aosp-master 

Bug: 134405016
Change-Id: Ide2fd8e3eb44cfe0eeda11752b0221a241762513
parents 95560736 f3b10464

Android.bp

+16 −12
Original line number Diff line number Diff line
@@ -9,18 +9,22 @@ android_app { 
    ],

    product_specific: true,

    static_libs: [

        "android-support-design",

        "android-support-percent",

        "android-support-transition",

        "android-support-compat",

        "android-support-core-ui",

        "android-support-media-compat",

        "android-support-v13",

        "android-support-v14-preference",

        "android-support-v7-appcompat",

        "android-support-v7-gridlayout",

        "android-support-v7-preference",

        "android-support-v7-recyclerview",

        "androidx.annotation_annotation",

        "androidx.collection_collection",

        "androidx.arch.core_core-common",

        "androidx.lifecycle_lifecycle-common",

        "com.google.android.material_material",

        "androidx.lifecycle_lifecycle-runtime",

        "androidx.percentlayout_percentlayout",

        "androidx.transition_transition",

        "androidx.core_core",

        "androidx.legacy_legacy-support-core-ui",

        "androidx.media_media",

        "androidx.legacy_legacy-support-v13",

        "androidx.preference_preference",

        "androidx.appcompat_appcompat",

        "androidx.gridlayout_gridlayout",

        "androidx.recyclerview_recyclerview",

    ],



    aaptflags: ["--legacy"],

res/layout-land/clock_fragment.xml

+1 −1
Original line number Diff line number Diff line
@@ -50,7 +50,7 @@ 
    </LinearLayout>



    <!-- World Clock List: 33% of total width. Right gutter is applied in world_clock_item. -->

    <android.support.v7.widget.RecyclerView

    <androidx.recyclerview.widget.RecyclerView

        android:id="@+id/cities"

        android:layout_width="0dp"

        android:layout_height="wrap_content"

res/layout-land/stopwatch_fragment.xml

+1 −1
Original line number Diff line number Diff line
@@ -44,7 +44,7 @@ 


        </FrameLayout>



        <android.support.v7.widget.RecyclerView

        <androidx.recyclerview.widget.RecyclerView

            android:id="@+id/laps_list"

            android:layout_width="wrap_content"

            android:layout_height="wrap_content"

res/layout-w320dp-h320dp-land/stopwatch_fragment.xml

+1 −1
Original line number Diff line number Diff line
@@ -50,7 +50,7 @@ 


        </com.android.deskclock.TimerCircleFrameLayout>



        <android.support.v7.widget.RecyclerView

        <androidx.recyclerview.widget.RecyclerView

            android:id="@+id/laps_list"

            android:layout_width="wrap_content"

            android:layout_height="wrap_content"

res/layout-w320dp-h320dp/timer_item.xml

+2 −2
Original line number Diff line number Diff line
@@ -22,7 +22,7 @@ 
    android:layout_height="match_parent"

    android:orientation="vertical">



    <android.support.percent.PercentFrameLayout

    <androidx.percentlayout.widget.PercentFrameLayout

        android:layout_width="match_parent"

        android:layout_height="0dp"

        android:layout_weight="1">
@@ -83,7 +83,7 @@ 


        </com.android.deskclock.TimerCircleFrameLayout>



    </android.support.percent.PercentFrameLayout>

    </androidx.percentlayout.widget.PercentFrameLayout>



    <Space

        android:layout_width="match_parent"