Christine Franks bfb671391d resolve merge conflicts of 92f7794d90 to master ...

Test: I solemnly swer I tested this conflict resolution.
Change-Id: I2cbcd06b906904365f9257742ab1c51b67adc3af

2017-09-19 18:24:33 -07:00

..

AmbientDisplayAlwaysOnPreferenceController.java

Merge "Refactoring for AmbientAlwaysOnPreferenceController" into oc-dr1-dev

2017-08-09 13:06:33 +00:00

AmbientDisplayNotificationsPreferenceController.java

Add ambient notifications as inline setting.

2017-07-26 20:20:19 +00:00

AmbientDisplayPreferenceController.java

Make PreferenceController a mixin

2017-06-26 10:58:36 -07:00

AmbientDisplaySettings.java

Disable lift-to-wake when always-on is checked

2017-07-12 13:42:34 -04:00

AppGridView.java

…

AutoBrightnessPreferenceController.java

Add default value to inline payloads

2017-07-25 14:37:05 -07:00

AutoRotatePreferenceController.java

Make PreferenceController a mixin

2017-06-26 10:58:36 -07:00

BatteryPercentagePreferenceController.java

Make PreferenceController a mixin

2017-06-26 10:58:36 -07:00

BrightnessLevelPreferenceController.java

Consolidate all wrappers used for testing.

2017-09-14 18:24:49 -07:00

CameraGesturePreferenceController.java

Make PreferenceController a mixin

2017-06-26 10:58:36 -07:00

ColorModePreferenceController.java

Make PreferenceController a mixin

2017-06-26 10:58:36 -07:00

ConversationMessageView.java

Recycle TypedArray in ConversationMessageView.

2017-07-13 19:14:57 -07:00

DensityPreference.java

Use SettingsLib's versions of Custom* classes.

2017-06-21 14:47:37 -07:00

FontSizePreferenceController.java

Make PreferenceController a mixin

2017-06-26 10:58:36 -07:00

LiftToWakePreferenceController.java

Make PreferenceController a mixin

2017-06-26 10:58:36 -07:00

MessageBubbleBackground.java

…

NightDisplayPreference.java

Handle night display state when timezone changes

2017-09-19 10:54:13 -07:00

NightDisplayPreferenceController.java

Make PreferenceController a mixin

2017-06-26 10:58:36 -07:00

NightDisplaySettings.java

Handle night display state when timezone changes

2017-09-19 10:54:13 -07:00

NightModePreferenceController.java

Make PreferenceController a mixin

2017-06-26 10:58:36 -07:00

ScreenSaverPreferenceController.java

Make PreferenceController a mixin

2017-06-26 10:58:36 -07:00

ScreenZoomPreference.java

Always reserve space for preference icons.

2016-12-12 16:02:45 -08:00

ScreenZoomPreferenceFragmentForSetupWizard.java

…

ScreenZoomSettings.java

Adding help links to font size and display settings screens.

2017-03-28 02:01:26 -07:00

TapToWakePreferenceController.java

Make PreferenceController a mixin

2017-06-26 10:58:36 -07:00

ThemePreferenceController.java

Make PreferenceController a mixin

2017-06-26 10:58:36 -07:00

TimeoutPreferenceController.java

Make PreferenceController a mixin

2017-06-26 10:58:36 -07:00

VrDisplayPreferenceController.java

Make PreferenceController a mixin

2017-06-26 10:58:36 -07:00

VrDisplayPreferencePicker.java

Change "When in VR mode" to full screen radio button picker

2017-03-23 13:44:23 -07:00

WallpaperPreferenceController.java

Disable Wallpaper setting when Wallpaper is disabled.

2017-07-25 16:40:30 -07:00