Bill Yi
beb1dab803
Merge "Import translations. DO NOT MERGE am: 6cf2d99816 -s ours am: cc298f9ae6 -s ours" into oc-dr1-dev-plus-aosp
...
am: 8746483a7c
2017-07-20 20:10:38 +00:00
Android Build Merger (Role)
2929aa2069
Merge "Import translations. DO NOT MERGE am: 6cf2d99816 -s ours am: bd3bd7d1e1 -s ours am: 29978d1ee6 -s ours" into oc-mr1-dev-plus-aosp
2017-07-20 20:10:30 +00:00
Bill Yi
576a46e8c5
Import translations. DO NOT MERGE am: 6cf2d99816 -s ours am: bd3bd7d1e1 -s ours
...
am: 29978d1ee6
2017-07-20 20:10:13 +00:00
Bill Yi
b840846416
Import translations. DO NOT MERGE am: 6cf2d99816 -s ours am: cc298f9ae6 -s ours
...
am: 821967eca5
2017-07-20 20:10:11 +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
821967eca5
Import translations. DO NOT MERGE am: 6cf2d99816 -s ours
...
am: cc298f9ae6
2017-07-20 20:04:42 +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
Doris Ling
68406aaa69
Move Gesture settings up one level.
...
am: 204ca74397
2017-07-20 19:33:08 +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
Antony Sargent
64fab6f4cd
Switch to using gray icon for Bluetooth imaging devices
...
All the other Bluetooth icons were switched to gray at some point in the
past, but we must have missed this one.
Bug: 63858978
Test: make RunSettingsRoboTests
Change-Id: I2ebefa42f3ecff8ae6d58f4bdb22dce39ae4dbd4
2017-07-20 09:54:29 -07:00
Doris Ling
204ca74397
Move Gesture settings up one level.
...
Move System->Languages, input & gestures->Gestures to System->Gestures.
Change-Id: Ie81876208383f69ebf1a0465d76c760d7dd9d95d
Fix: 62276882
Test: make RunSettingsRoboTests
(cherry picked from commit 55ce7de7d0
2017-07-20 16:46:44 +00:00
Fan Zhang
bac6458a22
Ignore clicks on developer switch UI during monkey test
...
Change-Id: I10c4771386bb38e117848da385090dec78e4a2f8
Fix: 63852950
Test: robotests
2017-07-20 16:44:28 +00:00
Android Build Merger (Role)
f2223accb0
Merge "Merge "Zen priority settings update" into oc-dr1-dev am: 9dec71f7d7 am: b49578e485" into oc-mr1-dev-plus-aosp
2017-07-20 14:27:14 +00:00
Julia Reynolds
986210c390
Merge "Zen priority settings update" into oc-dr1-dev am: 9dec71f7d7
...
am: b49578e485
2017-07-20 14:27:01 +00:00
Julia Reynolds
8639bbcb2e
Merge "Zen priority settings update" into oc-dr1-dev am: 9dec71f7d7
...
am: 2ab6e2ef9e
2017-07-20 14:26:50 +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
b49578e485
Merge "Zen priority settings update" into oc-dr1-dev
...
am: 9dec71f7d7
2017-07-20 14:23:51 +00:00
Julia Reynolds
9dec71f7d7
Merge "Zen priority settings update" into oc-dr1-dev
2017-07-20 14:19:33 +00:00
Bill Yi
606f83bd74
Import translations. DO NOT MERGE
...
Change-Id: I1dad650eb3d6c49c1b1b8b6873a2f8a0ffe89a9c
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
2017-07-19 23:13:29 -07:00
Salvador Martinez
7961627680
Add some more logging to settings battery stuff
...
This CL adds logging to areas which are possible suspects for
the slowdown some people have been reporting in the
PowerUsageAdvanced screen. It times the time it takes for various
battery stats methods as well as the time it takes to draw things.
Test: still build (only adds logging)
Bug: 62959645
Bug: 63442960
Change-Id: I7e6c5e83e33a931057c9fdef14d3bef84f514940
2017-07-19 18:16:56 -07:00
Rajeev Kumar
5984c71af2
Merge "Data plan usage summary activity."
2017-07-19 21:41:09 +00:00
TreeHugger Robot
1dcfbdb0cc
Merge "Delete " / " delimiter in Settings app."
2017-07-19 20:39:05 +00:00
Rajeev Kumar
4a5e3dc6c5
Data plan usage summary activity.
...
Change-Id: Ibb0889563d432591fd00ac00d03633b1894ad124
Note: These changes are required for Data balance UI.
Bug: 62349208
Test: make RunSettingsRoboTests -j40
2017-07-19 12:35:24 -07:00
TreeHugger Robot
ba70d1866f
Merge "Settings: Add SMS Mirroring."
2017-07-19 16:52:57 +00:00
Julia Reynolds
33e8223fe2
Merge "Add separator to auto zen rule listing." into oc-dr1-dev am: afe4ce0927
...
am: 92f2cd5055
2017-07-19 16:50:55 +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
Oren Blasberg
d33dcf13ee
Settings: Add SMS Mirroring.
...
Bug: 37546615
Test: Updated Robolectric suite with new unit tests.
Change-Id: I02e1723e1b125b004ff679d6242df14bca4f08ce
2017-07-19 08:07:11 -07: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
c0cc7feb6e
Merge "Make time remaining estimate debug mode more reliable." into oc-dr1-dev am: f21bc100a6
...
am: 07bd51e98d
2017-07-19 03:22:39 +00: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
3884450e48
Merge "Back-port ag/2491664" into nyc-mr1-dev am: 87c77fba92 am: 54e508ca63 am: 4fc6cbfa6a -s ours am: b019e2c469 am: 072d4c282e
...
am: f471234779
2017-07-19 01:37:05 +00:00
Phil Weaver
78f6716a6b
Merge "Back-port ag/2491664" into nyc-mr1-dev am: 87c77fba92 am: 54e508ca63 am: 4fc6cbfa6a -s ours am: b019e2c469 am: ce007d328d
...
am: 6721c9306a
2017-07-19 01:33:28 +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
3c958c13e7
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
...
am: c64adcde84
2017-07-19 01:16:58 +00:00
Phil Weaver
5fd5a650f4
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
...
am: 0666f394b5
2017-07-19 01:16:27 +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
TreeHugger Robot
a18a1cd3c9
Merge "Make time remaining estimate debug mode more reliable."
2017-07-19 01:00:04 +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
