Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

UX changes for the cross profile settings header.

Browse Source 
Bug: 136249261
Bug: 140728653
Test: manual testing
Change-Id: I49c11c5aa6d024eebcf72ce453718dda7368b7fe
This commit is contained in:
kholoud mohamed
2020-02-10 11:49:51 +00:00
parent c22d4531c7
commit 759c41e7c7
2 changed files with 46 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files

66
packages/SettingsLib/LayoutPreference/res/layout/cross_profiles_settings_entity_header.xml
View File

@@ -18,75 +18,39 @@
<RelativeLayout
xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@+id/entity_header"
style="@style/EntityHeader"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:paddingStart="?android:attr/listPreferredItemPaddingStart"
android:paddingEnd="?android:attr/listPreferredItemPaddingEnd"
android:orientation="horizontal">
style="@style/EntityHeader">
<LinearLayout
android:id="@+id/entity_header_content"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:paddingTop="32dp"
android:paddingBottom="32dp"
android:layout_centerHorizontal="true"
android:gravity="center_horizontal"
android:orientation="horizontal">
android:orientation="vertical">
<LinearLayout
android:id="@+id/entity_header_content"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerHorizontal="true"
android:gravity="center_horizontal"
android:orientation="vertical">
android:layout_gravity="center"
android:orientation="horizontal">
<ImageView
android:id="@+id/entity_header_icon_personal"
android:layout_width="48dp"
android:layout_height="48dp"
android:scaleType="fitCenter"
android:antialias="true"/>
style="@style/CrossProfileEntityHeaderIcon" />
<TextView
android:id="@+id/install_type"
style="@style/TextAppearance.EntityHeaderSummary"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="2dp"
android:text="Personal"/>
</LinearLayout>
<ImageView
android:id="@+id/entity_header_swap_horiz"
android:layout_width="24dp"
android:layout_height="24dp"
android:scaleType="fitCenter"
android:antialias="true"
android:src="@drawable/ic_swap_horiz_grey"/>
<LinearLayout
android:id="@+id/entity_header_content"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerHorizontal="true"
android:gravity="center_horizontal"
android:orientation="vertical">
<ImageView
android:id="@+id/entity_header_swap_horiz"
style="@style/CrossProfileSwapHorizIcon "/>
<ImageView
android:id="@+id/entity_header_icon_work"
android:layout_width="48dp"
android:layout_height="48dp"
android:scaleType="fitCenter"
android:antialias="true"/>
<TextView
android:id="@+id/install_type"
style="@style/TextAppearance.EntityHeaderSummary"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="2dp"
android:text="Work"/>
style="@style/CrossProfileEntityHeaderIcon" />
</LinearLayout>
</LinearLayout>
<TextView
android:id="@+id/entity_header_title"
style="@style/CrossProfileEntityHeaderTitle" />
</LinearLayout>
</RelativeLayout>

31
packages/SettingsLib/LayoutPreference/res/values/styles.xml
View File

@@ -37,4 +37,35 @@
<item name="android:singleLine">true</item>
<item name="android:ellipsize">marquee</item>
</style>
<style name="CrossProfileEntityHeaderIcon">
<item name="android:layout_width">48dp</item>
<item name="android:layout_height">48dp</item>
<item name="android:layout_gravity">center</item>
<item name="android:gravity">center</item>
<item name="android:scaleType">fitCenter</item>
<item name="android:antialias">true</item>
</style>
<style name="CrossProfileSwapHorizIcon">
<item name="android:layout_width">24dp</item>
<item name="android:layout_height">24dp</item>
<item name="android:layout_gravity">center</item>
<item name="android:gravity">center</item>
<item name="android:scaleType">fitCenter</item>
<item name="android:layout_marginStart">10dp</item>
<item name="android:layout_marginEnd">10dp</item>
<item name="android:src">@drawable/ic_swap_horiz_grey</item>
<item name="android:antialias">true</item>
</style>
<style name="CrossProfileEntityHeaderTitle">
<item name="android:layout_width">wrap_content</item>
<item name="android:layout_height">wrap_content</item>
<item name="android:layout_gravity">center</item>
<item name="android:textSize">18sp</item>
<item name="android:textColor">?android:attr/textColorPrimary</item>
<item name="android:fontFamily">google-sans-medium</item>
<item name="android:layout_marginTop">8dp</item>
</style>
</resources>