添加循环滑动开关

Author: yuchuangu85

res/values/config.xml

@@ -4,6 +4,7 @@
  <bool name="is_tablet">false</bool>
  <bool name="is_large_tablet">false</bool>
  <bool name="allow_rotation">false</bool>
+ <bool name="allow_circle_scroll">false</bool>
 
  <integer name="extracted_color_gradient_alpha">153</integer>
 

res/values/strings.xml

@@ -362,4 +362,6 @@
 
  <string name="widget_count_format">(%1$d)</string>
  <string name="widget_span_format">(%1$dx%2$d)</string>
+
+ <string name="allow_circle_scroll_title">允许循环滑动</string>
 </resources>

res/xml/launcher_preferences.xml

@@ -43,6 +43,12 @@
  android:defaultValue="@bool/allow_rotation"
  android:persistent="true"/>
 
+ <SwitchPreference
+ android:key="pref_allowCircleScroll"
+ android:title="@string/allow_circle_scroll_title"
+ android:defaultValue="@bool/allow_circle_scroll"
+ android:persistent="true"/>
+
  <ListPreference
  android:key="pref_override_icon_shape"
  android:title="@string/icon_shape_override_label"

src/com/android/launcher3/CircularSlidePagedView.java

@@ -223,7 +223,7 @@ private void drawCircularPageIfNeed(Canvas canvas) {
 
  @Override
  protected boolean isPagedViewCircledScroll() {
- return MxSettings.sIsPagedViewCircleScroll;
+ return MxSettings.getInstance().isPageViewCircleScroll();
  }
 
 }

src/com/android/launcher3/SettingsActivity.java

@@ -33,6 +33,7 @@
 import android.preference.Preference;
 import android.preference.PreferenceFragment;
 import android.preference.PreferenceScreen;
+import android.preference.SwitchPreference;
 import android.provider.Settings;
 import android.text.TextUtils;
 import android.view.View;
@@ -41,6 +42,7 @@
 
 import com.android.launcher3.graphics.IconShapeOverride;
 import com.android.launcher3.notification.NotificationListener;
+import com.android.launcher3.setting.MxSettings;
 import com.android.launcher3.util.ListViewHighlighter;
 import com.android.launcher3.util.SettingsObserver;
 import com.android.launcher3.views.ButtonPreference;
@@ -56,6 +58,9 @@
 public class SettingsActivity extends Activity {
 
  private static final String ICON_BADGING_PREFERENCE_KEY = "pref_icon_badging";
+
+ public static final String ALLOW_CIRCLE_SCROLL_PREFERENCE_KEY = "pref_allowCircleScroll";
+
  /**
  * Hidden field MxSettings.Secure.NOTIFICATION_BADGING
  */
@@ -141,6 +146,17 @@ public void onCreate(Bundle savedInstanceState) {
  // Initialize the UI once
  rotationPref.setDefaultValue(getAllowRotationDefaultValue());
  }
+
+ SwitchPreference circleScroll = (SwitchPreference) findPreference(ALLOW_CIRCLE_SCROLL_PREFERENCE_KEY);
+ circleScroll.setDefaultValue(MxSettings.getInstance().isPageViewCircleScroll());
+ circleScroll.setChecked(MxSettings.getInstance().isPageViewCircleScroll());
+ circleScroll.setOnPreferenceChangeListener((preference, newValue) -> {
+ boolean isChecked = (boolean) newValue;
+ MxSettings.getInstance().setPagedViewCircleScroll(isChecked);
+ circleScroll.setChecked(isChecked);
+ return true;
+ });
+
  }
 
  @Override

src/com/android/launcher3/setting/MxSettings.java

@@ -19,7 +19,7 @@ public final class MxSettings {
  /**
  * PagedView can scroll circle-endless.
  */
- public static boolean sIsPagedViewCircleScroll = FeatureFlags.LAUNCHER3_CIRCLE_SCROLL;
+ private boolean isPagedViewCircleScroll = FeatureFlags.LAUNCHER3_CIRCLE_SCROLL;
  private Context mContext;
 
 
@@ -34,15 +34,20 @@ public static MxSettings getInstance() {
  public void loadSettings(Context context) {
  mContext = context.getApplicationContext();
 // sLauncherEffect = LauncherSpUtil.getIntData(mContext, LauncherSpUtil.KEY_SCROLL_EFFECT, TransitionEffect.TRANSITION_EFFECT_NONE);
+ loadScreenCycle();
  }
 
  public void setPagedViewCircleScroll(boolean isPagedViewCircleScroll) {
- MxSettings.sIsPagedViewCircleScroll = isPagedViewCircleScroll;
+ this.isPagedViewCircleScroll = isPagedViewCircleScroll;
  LauncherSpUtil.saveBooleanData(mContext, LauncherSpUtil.KEY_PAGE_CIRCLE, isPagedViewCircleScroll);
  }
 
  public void loadScreenCycle() {
- sIsPagedViewCircleScroll = LauncherSpUtil.getBooleanData(mContext, LauncherSpUtil.KEY_PAGE_CIRCLE);
+ isPagedViewCircleScroll = LauncherSpUtil.getBooleanData(mContext, LauncherSpUtil.KEY_PAGE_CIRCLE);
+ }
+
+ public boolean isPageViewCircleScroll() {
+ return isPagedViewCircleScroll;
  }
 
  public void setLauncherEffect(int effect) {