diff options
| author | Chihhang Chuang <chihhangchuang@google.com> | 2021-06-14 14:51:04 +0800 |
|---|---|---|
| committer | Chihhang Chuang <chihhangchuang@google.com> | 2021-06-14 14:54:29 +0800 |
| commit | 82c09c5e89e982df3d6935f1187028c7814209b4 (patch) | |
| tree | 1f019919659dc13bec44bd7684b390cbcc6298f1 /src | |
| parent | c44abebfe45d55d7c2635aa7bd469d8bc3e42f07 (diff) | |
| download | ThemePicker-82c09c5e89e982df3d6935f1187028c7814209b4.tar.gz | |
Use APPLY text button for grid picker
Video: https://drive.google.com/file/d/1NotRBY9GDJe8LgEGrA_g_ruN-dtoktb0/view?usp=sharing
Bug: 189384424
Test: Manually
Change-Id: I8896640a0818fa993f87363b4c2975d2e7eee16a
Diffstat (limited to 'src')
| -rw-r--r-- | src/com/android/customization/picker/grid/GridFragment.java | 6 | ||||
| -rw-r--r-- | src/com/android/customization/picker/grid/GridFullPreviewFragment.java | 6 |
2 files changed, 6 insertions, 6 deletions
diff --git a/src/com/android/customization/picker/grid/GridFragment.java b/src/com/android/customization/picker/grid/GridFragment.java index 2aeb3487..0a7a2606 100644 --- a/src/com/android/customization/picker/grid/GridFragment.java +++ b/src/com/android/customization/picker/grid/GridFragment.java @@ -20,7 +20,7 @@ import static android.app.Activity.RESULT_OK; import static com.android.customization.picker.ViewOnlyFullPreviewActivity.SECTION_GRID; import static com.android.customization.picker.grid.GridFullPreviewFragment.EXTRA_GRID_OPTION; import static com.android.customization.picker.grid.GridFullPreviewFragment.EXTRA_WALLPAPER_INFO; -import static com.android.wallpaper.widget.BottomActionBar.BottomAction.APPLY; +import static com.android.wallpaper.widget.BottomActionBar.BottomAction.APPLY_TEXT; import android.content.Intent; import android.os.Bundle; @@ -189,8 +189,8 @@ public class GridFragment extends AppbarFragment { protected void onBottomActionBarReady(BottomActionBar bottomActionBar) { super.onBottomActionBarReady(bottomActionBar); mBottomActionBar = bottomActionBar; - mBottomActionBar.showActionsOnly(APPLY); - mBottomActionBar.setActionClickListener(APPLY, unused -> applyGridOption(mSelectedOption)); + mBottomActionBar.showActionsOnly(APPLY_TEXT); + mBottomActionBar.setActionClickListener(APPLY_TEXT, v -> applyGridOption(mSelectedOption)); } private void applyGridOption(GridOption gridOption) { diff --git a/src/com/android/customization/picker/grid/GridFullPreviewFragment.java b/src/com/android/customization/picker/grid/GridFullPreviewFragment.java index f91cdcfa..fc724dbc 100644 --- a/src/com/android/customization/picker/grid/GridFullPreviewFragment.java +++ b/src/com/android/customization/picker/grid/GridFullPreviewFragment.java @@ -17,7 +17,7 @@ package com.android.customization.picker.grid; import static android.app.Activity.RESULT_OK; -import static com.android.wallpaper.widget.BottomActionBar.BottomAction.APPLY; +import static com.android.wallpaper.widget.BottomActionBar.BottomAction.APPLY_TEXT; import android.app.Activity; import android.content.Intent; @@ -112,8 +112,8 @@ public class GridFullPreviewFragment extends AppbarFragment { @Override protected void onBottomActionBarReady(BottomActionBar bottomActionBar) { super.onBottomActionBarReady(bottomActionBar); - bottomActionBar.showActionsOnly(APPLY); - bottomActionBar.setActionClickListener(APPLY, v -> finishActivityWithResultOk()); + bottomActionBar.showActionsOnly(APPLY_TEXT); + bottomActionBar.setActionClickListener(APPLY_TEXT, v -> finishActivityWithResultOk()); bottomActionBar.show(); } |