summaryrefslogtreecommitdiff
path: root/tools/aapt2/java/JavaClassGenerator_test.cpp
diff options
context:
space:
mode:
authorDave Mankoff <mankoff@google.com>2020-02-13 16:15:39 -0500
committerDave Mankoff <mankoff@google.com>2020-02-25 16:25:41 +0000
commit55d5d8c76cbb4d8fd18d11f2dd66d33887995cbd (patch)
treefd7e16274e917375b87fb209f841cee022e7035f /tools/aapt2/java/JavaClassGenerator_test.cpp
parentcb2d2ec786140c9ff001868308d5ffb1c0456d2a (diff)
Use alternative prox sensor when specified.
This is a manual upstream merge of http://ag/10320285 from Q to R. It does not merge cleanly since the usage of prox sensors has been consolidated in R. With this change, devices are able to specify an alternative proximity sensor via R.string.proximity_sensor_type, along with a threshold value below which the proximity sensor is considered "near". Prior to this, the R.string.doze_brightness_sensor_type value was serving double duty for this purpose, but, for at least some devices, we want to have a different brightness sensor vs proximity sensor. Bug: 149420648 Test: manual Change-Id: Ifd2006cce1c7a653fd67a7a33b63c5f638384bab
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions