OSDN Git Service

Merge changes Ia33ab1ab,I1d01ab5d
authorTreeHugger Robot <treehugger-gerrit@google.com>
Thu, 16 Feb 2017 02:28:18 +0000 (02:28 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Thu, 16 Feb 2017 02:28:23 +0000 (02:28 +0000)
* changes:
  AOD: Add toggle for waking up instead of ambient display on sensors
  AOD: Refactor DozeMachine to allow waking up

1  2 
packages/SystemUI/res/values/strings.xml
packages/SystemUI/res/xml/tuner_prefs.xml