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

Commit 1a3126e0 authored by android-build-team Robot's avatar android-build-team Robot
Browse files

Snap for 4704169 from 0b9a2845 to qt-release 

Change-Id: Iaeeb44a38405b424eaefc3c160dcc5d40e4f8f55
parents a1bdd9a0 0b9a2845

Android.mk

+18 −12
Original line number Diff line number Diff line
@@ -11,19 +11,25 @@ LOCAL_OVERRIDES_PACKAGES := AlarmClock 


LOCAL_SRC_FILES := $(call all-java-files-under, src gen)



LOCAL_STATIC_JAVA_LIBRARIES := \

        androidx.annotation_annotation \

        androidx.collection_collection \

        androidx.arch.core_core-common \

        androidx.lifecycle_lifecycle-common \



LOCAL_STATIC_ANDROID_LIBRARIES := \

        $(ANDROID_SUPPORT_DESIGN_TARGETS) \

        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.design_design \

        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



LOCAL_USE_AAPT2 := true

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"