Merge "Revert "Add support for device state based auto-rotation prefere...""
This commit is contained in:
committed by
Android (Google) Code Review
commit
3c65556ceb
@@ -96,27 +96,12 @@
|
||||
<PreferenceCategory
|
||||
android:title="@string/category_name_display_controls">
|
||||
|
||||
<!--
|
||||
Standard auto-rotation preference that will be shown when device state based
|
||||
auto-rotation settings are NOT available.
|
||||
-->
|
||||
<SwitchPreference
|
||||
android:key="auto_rotate"
|
||||
android:title="@string/accelerometer_title"
|
||||
settings:keywords="@string/keywords_auto_rotate"
|
||||
settings:controller="com.android.settings.display.AutoRotatePreferenceController"/>
|
||||
|
||||
<!--
|
||||
Auto-rotation preference that will be shown when device state based auto-rotation
|
||||
settings are available.
|
||||
-->
|
||||
<Preference
|
||||
android:key="device_state_auto_rotate"
|
||||
android:title="@string/accelerometer_title"
|
||||
android:fragment="com.android.settings.display.DeviceStateAutoRotateDetailsFragment"
|
||||
settings:keywords="@string/keywords_auto_rotate"
|
||||
settings:controller="com.android.settings.display.DeviceStateAutoRotateOverviewController"/>
|
||||
|
||||
<SwitchPreference
|
||||
android:key="display_white_balance"
|
||||
android:title="@string/display_white_balance_title"
|
||||
|
||||
Reference in New Issue
Block a user