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

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

Snap for 4693621 from 8c43f062 to pi-release 

Change-Id: If8ed23e6c5f2a7d3ae484a5a0ab2336ac3d77875
parents 46ebd7eb 8c43f062

Android.mk

+3 −3
Original line number Diff line number Diff line
@@ -31,8 +31,8 @@ LOCAL_SRC_FILES := $(call all-java-files-under, src) 
LOCAL_PROGUARD_FLAG_FILES := proguard.flags



LOCAL_STATIC_JAVA_LIBRARIES := cr

LOCAL_STATIC_ANDROID_LIBRARIES += android-support-v4

LOCAL_STATIC_ANDROID_LIBRARIES += android-support-v7-gridlayout

LOCAL_STATIC_ANDROID_LIBRARIES += android-support-v7-recyclerview

LOCAL_STATIC_ANDROID_LIBRARIES += androidx.legacy_legacy-support-v4

LOCAL_STATIC_ANDROID_LIBRARIES += androidx.gridlayout_gridlayout

LOCAL_STATIC_ANDROID_LIBRARIES += androidx.recyclerview_recyclerview



include $(BUILD_PACKAGE)

res/layout/fragment_history.xml

+1 −1
Original line number Diff line number Diff line
@@ -35,7 +35,7 @@ 
        android:theme="@android:style/ThemeOverlay.Material.Dark.ActionBar"

        android:title="@string/title_history" />



    <android.support.v7.widget.RecyclerView

    <androidx.recyclerview.widget.RecyclerView

        android:id="@+id/history_recycler_view"

        android:layout_width="match_parent"

        android:layout_height="match_parent"

res/layout/pad_advanced_3x5.xml

+2 −2
Original line number Diff line number Diff line
@@ -15,7 +15,7 @@ 
  limitations under the License.

  -->



<android.support.v7.widget.GridLayout

<androidx.gridlayout.widget.GridLayout

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

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

    android:id="@+id/pad_advanced"
@@ -205,4 +205,4 @@ 
        app:layout_row="4"

        app:layout_column="2" />



</android.support.v7.widget.GridLayout>
 
</androidx.gridlayout.widget.GridLayout>

res/layout/pad_advanced_4x4.xml

+2 −2
Original line number Diff line number Diff line
@@ -15,7 +15,7 @@ 
  limitations under the License.

  -->



<android.support.v7.widget.GridLayout

<androidx.gridlayout.widget.GridLayout

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

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

    android:id="@+id/pad_advanced"
@@ -205,4 +205,4 @@ 
        app:layout_row="3"

        app:layout_column="3" />



</android.support.v7.widget.GridLayout>
 
</androidx.gridlayout.widget.GridLayout>

res/layout/pad_advanced_5x3.xml

+2 −2
Original line number Diff line number Diff line
@@ -15,7 +15,7 @@ 
  limitations under the License.

  -->



<android.support.v7.widget.GridLayout

<androidx.gridlayout.widget.GridLayout

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

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

    android:id="@+id/pad_advanced"
@@ -205,4 +205,4 @@ 
        app:layout_row="2"

        app:layout_column="4" />



</android.support.v7.widget.GridLayout>
 
</androidx.gridlayout.widget.GridLayout>