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

Commit 57baac2d authored by Pasty Chang's avatar Pasty Chang Committed by Android (Google) Code Review
Browse files

Merge "Change to use setupcompat and setupdesign for suw pages"

parents d6a40032 c1f8600d

Android.mk

+2 −1
Original line number Diff line number Diff line
@@ -30,6 +30,8 @@ LOCAL_STATIC_ANDROID_LIBRARIES := \ 
    androidx.preference_preference \

    androidx.recyclerview_recyclerview \

    com.google.android.material_material \

    setupcompat \

    setupdesign



LOCAL_JAVA_LIBRARIES := \

    telephony-common \
@@ -53,7 +55,6 @@ ifneq ($(INCREMENTAL_BUILDS),) 
    LOCAL_JACK_FLAGS := --multi-dex native

endif



include frameworks/opt/setupwizard/library/common-gingerbread.mk

include frameworks/base/packages/SettingsLib/common.mk

include frameworks/base/packages/SettingsLib/search/common.mk

res/layout-land/choose_lock_pattern.xml

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

-->



<com.android.setupwizardlib.GlifLayout

<com.google.android.setupdesign.GlifLayout

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

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

    android:layout_width="match_parent"
@@ -164,7 +164,7 @@ 
        </LinearLayout>



        <!-- right side: lock pattern -->

        <com.android.setupwizardlib.view.FillContentLayout

        <com.google.android.setupdesign.view.FillContentLayout

            style="@style/LockPatternContainerStyle"

            android:layout_width="0dp"

            android:layout_height="match_parent"
@@ -177,8 +177,8 @@ 
                android:layout_gravity="center"

                android:background="@color/lock_pattern_background" />



        </com.android.setupwizardlib.view.FillContentLayout>

        </com.google.android.setupdesign.view.FillContentLayout>



    </com.android.internal.widget.LinearLayoutWithDefaultTouchRecepient>



</com.android.setupwizardlib.GlifLayout>
 
</com.google.android.setupdesign.GlifLayout>

res/layout-land/confirm_lock_pattern_normal.xml

+4 −4
Original line number Diff line number Diff line
@@ -13,7 +13,7 @@ 
     See the License for the specific language governing permissions and

     limitations under the License.

-->

<com.android.setupwizardlib.GlifLayout

<com.google.android.setupdesign.GlifLayout

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

    android:id="@+id/setup_wizard_layout"

    android:layout_width="match_parent"
@@ -89,7 +89,7 @@ 


        </ScrollView>



        <com.android.setupwizardlib.view.FillContentLayout

        <com.google.android.setupdesign.view.FillContentLayout

            style="@style/LockPatternContainerStyle"

            android:layout_width="0dp"

            android:layout_height="match_parent"
@@ -102,7 +102,7 @@ 
                android:layout_gravity="center"

                android:background="@color/lock_pattern_background" />



        </com.android.setupwizardlib.view.FillContentLayout>

        </com.google.android.setupdesign.view.FillContentLayout>



    </com.android.internal.widget.LinearLayoutWithDefaultTouchRecepient>

</com.android.setupwizardlib.GlifLayout>
 
</com.google.android.setupdesign.GlifLayout>

res/layout-land/fingerprint_enroll_enrolling.xml

+4 −4
Original line number Diff line number Diff line
@@ -15,7 +15,7 @@ 
  ~ limitations under the License

  -->



<com.android.setupwizardlib.GlifLayout

<com.google.android.setupdesign.GlifLayout

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

    android:id="@+id/setup_wizard_layout"

    android:layout_width="match_parent"
@@ -108,7 +108,7 @@ 
                android:gravity="center"

                android:orientation="vertical">



                <com.android.setupwizardlib.view.FillContentLayout

                <com.google.android.setupdesign.view.FillContentLayout

                    android:layout_width="wrap_content"

                    android:layout_height="0dp"

                    android:layout_marginVertical="24dp"
@@ -120,7 +120,7 @@ 
                         android:layout_width="match_parent"

                         android:layout_height="match_parent"

                         android:layout_gravity="center" />

                </com.android.setupwizardlib.view.FillContentLayout>

                </com.google.android.setupdesign.view.FillContentLayout>



                <TextView

                    style="@style/TextAppearance.FingerprintErrorText"
@@ -139,4 +139,4 @@ 


        </LinearLayout>

    </ScrollView>

</com.android.setupwizardlib.GlifLayout>
 
</com.google.android.setupdesign.GlifLayout>

res/layout-land/fingerprint_enroll_find_sensor.xml

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

  -->



<com.android.setupwizardlib.GlifLayout

<com.google.android.setupdesign.GlifLayout

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

    android:id="@+id/setup_wizard_layout"

    android:layout_width="match_parent"
@@ -112,4 +112,4 @@ 


    </LinearLayout>



</com.android.setupwizardlib.GlifLayout>
 
</com.google.android.setupdesign.GlifLayout>