Merge "Introduce LogdSizePreferenceControllerV2"

src/com/android/settings/development/DevelopmentSettingsDashboardFragment.java

@@ -269,7 +269,7 @@ public class DevelopmentSettingsDashboardFragment extends RestrictedDashboardFra
         controllers.add(new SelectDebugAppPreferenceController(context, fragment));
         controllers.add(new WaitForDebuggerPreferenceController(context));
         controllers.add(new VerifyAppsOverUsbPreferenceControllerV2(context));
-        // logger buffer sizes
+        controllers.add(new LogdSizePreferenceControllerV2(context));
         // store logger data persistently on device
         controllers.add(new ConnectivityMonitorPreferenceControllerV2(context));
         controllers.add(new CameraLaserSensorPreferenceControllerV2(context));

src/com/android/settings/development/LogdSizePreferenceController.java

@@ -21,6 +21,10 @@ import android.content.Context;
 import com.android.settings.core.PreferenceControllerMixin;
 import com.android.settingslib.development.AbstractLogdSizePreferenceController;
 
+/**
+ * deprecated in favor of {@link LogdSizePreferenceControllerV2}
+ */
+@Deprecated
 public class LogdSizePreferenceController extends AbstractLogdSizePreferenceController
         implements PreferenceControllerMixin {
 

src/com/android/settings/development/LogdSizePreferenceControllerV2.java

@@ -0,0 +1,58 @@
+/*
+ * Copyright (C) 2017 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.development;
+
+import android.content.Context;
+import android.support.v7.preference.ListPreference;
+import android.support.v7.preference.Preference;
+import android.support.v7.preference.PreferenceScreen;
+
+import com.android.settings.core.PreferenceControllerMixin;
+import com.android.settingslib.development.AbstractLogdSizePreferenceController;
+
+public class LogdSizePreferenceControllerV2 extends AbstractLogdSizePreferenceController implements
+        Preference.OnPreferenceChangeListener, PreferenceControllerMixin {
+
+    private ListPreference mPreference;
+
+    public LogdSizePreferenceControllerV2(Context context) {
+        super(context);
+    }
+
+    @Override
+    public void displayPreference(PreferenceScreen screen) {
+        super.displayPreference(screen);
+
+        mPreference = (ListPreference) screen.findPreference(getPreferenceKey());
+    }
+
+    @Override
+    public void updateState(Preference preference) {
+        updateLogdSizeValues();
+    }
+
+    @Override
+    protected void onDeveloperOptionsSwitchEnabled() {
+        mPreference.setEnabled(true);
+    }
+
+    @Override
+    protected void onDeveloperOptionsSwitchDisabled() {
+        writeLogdSizeOption(null /* new value */);
+        mPreference.setEnabled(false);
+    }
+}