For top layout use FrameLayout than GlifLayout
In these xml files we are having nested GlifLayout, that I think
messes up the UI
Bug: 237169259
Test: Manual
Change-Id: I9df8b1b7b5c19c61b92b30432bc7d78325876425
(cherry picked from commit 3dcf68f321
)
Merged-In: I9df8b1b7b5c19c61b92b30432bc7d78325876425
This commit is contained in:
committed by
Cherrypicker Worker
parent
6c703e12ae
commit
f857fd4357
@@ -14,16 +14,14 @@
|
|||||||
~ See the License for the specific language governing permissions and
|
~ See the License for the specific language governing permissions and
|
||||||
~ limitations under the License
|
~ limitations under the License
|
||||||
-->
|
-->
|
||||||
<com.google.android.setupdesign.GlifLayout
|
<FrameLayout
|
||||||
xmlns:android="http://schemas.android.com/apk/res/android"
|
xmlns:android="http://schemas.android.com/apk/res/android"
|
||||||
android:id="@+id/setup_wizard_layout"
|
|
||||||
android:layout_width="match_parent"
|
android:layout_width="match_parent"
|
||||||
android:layout_height="match_parent"
|
android:layout_height="match_parent">
|
||||||
android:layout="@layout/sud_glif_blank_template">
|
|
||||||
|
|
||||||
<include
|
<include
|
||||||
layout="@layout/confirm_lock_password_base"
|
layout="@layout/confirm_lock_password_base"
|
||||||
android:layout_width="match_parent"
|
android:layout_width="match_parent"
|
||||||
android:layout_height="match_parent"
|
android:layout_height="match_parent"
|
||||||
android:layout_gravity="center_horizontal" />
|
android:layout_gravity="center_horizontal" />
|
||||||
</com.google.android.setupdesign.GlifLayout>
|
</FrameLayout>
|
||||||
|
@@ -13,16 +13,14 @@
|
|||||||
See the License for the specific language governing permissions and
|
See the License for the specific language governing permissions and
|
||||||
limitations under the License.
|
limitations under the License.
|
||||||
-->
|
-->
|
||||||
<com.google.android.setupdesign.GlifLayout
|
<FrameLayout
|
||||||
xmlns:android="http://schemas.android.com/apk/res/android"
|
xmlns:android="http://schemas.android.com/apk/res/android"
|
||||||
android:id="@+id/setup_wizard_layout"
|
|
||||||
android:layout_width="match_parent"
|
android:layout_width="match_parent"
|
||||||
android:layout_height="match_parent"
|
android:layout_height="match_parent">
|
||||||
android:layout="@layout/sud_glif_blank_template">
|
|
||||||
|
|
||||||
<include
|
<include
|
||||||
layout="@layout/confirm_lock_pattern_base"
|
layout="@layout/confirm_lock_pattern_base"
|
||||||
android:layout_width="match_parent"
|
android:layout_width="match_parent"
|
||||||
android:layout_height="match_parent"
|
android:layout_height="match_parent"
|
||||||
android:layout_gravity="center_horizontal" />
|
android:layout_gravity="center_horizontal" />
|
||||||
</com.google.android.setupdesign.GlifLayout>
|
</FrameLayout>
|
||||||
|
Reference in New Issue
Block a user