Merge "Revert "Changed the ambient display setting name"" into oc-dev

am: 97d3709b25

Change-Id: I6383e11eeba2470bb98822bb393dab909a0c9191
This commit is contained in:
Adrian Roos
2017-04-19 21:53:40 +00:00
committed by android-build-merger

View File

@@ -2378,7 +2378,7 @@
<!-- [CHAR LIMIT=40] Display settings screen, setting option name to change whether the device wakes up when a lift gesture is detected. -->
<string name="lift_to_wake_title">Lift to wake</string>
<!-- [CHAR LIMIT=30] Display settings screen, setting option name to change whether the ambient display feature is enabled. -->
<string name="doze_title">Incoming notification screen</string>
<string name="doze_title">Ambient display</string>
<!-- [CHAR LIMIT=NONE] Display settings screen, setting description for the ambient display feature. -->
<string name="doze_summary">Wake screen when you receive notifications</string>
<!-- [CHAR LIMIT=30] Sound & display settings screen, setting option name to change font size -->