diff options
| author | Michael Jurka <mikejurka@google.com> | 2011-01-25 22:56:42 -0800 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2011-01-25 22:56:42 -0800 |
| commit | a5fa4b492f87540bce227a311733789930ebcf5f (patch) | |
| tree | bf388db31210dc64edc1dfed0b6b2e3a9e668010 /src/com/android/launcher2/Launcher.java | |
| parent | 878aaca1fee925805e4fc210317540bb5ef933ae (diff) | |
| parent | 789744f8962642b04c4b37791154fc990a05746c (diff) | |
| download | android_packages_apps_Trebuchet-a5fa4b492f87540bce227a311733789930ebcf5f.tar.gz android_packages_apps_Trebuchet-a5fa4b492f87540bce227a311733789930ebcf5f.tar.bz2 android_packages_apps_Trebuchet-a5fa4b492f87540bce227a311733789930ebcf5f.zip | |
Merge "Updating layout of search buttons" into honeycomb
Diffstat (limited to 'src/com/android/launcher2/Launcher.java')
| -rw-r--r-- | src/com/android/launcher2/Launcher.java | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/src/com/android/launcher2/Launcher.java b/src/com/android/launcher2/Launcher.java index 1a7067e93..966f2e720 100644 --- a/src/com/android/launcher2/Launcher.java +++ b/src/com/android/launcher2/Launcher.java @@ -2598,7 +2598,9 @@ public final class Launcher extends Activity * @param hideSeq AnimatorSet in which to put "hide" animations, or null. */ private void hideAndShowToolbarButtons(State newState, AnimatorSet showSeq, AnimatorSet hideSeq) { - final View searchButton = findViewById(R.id.search_button_cluster); + final View searchButton = findViewById(R.id.search_button); + final View searchDivider = findViewById(R.id.search_divider); + final View voiceSearchButton = findViewById(R.id.voice_button); final View allAppsButton = findViewById(R.id.all_apps_button); final View divider = findViewById(R.id.divider); final View configureButton = findViewById(R.id.configure_button); @@ -2606,6 +2608,8 @@ public final class Launcher extends Activity switch (newState) { case WORKSPACE: hideOrShowToolbarButton(true, searchButton, showSeq); + hideOrShowToolbarButton(true, searchDivider, showSeq); + hideOrShowToolbarButton(true, voiceSearchButton, showSeq); hideOrShowToolbarButton(true, allAppsButton, showSeq); hideOrShowToolbarButton(true, divider, showSeq); hideOrShowToolbarButton(true, configureButton, showSeq); @@ -2615,7 +2619,9 @@ public final class Launcher extends Activity break; case ALL_APPS: hideOrShowToolbarButton(false, configureButton, hideSeq); + hideOrShowToolbarButton(false, searchDivider, hideSeq); hideOrShowToolbarButton(false, searchButton, hideSeq); + hideOrShowToolbarButton(false, voiceSearchButton, hideSeq); hideOrShowToolbarButton(false, divider, hideSeq); hideOrShowToolbarButton(false, allAppsButton, hideSeq); mDeleteZone.setDragAndDropEnabled(false); @@ -2623,7 +2629,9 @@ public final class Launcher extends Activity break; case CUSTOMIZE: hideOrShowToolbarButton(false, allAppsButton, hideSeq); + hideOrShowToolbarButton(false, searchDivider, hideSeq); hideOrShowToolbarButton(false, searchButton, hideSeq); + hideOrShowToolbarButton(false, voiceSearchButton, hideSeq); hideOrShowToolbarButton(false, divider, hideSeq); hideOrShowToolbarButton(false, configureButton, hideSeq); mDeleteZone.setDragAndDropEnabled(false); @@ -3106,7 +3114,7 @@ public final class Launcher extends Activity ComponentName activityName = searchManager.getGlobalSearchActivity(); if (activityName != null) { sGlobalSearchIcon = updateButtonWithIconFromExternalActivity( - R.id.search_button, activityName, R.drawable.search_button_generic); + R.id.search_button, activityName, R.drawable.ic_generic_search); } else { findViewById(R.id.search_button).setVisibility(View.GONE); } |