PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "For top layout use FrameLayout than GlifLayout" into tm-qpr-dev am: 8f839acd71

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20979439

Change-Id: I61f851961501fb97fb63a804e157f370ad05726b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Rubin Xu
2023-01-23 16:57:15 +00:00
committed by Automerger Merge Worker
parent 4dbe956a4d 8f839acd71
commit ec8ad87f62
2 changed files with 6 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
res/layout-sw600dp/confirm_lock_password.xml
View File

@@ -14,16 +14,14 @@
~ See the License for the specific language governing permissions and
~ limitations under the License
-->
<com.google.android.setupdesign.GlifLayout
<FrameLayout
xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@+id/setup_wizard_layout"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout="@layout/sud_glif_blank_template">
android:layout_height="match_parent">
<include
layout="@layout/confirm_lock_password_base"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_gravity="center_horizontal" />
</com.google.android.setupdesign.GlifLayout>
</FrameLayout>

8
res/layout-sw600dp/confirm_lock_pattern.xml
View File

@@ -13,16 +13,14 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
<com.google.android.setupdesign.GlifLayout
<FrameLayout
xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@+id/setup_wizard_layout"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout="@layout/sud_glif_blank_template">
android:layout_height="match_parent">
<include
layout="@layout/confirm_lock_pattern_base"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_gravity="center_horizontal" />
</com.google.android.setupdesign.GlifLayout>
</FrameLayout>