diff options
| author | Tony Wickham <twickham@google.com> | 2017-06-20 01:36:54 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2017-06-20 01:36:55 +0000 |
| commit | 034d74da197c4aac790bfdf16bef8527e3f18fca (patch) | |
| tree | d0cc0a3baffe5455975b82afdfcc64f47915df84 /res/layout | |
| parent | 13fc445b079b7ef0d1414356e6f73b3b060e17fc (diff) | |
| parent | 887bd1fe1af9a37aad78ad51f5b38b265aa09c3a (diff) | |
| download | android_packages_apps_Trebuchet-034d74da197c4aac790bfdf16bef8527e3f18fca.tar.gz android_packages_apps_Trebuchet-034d74da197c4aac790bfdf16bef8527e3f18fca.tar.bz2 android_packages_apps_Trebuchet-034d74da197c4aac790bfdf16bef8527e3f18fca.zip | |
Merge "Show more shortcuts when last notification is dimissed" into ub-launcher3-dorval-polish
Diffstat (limited to 'res/layout')
| -rw-r--r-- | res/layout/shortcuts_item.xml | 10 | ||||
| -rw-r--r-- | res/layout/system_shortcut_icons.xml | 5 |
2 files changed, 13 insertions, 2 deletions
diff --git a/res/layout/shortcuts_item.xml b/res/layout/shortcuts_item.xml index e54462e7a..7cd996de0 100644 --- a/res/layout/shortcuts_item.xml +++ b/res/layout/shortcuts_item.xml @@ -22,10 +22,18 @@ android:elevation="@dimen/deep_shortcuts_elevation"> <LinearLayout - android:id="@+id/deep_shortcuts" + android:id="@+id/content" android:layout_width="match_parent" android:layout_height="match_parent" android:orientation="vertical"> + + <!-- The shortcuts header is added at runtime when necessary. --> + + <LinearLayout + android:id="@+id/shortcuts" + android:layout_width="match_parent" + android:layout_height="match_parent" + android:orientation="vertical" /> </LinearLayout> </com.android.launcher3.shortcuts.ShortcutsItemView> diff --git a/res/layout/system_shortcut_icons.xml b/res/layout/system_shortcut_icons.xml index db59d4962..34d63e71f 100644 --- a/res/layout/system_shortcut_icons.xml +++ b/res/layout/system_shortcut_icons.xml @@ -21,4 +21,7 @@ android:layout_height="@dimen/system_shortcut_header_height" android:orientation="horizontal" android:gravity="end|center_vertical" - android:background="?attr/popupColorSecondary" /> + android:background="?attr/popupColorSecondary" + android:elevation="1dp" + android:outlineProvider="none" /> + <!-- We have elevation so this is drawn on top, but no outline provider to remove shadow --> |