android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/widget_button_text"
+ android:drawablePadding="4dp"
+ android:drawableTop="@drawable/ic_gel_widget_icn"
android:textSize="18dp"/>
<Space
android:layout_width="@dimen/overview_panel_buttonSpacing"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/wallpaper_button_text"
+ android:drawablePadding="4dp"
+ android:drawableTop="@drawable/ic_gel_wallpaper_icn"
android:textSize="18dp" />
<Space
android:layout_width="@dimen/overview_panel_buttonSpacing"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/settings_button_text"
+ android:drawablePadding="4dp"
+ android:drawableTop="@drawable/ic_gel_setting_icn"
android:textSize="18dp" />
</LinearLayout>
AlphaUpdateListener.updateVisibility(getPageIndicator());
}
searchBar.setAlpha(finalSearchBarAlpha);
- AlphaUpdateListener.updateVisibility(mLauncher.getSearchBar());
+ AlphaUpdateListener.updateVisibility(searchBar);
+ updateCustomContentVisibility();
}
if (finalSearchBarAlpha == 0) {
mLauncher.setVoiceButtonProxyVisible(false);
private void onTransitionPrepare() {
mIsSwitchingState = true;
updateChildrenLayersEnabled(false);
- if (mState != Workspace.State.NORMAL) {
- if (hasCustomContent()) {
- mWorkspaceScreens.get(CUSTOM_CONTENT_SCREEN_ID).setVisibility(INVISIBLE);
- }
+ hideCustomContentIfNecessary();
+ }
+
+ void updateCustomContentVisibility() {
+ int visibility = mState == Workspace.State.NORMAL ? VISIBLE : INVISIBLE;
+ if (hasCustomContent()) {
+ mWorkspaceScreens.get(CUSTOM_CONTENT_SCREEN_ID).setVisibility(visibility);
+ }
+ }
+
+ void showCustomContentIfNecessary() {
+ boolean show = mState == Workspace.State.NORMAL;
+ if (show && hasCustomContent()) {
+ mWorkspaceScreens.get(CUSTOM_CONTENT_SCREEN_ID).setVisibility(VISIBLE);
+ }
+ }
+
+ void hideCustomContentIfNecessary() {
+ boolean hide = mState != Workspace.State.NORMAL;
+ if (hide && hasCustomContent()) {
+ mWorkspaceScreens.get(CUSTOM_CONTENT_SCREEN_ID).setVisibility(INVISIBLE);
}
}
cl.setShortcutAndWidgetAlpha(1f);
}
}
- if (mState == Workspace.State.NORMAL) {
- if (hasCustomContent()) {
- mWorkspaceScreens.get(CUSTOM_CONTENT_SCREEN_ID).setVisibility(VISIBLE);
- }
- }
+ showCustomContentIfNecessary();
}
@Override