Merge "Eliminate duplicate keys in pref xmls."

This commit is contained in:
TreeHugger Robot
2017-10-28 19:39:28 +00:00
committed by Android (Google) Code Review
20 changed files with 108 additions and 223 deletions

View File

@@ -50,7 +50,7 @@ public class DisplaySettings extends DashboardFragment {
private static final String TAG = "DisplaySettings";
public static final String KEY_AUTO_BRIGHTNESS = "auto_brightness";
public static final String KEY_DISPLAY_SIZE = "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_AMBIENT_DISPLAY = "ambient_display";