Doris Ling
11cfc26d0a
Merge "Ensure that brightness level is within 0-100%." into oc-dr1-dev
...
am: 390bb3216d
2017-07-20 20:43:32 +00:00
Evan Laird
bc562b1888
Merge "Fix Settings manifest pointing to old class namespace" into oc-dr1-dev
...
am: a9e2d97004
2017-07-20 20:42:46 +00:00
TreeHugger Robot
390bb3216d
Merge "Ensure that brightness level is within 0-100%." into oc-dr1-dev
2017-07-20 20:34:55 +00:00
TreeHugger Robot
a9e2d97004
Merge "Fix Settings manifest pointing to old class namespace" into oc-dr1-dev
2017-07-20 20:23:53 +00:00
Android Build Merger (Role)
8746483a7c
Merge "Import translations. DO NOT MERGE am: 6cf2d99816 -s ours am: cc298f9ae6 -s ours" into oc-dr1-dev-plus-aosp
2017-07-20 20:05:12 +00:00
Bill Yi
29978d1ee6
Import translations. DO NOT MERGE am: 6cf2d99816 -s ours
...
am: bd3bd7d1e1
2017-07-20 20:04:42 +00:00
Bill Yi
de7f8eb788
Import translations. DO NOT MERGE am: 6cf2d99816 -s ours
...
am: cc298f9ae6
2017-07-20 20:04:41 +00:00
Bill Yi
cc298f9ae6
Import translations. DO NOT MERGE
...
am: 6cf2d99816
2017-07-20 19:58:46 +00:00
Bill Yi
bd3bd7d1e1
Import translations. DO NOT MERGE
...
am: 6cf2d99816
2017-07-20 19:58:46 +00:00
Bill Yi
6cf2d99816
Import translations. DO NOT MERGE
...
Change-Id: If5c18c395a4293f6c084f9019fd37a17ddfd24d9
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
2017-07-20 10:53:14 -07:00
Doris Ling
c496421aef
Ensure that brightness level is within 0-100%.
...
Check whether the retrieved brightnesss value is out of range, and
adjust it if necessary.
Change-Id: Ieb1ccc03dcb9fa3e1ed192fcc3d217b84d4d316c
Fix: 63872023
Test: make RunSettingsRoboTests
(cherry picked from commit c7d2d270ab
2017-07-20 17:39:58 +00:00
Julia Reynolds
2ab6e2ef9e
Merge "Zen priority settings update" into oc-dr1-dev
...
am: 9dec71f7d7
2017-07-20 14:24:03 +00:00
Julia Reynolds
9dec71f7d7
Merge "Zen priority settings update" into oc-dr1-dev
2017-07-20 14:19:33 +00:00
Julia Reynolds
92f2cd5055
Merge "Add separator to auto zen rule listing." into oc-dr1-dev
...
am: afe4ce0927
2017-07-19 16:47:56 +00:00
Julia Reynolds
afe4ce0927
Merge "Add separator to auto zen rule listing." into oc-dr1-dev
2017-07-19 16:44:07 +00:00
Evan Laird
22315adb60
Fix Settings manifest pointing to old class namespace
...
The string declaring the right fragment was never updated to the new
namespace.
Change-Id: I35809f2f35dbf290deeb69d1bc672b86f8d5a752
Fixes: 63677809
Test: make SettingsUnitTests && \
adb install -r out/target/product/<device>/data/app/SettingsUnitTests/SettingsUnitTests.apk && \
adb shell am instrument -w -e class \
com.android.settings.dream.DreamSettingsLaunchTest\
com.android.settings.tests.unit/android.support.test.runner.AndroidJUnitRunner
2017-07-19 10:29:16 -04:00
Alex Kulesza
07bd51e98d
Merge "Make time remaining estimate debug mode more reliable." into oc-dr1-dev
...
am: f21bc100a6
2017-07-19 03:17:43 +00:00
TreeHugger Robot
f21bc100a6
Merge "Make time remaining estimate debug mode more reliable." into oc-dr1-dev
2017-07-19 03:15:29 +00:00
Phil Weaver
f471234779
Merge "Back-port ag/2491664" into nyc-mr1-dev am: 87c77fba92 am: 54e508ca63 am: 4fc6cbfa6a -s ours am: b019e2c469
...
am: 072d4c282e
2017-07-19 01:26:38 +00:00
Phil Weaver
6721c9306a
Merge "Back-port ag/2491664" into nyc-mr1-dev am: 87c77fba92 am: 54e508ca63 am: 4fc6cbfa6a -s ours am: b019e2c469
...
am: ce007d328d
2017-07-19 01:24:33 +00:00
Phil Weaver
072d4c282e
Merge "Back-port ag/2491664" into nyc-mr1-dev am: 87c77fba92 am: 54e508ca63 am: 4fc6cbfa6a -s ours
...
am: b019e2c469
2017-07-19 01:18:04 +00:00
Phil Weaver
ce007d328d
Merge "Back-port ag/2491664" into nyc-mr1-dev am: 87c77fba92 am: 54e508ca63 am: 4fc6cbfa6a -s ours
...
am: b019e2c469
2017-07-19 01:17:52 +00:00
Phil Weaver
b019e2c469
Merge "Back-port ag/2491664" into nyc-mr1-dev am: 87c77fba92 am: 54e508ca63
...
am: 4fc6cbfa6a
2017-07-19 01:11:09 +00:00
Phil Weaver
c64adcde84
Merge "Back-port ag/2491664" into mnc-dev am: 7b3ca9886e am: a801d5e8ec am: f9d05230df am: 4f8be72b18 -s ours am: 2b8694c33d am: 533c1efbc7 am: f5675a9ab0 am: 00143e1a7a am: d68bd495ec am: 1faf81da83
...
am: 947133471e
2017-07-19 01:04:40 +00:00
Alex Kulesza
2f0e60ccda
Make time remaining estimate debug mode more reliable.
...
Previously, the long click handler was unregistered on first use and
never re-registered. This meant that, e.g., on plugging and unplugging
the phone, debug mode stopped working. This change moves long click
activation into restartBatteryInfoLoader().
Bug: 63133793
Test: make RunSettingsRoboTests
Merged-In: I4c25a1f05ab3718bf06faf455cf670b5460a7306
Change-Id: I4c25a1f05ab3718bf06faf455cf670b5460a7306
2017-07-19 01:04:08 +00:00
Phil Weaver
4fc6cbfa6a
Merge "Back-port ag/2491664" into nyc-mr1-dev am: 87c77fba92
...
am: 54e508ca63
2017-07-19 01:00:05 +00:00
Phil Weaver
0666f394b5
Merge "Back-port ag/2491664" into mnc-dev am: 7b3ca9886e am: a801d5e8ec am: f9d05230df am: 4f8be72b18 -s ours am: 2b8694c33d am: 533c1efbc7 am: f5675a9ab0 am: 00143e1a7a am: d68bd495ec am: 1faf81da83
...
am: 7aaec13b05
2017-07-19 00:58:05 +00:00
Phil Weaver
54e508ca63
Merge "Back-port ag/2491664" into nyc-mr1-dev
...
am: 87c77fba92
2017-07-19 00:53:20 +00:00
Phil Weaver
947133471e
Merge "Back-port ag/2491664" into mnc-dev am: 7b3ca9886e am: a801d5e8ec am: f9d05230df am: 4f8be72b18 -s ours am: 2b8694c33d am: 533c1efbc7 am: f5675a9ab0 am: 00143e1a7a am: d68bd495ec
...
am: 1faf81da83
2017-07-19 00:50:50 +00:00
Phil Weaver
7aaec13b05
Merge "Back-port ag/2491664" into mnc-dev am: 7b3ca9886e am: a801d5e8ec am: f9d05230df am: 4f8be72b18 -s ours am: 2b8694c33d am: 533c1efbc7 am: f5675a9ab0 am: 00143e1a7a am: d68bd495ec
...
am: 1faf81da83
2017-07-19 00:46:36 +00:00
Phil Weaver
87c77fba92
Merge "Back-port ag/2491664" into nyc-mr1-dev
2017-07-19 00:46:35 +00:00
Phil Weaver
1faf81da83
Merge "Back-port ag/2491664" into mnc-dev am: 7b3ca9886e am: a801d5e8ec am: f9d05230df am: 4f8be72b18 -s ours am: 2b8694c33d am: 533c1efbc7 am: f5675a9ab0 am: 00143e1a7a
...
am: d68bd495ec
2017-07-19 00:40:56 +00:00
Phil Weaver
d68bd495ec
Merge "Back-port ag/2491664" into mnc-dev am: 7b3ca9886e am: a801d5e8ec am: f9d05230df am: 4f8be72b18 -s ours am: 2b8694c33d am: 533c1efbc7 am: f5675a9ab0
...
am: 00143e1a7a
2017-07-19 00:31:13 +00:00
Phil Weaver
00143e1a7a
Merge "Back-port ag/2491664" into mnc-dev am: 7b3ca9886e am: a801d5e8ec am: f9d05230df am: 4f8be72b18 -s ours am: 2b8694c33d am: 533c1efbc7
...
am: f5675a9ab0
2017-07-19 00:24:40 +00:00
Phil Weaver
f5675a9ab0
Merge "Back-port ag/2491664" into mnc-dev am: 7b3ca9886e am: a801d5e8ec am: f9d05230df am: 4f8be72b18 -s ours am: 2b8694c33d
...
am: 533c1efbc7
2017-07-19 00:15:50 +00:00
Phil Weaver
533c1efbc7
Merge "Back-port ag/2491664" into mnc-dev am: 7b3ca9886e am: a801d5e8ec am: f9d05230df am: 4f8be72b18 -s ours
...
am: 2b8694c33d
2017-07-19 00:05:08 +00:00
Phil Weaver
2b8694c33d
Merge "Back-port ag/2491664" into mnc-dev am: 7b3ca9886e am: a801d5e8ec am: f9d05230df
...
am: 4f8be72b18
2017-07-18 23:58:43 +00:00
Phil Weaver
4f8be72b18
Merge "Back-port ag/2491664" into mnc-dev am: 7b3ca9886e am: a801d5e8ec
...
am: f9d05230df
2017-07-18 23:41:33 +00:00
Phil Weaver
f9d05230df
Merge "Back-port ag/2491664" into mnc-dev am: 7b3ca9886e
...
am: a801d5e8ec
2017-07-18 23:35:31 +00:00
Phil Weaver
a801d5e8ec
Merge "Back-port ag/2491664" into mnc-dev
...
am: 7b3ca9886e
2017-07-18 23:29:03 +00:00
Phil Weaver
7b3ca9886e
Merge "Back-port ag/2491664" into mnc-dev
2017-07-18 23:21:17 +00:00
Phil Weaver
e76e053595
Back-port ag/2491664
...
Bug: 62196835
Test: Verify overlays disappear on a11y capabilities
dialog.
Change-Id: Ic675012dd9faa8e53d1d4b126b3ba68fecdab992
2017-07-18 15:51:28 -07:00
Phil Weaver
587467249a
Merge "Back-port ag/2491664" into nyc-dev am: 3adf585961 -s ours am: 6fee9a5e91 am: ade8640d4d am: 57f1af6a0b am: ae07650724 am: 3ae8ac0911
...
am: 8c1c7cae13
2017-07-18 22:38:23 +00:00
Phil Weaver
42371fc2b3
Merge "Back-port ag/2491664" into lmp-dev am: 41492a1e2c am: cbbdc18c7b am: c84dc8feb3 am: 4b029f8b0d am: 4c70016a94 am: 46592e90a9 am: 55b3b1f349 am: af26bae8b3 am: a1426f209c am: 2e690de9cf am: 7a7d6b1d0c am: 3099a7f794 am: ce3fef5c99
...
am: b2d3c5e392
2017-07-18 22:28:15 +00:00
Phil Weaver
8c1c7cae13
Merge "Back-port ag/2491664" into nyc-dev am: 3adf585961 -s ours am: 6fee9a5e91 am: ade8640d4d am: 57f1af6a0b am: ae07650724
...
am: 3ae8ac0911
2017-07-18 22:22:39 +00:00
Phil Weaver
058b43c382
Merge "Back-port ag/2491664" into nyc-dev am: 3adf585961 -s ours am: 6fee9a5e91 am: ade8640d4d am: 57f1af6a0b am: ae07650724 am: 3ae8ac0911
...
am: 8ff3fd420c
2017-07-18 22:19:45 +00:00
Phil Weaver
8ff3fd420c
Merge "Back-port ag/2491664" into nyc-dev am: 3adf585961 -s ours am: 6fee9a5e91 am: ade8640d4d am: 57f1af6a0b am: ae07650724
...
am: 3ae8ac0911
2017-07-18 22:18:18 +00:00
Phil Weaver
c62bb9efd7
Merge "Back-port ag/2491664" into lmp-dev am: 41492a1e2c am: cbbdc18c7b am: c84dc8feb3 am: 4b029f8b0d am: 4c70016a94 am: 46592e90a9 am: 55b3b1f349 am: af26bae8b3 am: a1426f209c am: 2e690de9cf am: 7a7d6b1d0c am: 3099a7f794 am: ce3fef5c99
...
am: 7c3daa9ba5
2017-07-18 22:15:51 +00:00
Phil Weaver
3ae8ac0911
Merge "Back-port ag/2491664" into nyc-dev am: 3adf585961 -s ours am: 6fee9a5e91 am: ade8640d4d am: 57f1af6a0b
...
am: ae07650724
2017-07-18 22:15:30 +00:00
Phil Weaver
ae07650724
Merge "Back-port ag/2491664" into nyc-dev am: 3adf585961 -s ours am: 6fee9a5e91 am: ade8640d4d
...
am: 57f1af6a0b
2017-07-18 22:11:43 +00:00
