summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorHyunyoung Song <hyunyoungs@google.com>2019-04-12 23:10:56 -0700
committerHyunyoung Song <hyunyoungs@google.com>2019-04-13 00:51:33 -0700
commita19584d8203134a10b9c507e61a26d86c032e3cc (patch)
treecd10dd0e11ca584284efa3c088abaf92129b66d4 /src
parent7924a3c97a898a242e13ee0ed799892bc7385c6b (diff)
downloadandroid_packages_apps_Trebuchet-a19584d8203134a10b9c507e61a26d86c032e3cc.tar.gz
android_packages_apps_Trebuchet-a19584d8203134a10b9c507e61a26d86c032e3cc.tar.bz2
android_packages_apps_Trebuchet-a19584d8203134a10b9c507e61a26d86c032e3cc.zip
Change default icons for launcher [3/3]
Bug: 126738409 Bug: 129955150 Change-Id: I9daf5bd253dc72c99ab3a466766a4d30a95d0952
Diffstat (limited to 'src')
-rw-r--r--src/com/android/launcher3/views/OptionsPopupView.java6
1 files changed, 4 insertions, 2 deletions
diff --git a/src/com/android/launcher3/views/OptionsPopupView.java b/src/com/android/launcher3/views/OptionsPopupView.java
index b6c41b0ea..706236907 100644
--- a/src/com/android/launcher3/views/OptionsPopupView.java
+++ b/src/com/android/launcher3/views/OptionsPopupView.java
@@ -152,9 +152,11 @@ public class OptionsPopupView extends ArrowPopup
RectF target = new RectF(x - halfSize, y - halfSize, x + halfSize, y + halfSize);
ArrayList<OptionItem> options = new ArrayList<>();
- int res = existsStyleWallpapers(launcher) ?
+ int resString = existsStyleWallpapers(launcher) ?
R.string.styles_wallpaper_button_text : R.string.wallpaper_button_text;
- options.add(new OptionItem(res, R.drawable.ic_wallpaper,
+ int resDrawable = existsStyleWallpapers(launcher) ?
+ R.drawable.ic_palette : R.drawable.ic_wallpaper;
+ options.add(new OptionItem(resString, resDrawable,
ControlType.WALLPAPER_BUTTON, OptionsPopupView::startWallpaperPicker));
if (!FeatureFlags.GO_DISABLE_WIDGETS) {
options.add(new OptionItem(R.string.widget_button_text, R.drawable.ic_widget,