PawletOS/Lawnchair
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

reduce number of animations on state changes

Browse Source
This commit is contained in:
Michael Jurka
2011-01-26 16:13:55 -08:00
parent 10853b92cf
commit e90cd23338
1 changed files with 5 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/com/android/launcher2/Launcher.java
+5 -21
View File
@@ -2598,42 +2598,26 @@ public final class Launcher extends Activity
* @param hideSeq AnimatorSet in which to put "hide" animations, or null. * @param hideSeq AnimatorSet in which to put "hide" animations, or null.
*/ */
private void hideAndShowToolbarButtons(State newState, AnimatorSet showSeq, AnimatorSet hideSeq) { private void hideAndShowToolbarButtons(State newState, AnimatorSet showSeq, AnimatorSet hideSeq) {
final View searchButton = findViewById(R.id.search_button); final View buttonCluster = findViewById(R.id.all_apps_button_cluster);
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 allAppsButton = findViewById(R.id.all_apps_button);
final View divider = findViewById(R.id.divider); final View divider = findViewById(R.id.divider);
final View configureButton = findViewById(R.id.configure_button); final View configureButton = findViewById(R.id.configure_button);
switch (newState) { switch (newState) {
case WORKSPACE: case WORKSPACE:
hideOrShowToolbarButton(true, searchButton, showSeq); hideOrShowToolbarButton(true, buttonCluster, showSeq);
hideOrShowToolbarButton(true, searchDivider, showSeq);
hideOrShowToolbarButton(true, voiceSearchButton, showSeq);
hideOrShowToolbarButton(true, allAppsButton, showSeq);
hideOrShowToolbarButton(true, divider, showSeq);
hideOrShowToolbarButton(true, configureButton, showSeq);
mDeleteZone.setOverlappingViews(new View[] { allAppsButton, divider, configureButton }); mDeleteZone.setOverlappingViews(new View[] { allAppsButton, divider, configureButton });
mDeleteZone.setDragAndDropEnabled(true); mDeleteZone.setDragAndDropEnabled(true);
mDeleteZone.setText(getResources().getString(R.string.delete_zone_label_workspace)); mDeleteZone.setText(getResources().getString(R.string.delete_zone_label_workspace));
break; break;
case ALL_APPS: case ALL_APPS:
hideOrShowToolbarButton(false, configureButton, hideSeq); hideOrShowToolbarButton(false, buttonCluster, hideSeq);
hideOrShowToolbarButton(false, searchDivider, hideSeq);
hideOrShowToolbarButton(false, searchButton, hideSeq);
hideOrShowToolbarButton(false, voiceSearchButton, hideSeq);
hideOrShowToolbarButton(false, divider, hideSeq);
hideOrShowToolbarButton(false, allAppsButton, hideSeq);
mDeleteZone.setDragAndDropEnabled(false); mDeleteZone.setDragAndDropEnabled(false);
mDeleteZone.setText(getResources().getString(R.string.delete_zone_label_all_apps)); mDeleteZone.setText(getResources().getString(R.string.delete_zone_label_all_apps));
break; break;
case CUSTOMIZE: case CUSTOMIZE:
hideOrShowToolbarButton(false, allAppsButton, hideSeq); hideOrShowToolbarButton(false, buttonCluster, hideSeq);
hideOrShowToolbarButton(false, searchDivider, hideSeq);
hideOrShowToolbarButton(false, searchButton, hideSeq);
hideOrShowToolbarButton(false, voiceSearchButton, hideSeq);
hideOrShowToolbarButton(false, divider, hideSeq);
hideOrShowToolbarButton(false, configureButton, hideSeq);
mDeleteZone.setDragAndDropEnabled(false); mDeleteZone.setDragAndDropEnabled(false);
break; break;
} }