PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge changes from topic "easel-dev-to-oc-mr1-dev" into oc-mr1-dev

Browse Source 
am: fa3af7b0e7

Change-Id: I67347d636270ab4995dcb315c0adc0f67bf82795
This commit is contained in:
Chien-Yu Chen
2017-12-03 03:28:40 +00:00
committed by android-build-merger
parent c8d91c6066 fa3af7b0e7
commit 890c9a7ad3
6 changed files with 0 additions and 273 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
res/values/config.xml
View File

@@ -41,9 +41,6 @@
<!-- Whether to show TelphonyMonitor switch in Developer Options -->
<bool name="config_show_telephony_monitor">false</bool>
<!-- Whether to show Camera HAL HDR+ switch in Developer Options -->
<bool name="config_show_camera_hal_hdrplus">false</bool>
<!-- Whether to show Camera laser sensor switch in Developer Options -->
<bool name="config_show_camera_laser_sensor">false</bool>

6
res/values/strings.xml
View File

@@ -8241,12 +8241,6 @@
<!-- Toast message letting the user know the how to trigger telephony monitor -->
<string name="telephony_monitor_toast">To apply telephony monitor change, reboot device</string>
<!-- Title for Camera HAL HDR+ switch [CHAR LIMIT=50] -->
<string name="camera_hal_hdrplus_switch">Camera HAL HDR+</string>
<!-- Toast message letting the user know how to enable Camera HAL HDR+ -->
<string name="camera_hal_hdrplus_toast">To apply Camera HAL HDR+ change, reboot device</string>
<!-- Title for Camera laser sensor switch [CHAR LIMIT=NONE] -->
<string name="camera_laser_sensor_switch">Camera Laser Sensor</string>

4
res/xml/development_prefs.xml
View File

@@ -167,10 +167,6 @@
android:key="camera_laser_sensor_switch"
android:title="@string/camera_laser_sensor_switch" />
<SwitchPreference
android:key="camera_hal_hdrplus_switch"
android:title="@string/camera_hal_hdrplus_switch" />
</PreferenceCategory>
<PreferenceCategory android:key="debug_networking_category"