Merge "Remove controller definitions from code"
This commit is contained in:
committed by
Android (Google) Code Review
commit
eae1ce5806
@@ -23,7 +23,6 @@ import com.android.internal.hardware.AmbientDisplayConfiguration;
|
|||||||
import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
|
import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
|
||||||
import com.android.settings.dashboard.DashboardFragment;
|
import com.android.settings.dashboard.DashboardFragment;
|
||||||
import com.android.settings.display.AmbientDisplayPreferenceController;
|
import com.android.settings.display.AmbientDisplayPreferenceController;
|
||||||
import com.android.settings.display.AutoBrightnessPreferenceController;
|
|
||||||
import com.android.settings.display.AutoRotatePreferenceController;
|
import com.android.settings.display.AutoRotatePreferenceController;
|
||||||
import com.android.settings.display.BrightnessLevelPreferenceController;
|
import com.android.settings.display.BrightnessLevelPreferenceController;
|
||||||
import com.android.settings.display.CameraGesturePreferenceController;
|
import com.android.settings.display.CameraGesturePreferenceController;
|
||||||
@@ -50,7 +49,6 @@ import java.util.List;
|
|||||||
public class DisplaySettings extends DashboardFragment {
|
public class DisplaySettings extends DashboardFragment {
|
||||||
private static final String TAG = "DisplaySettings";
|
private static final String TAG = "DisplaySettings";
|
||||||
|
|
||||||
public static final String KEY_AUTO_BRIGHTNESS = "auto_brightness";
|
|
||||||
public static final String KEY_DISPLAY_SIZE = "display_settings_screen_zoom";
|
public static final String KEY_DISPLAY_SIZE = "display_settings_screen_zoom";
|
||||||
|
|
||||||
private static final String KEY_SCREEN_TIMEOUT = "screen_timeout";
|
private static final String KEY_SCREEN_TIMEOUT = "screen_timeout";
|
||||||
@@ -86,7 +84,6 @@ public class DisplaySettings extends DashboardFragment {
|
|||||||
private static List<AbstractPreferenceController> buildPreferenceControllers(
|
private static List<AbstractPreferenceController> buildPreferenceControllers(
|
||||||
Context context, Lifecycle lifecycle) {
|
Context context, Lifecycle lifecycle) {
|
||||||
final List<AbstractPreferenceController> controllers = new ArrayList<>();
|
final List<AbstractPreferenceController> controllers = new ArrayList<>();
|
||||||
controllers.add(new AutoBrightnessPreferenceController(context, KEY_AUTO_BRIGHTNESS));
|
|
||||||
controllers.add(new AutoRotatePreferenceController(context, lifecycle));
|
controllers.add(new AutoRotatePreferenceController(context, lifecycle));
|
||||||
controllers.add(new CameraGesturePreferenceController(context));
|
controllers.add(new CameraGesturePreferenceController(context));
|
||||||
controllers.add(new FontSizePreferenceController(context));
|
controllers.add(new FontSizePreferenceController(context));
|
||||||
|
Reference in New Issue
Block a user