diff options
Diffstat (limited to 'packages/SystemUI/res/layout')
6 files changed, 75 insertions, 46 deletions
diff --git a/packages/SystemUI/res/layout/keyguard_user_switcher.xml b/packages/SystemUI/res/layout/keyguard_user_switcher.xml index 3730bbe..773da9a 100644 --- a/packages/SystemUI/res/layout/keyguard_user_switcher.xml +++ b/packages/SystemUI/res/layout/keyguard_user_switcher.xml @@ -14,13 +14,18 @@ ~ See the License for the specific language governing permissions and ~ limitations under the License --> -<com.android.keyguard.AlphaOptimizedLinearLayout - xmlns:android="http://schemas.android.com/apk/res/android" - android:id="@+id/keyguard_user_switcher" - android:orientation="vertical" - android:layout_height="wrap_content" - android:layout_width="wrap_content" - android:gravity="end" - android:visibility="gone" - android:paddingTop="4dp"> -</com.android.keyguard.AlphaOptimizedLinearLayout> +<view xmlns:android="http://schemas.android.com/apk/res/android" + class="com.android.systemui.statusbar.policy.KeyguardUserSwitcher$Container" + android:layout_height="match_parent" + android:layout_width="match_parent"> + <com.android.keyguard.AlphaOptimizedLinearLayout + android:id="@+id/keyguard_user_switcher_inner" + android:orientation="vertical" + android:layout_height="wrap_content" + android:layout_width="wrap_content" + android:layout_marginTop="@dimen/status_bar_header_height_keyguard" + android:layout_gravity="end" + android:gravity="end" + android:paddingTop="4dp"> + </com.android.keyguard.AlphaOptimizedLinearLayout> +</view>
\ No newline at end of file diff --git a/packages/SystemUI/res/layout/navigation_bar.xml b/packages/SystemUI/res/layout/navigation_bar.xml index 16027d9..2e38b20 100644 --- a/packages/SystemUI/res/layout/navigation_bar.xml +++ b/packages/SystemUI/res/layout/navigation_bar.xml @@ -43,7 +43,7 @@ <!-- navigation controls --> <View - android:layout_width="40dp" + android:layout_width="@dimen/navigation_side_padding" android:layout_height="match_parent" android:layout_weight="0" android:visibility="invisible" @@ -58,7 +58,7 @@ android:contentDescription="@string/accessibility_back" /> <View - android:layout_width="match_parent" + android:layout_width="0dp" android:layout_height="match_parent" android:layout_weight="1" android:visibility="invisible" @@ -70,10 +70,11 @@ systemui:keyCode="3" systemui:keyRepeat="false" android:layout_weight="0" + android:scaleType="center" android:contentDescription="@string/accessibility_home" /> <View - android:layout_width="match_parent" + android:layout_width="0dp" android:layout_height="match_parent" android:layout_weight="1" android:visibility="invisible" @@ -83,10 +84,11 @@ android:layout_height="match_parent" android:src="@drawable/ic_sysbar_recent" android:layout_weight="0" + android:scaleType="center" android:contentDescription="@string/accessibility_recent" /> <FrameLayout - android:layout_width="@dimen/navigation_extra_key_width" + android:layout_width="@dimen/navigation_side_padding" android:layout_height="match_parent" android:layout_weight="0" > <com.android.systemui.statusbar.policy.KeyButtonView @@ -96,6 +98,7 @@ android:contentDescription="@string/accessibility_menu" android:src="@drawable/ic_sysbar_menu" android:visibility="invisible" + android:layout_gravity="end" systemui:keyCode="82" /> <com.android.systemui.statusbar.policy.KeyButtonView @@ -105,7 +108,8 @@ android:contentDescription="@string/accessibility_ime_switch_button" android:scaleType="centerInside" android:src="@drawable/ic_ime_switcher_default" - android:visibility="invisible" /> + android:visibility="invisible" + android:layout_gravity="end" /> </FrameLayout> </LinearLayout> @@ -119,9 +123,9 @@ android:visibility="gone" > <ImageView - android:layout_width="80dp" + android:layout_width="@dimen/navigation_key_width" android:layout_height="match_parent" - android:layout_marginStart="40dp" + android:layout_marginStart="@dimen/navigation_side_padding" android:src="@drawable/ic_sysbar_lights_out_dot_small" android:scaleType="center" android:layout_weight="0" @@ -133,7 +137,7 @@ android:visibility="invisible" /> <ImageView - android:layout_width="80dp" + android:layout_width="@dimen/navigation_key_width" android:layout_height="match_parent" android:src="@drawable/ic_sysbar_lights_out_dot_large" android:scaleType="center" @@ -146,8 +150,8 @@ android:visibility="invisible" /> <ImageView - android:layout_width="80dp" - android:layout_marginEnd="40dp" + android:layout_width="@dimen/navigation_key_width" + android:layout_marginEnd="@dimen/navigation_side_padding" android:layout_height="match_parent" android:src="@drawable/ic_sysbar_lights_out_dot_small" android:scaleType="center" @@ -189,14 +193,15 @@ <FrameLayout android:layout_weight="0" android:layout_width="match_parent" - android:layout_height="40dp" > + android:layout_height="@dimen/navigation_side_padding" > <com.android.systemui.statusbar.policy.KeyButtonView android:id="@+id/ime_switcher" android:layout_width="match_parent" - android:layout_height="40dp" + android:layout_height="@dimen/navigation_extra_key_width" android:contentDescription="@string/accessibility_ime_switch_button" android:scaleType="centerInside" android:src="@drawable/ic_ime_switcher_default" + android:layout_gravity="top" android:visibility="invisible" /> <com.android.systemui.statusbar.policy.KeyButtonView @@ -205,14 +210,16 @@ android:layout_height="40dp" android:contentDescription="@string/accessibility_menu" android:src="@drawable/ic_sysbar_menu_land" + android:layout_gravity="top" android:visibility="invisible" systemui:keyCode="82" /> </FrameLayout> <com.android.systemui.statusbar.policy.KeyButtonView android:id="@+id/recent_apps" - android:layout_height="80dp" + android:layout_height="@dimen/navigation_key_width" android:layout_width="match_parent" android:src="@drawable/ic_sysbar_recent_land" + android:scaleType="center" android:layout_weight="0" android:contentDescription="@string/accessibility_recent" /> @@ -223,9 +230,10 @@ android:visibility="invisible" /> <com.android.systemui.statusbar.policy.KeyButtonView android:id="@+id/home" - android:layout_height="80dp" + android:layout_height="@dimen/navigation_key_width" android:layout_width="match_parent" android:src="@drawable/ic_sysbar_home_land" + android:scaleType="center" systemui:keyCode="3" systemui:keyRepeat="false" android:layout_weight="0" @@ -238,7 +246,7 @@ android:visibility="invisible" /> <com.android.systemui.statusbar.policy.KeyButtonView android:id="@+id/back" - android:layout_height="80dp" + android:layout_height="@dimen/navigation_key_width" android:layout_width="match_parent" android:src="@drawable/ic_sysbar_back_land" android:scaleType="center" @@ -247,7 +255,7 @@ android:contentDescription="@string/accessibility_back" /> <View - android:layout_height="40dp" + android:layout_height="@dimen/navigation_side_padding" android:layout_width="match_parent" android:layout_weight="0" android:visibility="invisible" @@ -263,8 +271,8 @@ android:visibility="gone" > <ImageView - android:layout_height="80dp" - android:layout_marginTop="40dp" + android:layout_height="@dimen/navigation_key_width" + android:layout_marginTop="@dimen/navigation_side_padding" android:layout_width="match_parent" android:src="@drawable/ic_sysbar_lights_out_dot_small" android:scaleType="center" @@ -277,7 +285,7 @@ android:visibility="invisible" /> <ImageView - android:layout_height="80dp" + android:layout_height="@dimen/navigation_key_width" android:layout_width="match_parent" android:src="@drawable/ic_sysbar_lights_out_dot_large" android:scaleType="center" @@ -290,8 +298,8 @@ android:visibility="invisible" /> <ImageView - android:layout_height="80dp" - android:layout_marginBottom="40dp" + android:layout_height="@dimen/navigation_key_width" + android:layout_marginBottom="@dimen/navigation_side_padding" android:layout_width="match_parent" android:src="@drawable/ic_sysbar_lights_out_dot_small" android:scaleType="center" diff --git a/packages/SystemUI/res/layout/signal_cluster_view.xml b/packages/SystemUI/res/layout/signal_cluster_view.xml index 5889c55..f45aa85 100644 --- a/packages/SystemUI/res/layout/signal_cluster_view.xml +++ b/packages/SystemUI/res/layout/signal_cluster_view.xml @@ -24,6 +24,7 @@ android:layout_width="wrap_content" android:gravity="center_vertical" android:orientation="horizontal" + android:paddingEnd="@dimen/signal_cluster_battery_padding" > <ImageView android:id="@+id/vpn" diff --git a/packages/SystemUI/res/layout/status_bar_expanded.xml b/packages/SystemUI/res/layout/status_bar_expanded.xml index 96f9b91..f6d4be5 100644 --- a/packages/SystemUI/res/layout/status_bar_expanded.xml +++ b/packages/SystemUI/res/layout/status_bar_expanded.xml @@ -101,11 +101,9 @@ <ViewStub android:id="@+id/keyguard_user_switcher" - android:layout_height="wrap_content" - android:layout_width="wrap_content" - android:layout_marginTop="@dimen/status_bar_header_height_keyguard" - android:layout_gravity="end" - android:layout="@layout/keyguard_user_switcher" /> + android:layout="@layout/keyguard_user_switcher" + android:layout_height="match_parent" + android:layout_width="match_parent" /> <include layout="@layout/keyguard_status_bar" diff --git a/packages/SystemUI/res/layout/system_icons.xml b/packages/SystemUI/res/layout/system_icons.xml index 21386ef..943e846 100644 --- a/packages/SystemUI/res/layout/system_icons.xml +++ b/packages/SystemUI/res/layout/system_icons.xml @@ -36,6 +36,5 @@ <com.android.systemui.BatteryMeterView android:id="@+id/battery" android:layout_height="14.5dp" android:layout_width="9.5dp" - android:layout_marginBottom="@dimen/battery_margin_bottom" - android:layout_marginStart="7dp"/> + android:layout_marginBottom="@dimen/battery_margin_bottom"/> </LinearLayout>
\ No newline at end of file diff --git a/packages/SystemUI/res/layout/zen_mode_condition.xml b/packages/SystemUI/res/layout/zen_mode_condition.xml index ad0d2dc..a9ad1fc 100644 --- a/packages/SystemUI/res/layout/zen_mode_condition.xml +++ b/packages/SystemUI/res/layout/zen_mode_condition.xml @@ -29,16 +29,34 @@ android:layout_alignParentStart="true" android:gravity="center" /> - <TextView - android:id="@android:id/title" + <LinearLayout + android:id="@android:id/content" android:layout_width="match_parent" - android:layout_height="match_parent" + android:layout_height="wrap_content" + android:layout_centerVertical="true" + android:orientation="vertical" android:layout_toEndOf="@android:id/checkbox" - android:layout_toStartOf="@android:id/button1" - android:ellipsize="end" - android:gravity="center_vertical" - android:maxLines="1" - android:textAppearance="@style/TextAppearance.QS.DetailItemPrimary" /> + android:layout_toStartOf="@android:id/button1"> + + <TextView + android:id="@android:id/text1" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:ellipsize="end" + android:textAlignment="viewStart" + android:maxLines="1" + android:textAppearance="@style/TextAppearance.QS.DetailItemPrimary" /> + + <TextView + android:id="@android:id/text2" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:ellipsize="end" + android:textAlignment="viewStart" + android:maxLines="1" + android:textAppearance="@style/TextAppearance.QS.DetailItemSecondary" /> + + </LinearLayout> <ImageView android:id="@android:id/button1" |