summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--res/values/strings.xml2
-rw-r--r--res/xml/preferences.xml4
-rw-r--r--src/com/cyanogenmod/trebuchet/Launcher.java30
-rw-r--r--src/com/cyanogenmod/trebuchet/Workspace.java10
-rw-r--r--src/com/cyanogenmod/trebuchet/preference/PreferencesProvider.java4
5 files changed, 38 insertions, 12 deletions
diff --git a/res/values/strings.xml b/res/values/strings.xml
index e00fc7c..8f22fcd 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -314,6 +314,8 @@ s -->
<string name="preferences_interface_homescreen_indicator_enable_summary">Show current page indicator at the bottom of the screen</string>
<string name="preferences_interface_homescreen_indicator_fade_title">Fade Indicator</string>
<string name="preferences_interface_homescreen_indicator_fade_summary">Fade the indicator after the homescreen has changed</string>
+ <string name="preferences_interface_homescreen_indicator_background_title">Show Dock Divider</string>
+ <string name="preferences_interface_homescreen_indicator_background_summary">Show the background behind the indicator</string>
<!-- Drawer -->
<string name="preferences_interface_drawer_title">Drawer</string>
diff --git a/res/xml/preferences.xml b/res/xml/preferences.xml
index 030b250..7b8d7d8 100644
--- a/res/xml/preferences.xml
+++ b/res/xml/preferences.xml
@@ -70,6 +70,10 @@
android:summary="@string/preferences_interface_homescreen_indicator_fade_summary"
android:defaultValue="true"
android:dependency="ui_homescreen_indicator_enable" />
+ <CheckBoxPreference android:key="ui_homescreen_indicator_background"
+ android:title="@string/preferences_interface_homescreen_indicator_background_title"
+ android:summary="@string/preferences_interface_homescreen_indicator_background_summary"
+ android:defaultValue="true" />
</PreferenceCategory>
</PreferenceScreen>
diff --git a/src/com/cyanogenmod/trebuchet/Launcher.java b/src/com/cyanogenmod/trebuchet/Launcher.java
index 8d9a3d5..b91e718 100644
--- a/src/com/cyanogenmod/trebuchet/Launcher.java
+++ b/src/com/cyanogenmod/trebuchet/Launcher.java
@@ -305,6 +305,7 @@ public final class Launcher extends Activity
= new HideFromAccessibilityHelper();
// Preferences
private boolean mShowSearchBar;
+ private boolean mShowDockDivider;
private boolean mAutoRotate;
private Runnable mBuildLayersRunnable = new Runnable() {
@@ -377,7 +378,8 @@ public final class Launcher extends Activity
mPaused = false;
// Preferences
mShowSearchBar = PreferencesProvider.Interface.Homescreen.getShowSearchBar(this);
- mAutoRotate = PreferencesProvider.Interface.General.getAutoRotate(this, getResources().getBoolean(R.bool.allow_rotation));
+ mShowDockDivider = PreferencesProvider.Interface.Homescreen.Indicator.getShowDockDivider(this);
+ mAutoRotate = PreferencesProvider.Interface.General.getAutoRotate(this, getResources().getBoolean(R.bool.allow_rotation));
if (PROFILE_STARTUP) {
android.os.Debug.startMethodTracing(
@@ -968,6 +970,10 @@ public final class Launcher extends Activity
((View) findViewById(R.id.qsb_divider)).setVisibility(View.GONE);
}
+ if (!mShowDockDivider) {
+ ((View) findViewById(R.id.dock_divider)).setVisibility(View.GONE);
+ }
+
// Setup AppsCustomize
mAppsCustomizeTabHost = (AppsCustomizeTabHost)
findViewById(R.id.apps_customize_pane);
@@ -2894,15 +2900,23 @@ public final class Launcher extends Activity
void hideDockDivider() {
if (mQsbDivider != null && mDockDivider != null) {
- mQsbDivider.setVisibility(View.INVISIBLE);
- mDockDivider.setVisibility(View.INVISIBLE);
+ if (mShowSearchBar) {
+ mQsbDivider.setVisibility(View.INVISIBLE);
+ }
+ if (mShowDockDivider) {
+ mDockDivider.setVisibility(View.INVISIBLE);
+ }
}
}
void showDockDivider(boolean animated) {
if (mQsbDivider != null && mDockDivider != null) {
- mQsbDivider.setVisibility(View.VISIBLE);
- mDockDivider.setVisibility(View.VISIBLE);
+ if (mShowSearchBar) {
+ mQsbDivider.setVisibility(View.VISIBLE);
+ }
+ if (mShowDockDivider) {
+ mDockDivider.setVisibility(View.VISIBLE);
+ }
if (mDividerAnimator != null) {
mDividerAnimator.cancel();
mQsbDivider.setAlpha(1f);
@@ -2911,8 +2925,10 @@ public final class Launcher extends Activity
}
if (animated) {
mDividerAnimator = LauncherAnimUtils.createAnimatorSet();
- mDividerAnimator.playTogether(LauncherAnimUtils.ofFloat(mQsbDivider, "alpha", 1f),
- LauncherAnimUtils.ofFloat(mDockDivider, "alpha", 1f));
+ if (mShowSearchBar && mShowDockDivider) {
+ mDividerAnimator.playTogether(LauncherAnimUtils.ofFloat(mQsbDivider, "alpha", 1f),
+ LauncherAnimUtils.ofFloat(mDockDivider, "alpha", 1f));
+ }
int duration = 0;
if (mSearchDropTargetBar != null) {
duration = mSearchDropTargetBar.getTransitionInDuration();
diff --git a/src/com/cyanogenmod/trebuchet/Workspace.java b/src/com/cyanogenmod/trebuchet/Workspace.java
index 34442f9..0601589 100644
--- a/src/com/cyanogenmod/trebuchet/Workspace.java
+++ b/src/com/cyanogenmod/trebuchet/Workspace.java
@@ -270,6 +270,7 @@ public class Workspace extends SmoothPagedView
private boolean mScrollWallpaper;
private boolean mShowScrollingIndicator;
private boolean mFadeScrollingIndicator;
+ private boolean mShowDockDivider;
/**
* Used to inflate the Workspace from XML.
@@ -349,6 +350,7 @@ public class Workspace extends SmoothPagedView
mScrollWallpaper = PreferencesProvider.Interface.Homescreen.Scrolling.getScrollWallpaper(context);
mShowScrollingIndicator = PreferencesProvider.Interface.Homescreen.Indicator.getShowScrollingIndicator(context);
mFadeScrollingIndicator = PreferencesProvider.Interface.Homescreen.Indicator.getFadeScrollingIndicator(context);
+ mShowDockDivider = PreferencesProvider.Interface.Homescreen.Indicator.getShowDockDivider(context);
initWorkspace();
@@ -3918,10 +3920,8 @@ public class Workspace extends SmoothPagedView
final View scrollIndicator = getScrollingIndicator();
cancelScrollingIndicatorAnimations();
- if (mShowSearchBar) {
- if (qsbDivider != null) qsbDivider.setAlpha(reducedFade);
- if (dockDivider != null) dockDivider.setAlpha(reducedFade);
- }
- scrollIndicator.setAlpha(1 - fade);
+ if (qsbDivider != null && mShowSearchBar) qsbDivider.setAlpha(reducedFade);
+ if (dockDivider != null && mShowDockDivider) dockDivider.setAlpha(reducedFade);
+ if (scrollIndicator != null && mShowScrollingIndicator) scrollIndicator.setAlpha(1 - fade);
}
}
diff --git a/src/com/cyanogenmod/trebuchet/preference/PreferencesProvider.java b/src/com/cyanogenmod/trebuchet/preference/PreferencesProvider.java
index a12c75e..9551285 100644
--- a/src/com/cyanogenmod/trebuchet/preference/PreferencesProvider.java
+++ b/src/com/cyanogenmod/trebuchet/preference/PreferencesProvider.java
@@ -74,6 +74,10 @@ public final class PreferencesProvider {
final SharedPreferences preferences = context.getSharedPreferences(PREFERENCES_KEY, 0);
return preferences.getBoolean("ui_homescreen_indicator_fade", true);
}
+ public static boolean getShowDockDivider(Context context) {
+ final SharedPreferences preferences = context.getSharedPreferences(PREFERENCES_KEY, 0);
+ return preferences.getBoolean("ui_homescreen_indicator_background", true);
+ }
}
}
generated by cgit v1.1 at 2025-02-03 08:57:52 +0000