diff options
| author | Dan Sandler <dsandler@android.com> | 2014-08-07 16:08:38 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-08-07 09:28:12 +0000 |
| commit | e2a8c53f3fdc5c31b58491c7212f8a294db8dbc6 (patch) | |
| tree | 2e8ea28ff2cba394759bc62be6c0fbcd2e250d2e /packages/SystemUI/res/layout | |
| parent | 83c7a53b4f043a5528d52ca9851829ff07193bc7 (diff) | |
| parent | e9a4e90db6e7493e84084197361da7140817265b (diff) | |
| download | frameworks_base-e2a8c53f3fdc5c31b58491c7212f8a294db8dbc6.zip frameworks_base-e2a8c53f3fdc5c31b58491c7212f8a294db8dbc6.tar.gz frameworks_base-e2a8c53f3fdc5c31b58491c7212f8a294db8dbc6.tar.bz2 | |
Merge "Link to new app notification settings from the inspector." into lmp-dev
Diffstat (limited to 'packages/SystemUI/res/layout')
| -rw-r--r-- | packages/SystemUI/res/layout/notification_guts.xml | 32 | ||||
| -rw-r--r-- | packages/SystemUI/res/layout/status_bar_expanded_header.xml | 2 | ||||
| -rw-r--r-- | packages/SystemUI/res/layout/zen_mode_panel.xml | 4 |
3 files changed, 11 insertions, 27 deletions
diff --git a/packages/SystemUI/res/layout/notification_guts.xml b/packages/SystemUI/res/layout/notification_guts.xml index 0e78d66..d65a23e 100644 --- a/packages/SystemUI/res/layout/notification_guts.xml +++ b/packages/SystemUI/res/layout/notification_guts.xml @@ -77,30 +77,14 @@ /> </LinearLayout> - <LinearLayout - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:padding="8dp" + <ImageButton style="@android:style/Widget.Material.Light.Button.Borderless.Small" + android:id="@+id/notification_inspect_item" + android:layout_width="52dp" + android:layout_height="match_parent" android:layout_weight="0" - android:orientation="horizontal" - android:showDividers="beginning|middle" - android:divider="@*android:drawable/list_divider_holo_dark" - android:dividerPadding="8dp" - > - <Button style="@android:style/Widget.Material.Light.Button.Borderless.Small" - android:id="@+id/notification_inspect_item" - android:layout_width="0dp" - android:layout_height="match_parent" - android:layout_weight="1" - android:gravity="start|center_vertical" - android:drawablePadding="8dp" - android:paddingStart="8dp" - android:textColor="@color/notification_guts_btn_color" - android:textSize="14dp" - android:singleLine="true" - android:ellipsize="end" - android:text="@string/status_bar_notification_inspect_item_title" - /> - </LinearLayout> + android:gravity="center" + android:contentDescription="@string/status_bar_notification_inspect_item_title" + android:src="@drawable/ic_settings" + /> </LinearLayout> </FrameLayout> diff --git a/packages/SystemUI/res/layout/status_bar_expanded_header.xml b/packages/SystemUI/res/layout/status_bar_expanded_header.xml index 688a88c..21d8457 100644 --- a/packages/SystemUI/res/layout/status_bar_expanded_header.xml +++ b/packages/SystemUI/res/layout/status_bar_expanded_header.xml @@ -50,7 +50,7 @@ android:layout_width="48dp" android:layout_height="@dimen/status_bar_header_height" android:background="@drawable/ripple_drawable" - android:src="@drawable/ic_settings_24dp" + android:src="@drawable/ic_settings" android:contentDescription="@string/accessibility_desc_quick_settings"/> <LinearLayout android:id="@+id/system_icons_super_container" diff --git a/packages/SystemUI/res/layout/zen_mode_panel.xml b/packages/SystemUI/res/layout/zen_mode_panel.xml index 2f73c63..9d5f7bd 100644 --- a/packages/SystemUI/res/layout/zen_mode_panel.xml +++ b/packages/SystemUI/res/layout/zen_mode_panel.xml @@ -78,7 +78,7 @@ android:clickable="true" android:contentDescription="@null" android:scaleType="center" - android:src="@drawable/ic_settings_24dp" /> + android:src="@drawable/ic_settings" /> </FrameLayout> <LinearLayout @@ -98,4 +98,4 @@ android:paddingTop="4dp" android:paddingBottom="4dp" android:textAppearance="@style/TextAppearance.QS.Subhead" /> -</com.android.systemui.volume.ZenModePanel>
\ No newline at end of file +</com.android.systemui.volume.ZenModePanel> |