Bill Yi
777c7edf00
[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev
...
am: ef6caf7871
2019-05-18 07:40:52 -07:00
TreeHugger Robot
ef6caf7871
Merge "Import translations. DO NOT MERGE" into qt-dev
2019-05-18 14:28:54 +00:00
Bill Yi
d6d1ac5e87
Import translations. DO NOT MERGE
...
Auto-generated-cl: translation import
Bug: 64712476
Change-Id: I69697c36e862b2725dfd7fa1f542f9f7a3c6fa03
2019-05-18 06:44:53 -07:00
Bill Yi
ef25f3034d
Import translations. DO NOT MERGE
...
Auto-generated-cl: translation import
Bug: 64712476
Change-Id: Iaa2924d0d22913bbd4f1182c974c6ea5b2e321e0
2019-05-18 05:17:15 -07:00
tmfang
246cae7a65
Merge "Fix overlapping problem in display size screen." into qt-dev am: 8416839234
...
am: 3cd9afbc15
2019-05-18 04:38:28 -07:00
tmfang
eeffaa3c60
Merge "Fix overlapping problem in display size screen." into qt-dev am: 8416839234
...
am: 56c774de19
2019-05-18 04:33:27 -07:00
tmfang
3cd9afbc15
Merge "Fix overlapping problem in display size screen." into qt-dev
...
am: 8416839234
2019-05-18 04:33:21 -07:00
tmfang
56c774de19
Merge "Fix overlapping problem in display size screen." into qt-dev
...
am: 8416839234
2019-05-18 04:28:22 -07:00
TreeHugger Robot
8416839234
Merge "Fix overlapping problem in display size screen." into qt-dev
2019-05-18 11:22:34 +00:00
Android Build Merger (Role)
cc87686e00
Merge "Merge "Revert "Change string of switchbar and installed service category title"" into qt-dev am: f508ece42d am: 56c4f9f254" into qt-r1-dev-plus-aosp
2019-05-18 08:28:17 +00:00
Kevin Chang
8abb0c3c33
Merge "Revert "Change string of switchbar and installed service category title"" into qt-dev am: f508ece42d
...
am: 56c4f9f254
2019-05-18 01:28:07 -07:00
Kevin Chang
d77b10c7de
Merge "Revert "Change string of switchbar and installed service category title"" into qt-dev am: f508ece42d
...
am: f8baacfe7f
2019-05-18 01:28:06 -07:00
Kevin Chang
f8baacfe7f
Merge "Revert "Change string of switchbar and installed service category title"" into qt-dev
...
am: f508ece42d
2019-05-18 01:24:02 -07:00
Kevin Chang
56c4f9f254
Merge "Revert "Change string of switchbar and installed service category title"" into qt-dev
...
am: f508ece42d
2019-05-18 01:24:00 -07:00
Kevin Chang
f508ece42d
Merge "Revert "Change string of switchbar and installed service category title"" into qt-dev
2019-05-18 08:09:43 +00:00
Joel Galenson
fffdc8461b
Merge "Show the accessibility usage preference when Permissions Hub is disabled." into qt-dev am: 51c92e5622
...
am: 14f64a0acf
2019-05-17 20:35:24 -07:00
Joel Galenson
e0a10aedd6
Merge "Show the accessibility usage preference when Permissions Hub is disabled." into qt-dev am: 51c92e5622
...
am: 31db115319
2019-05-17 20:17:02 -07:00
Joel Galenson
14f64a0acf
Merge "Show the accessibility usage preference when Permissions Hub is disabled." into qt-dev
...
am: 51c92e5622
2019-05-17 19:35:47 -07:00
Joel Galenson
31db115319
Merge "Show the accessibility usage preference when Permissions Hub is disabled." into qt-dev
...
am: 51c92e5622
2019-05-17 19:25:42 -07:00
TreeHugger Robot
51c92e5622
Merge "Show the accessibility usage preference when Permissions Hub is disabled." into qt-dev
2019-05-18 01:47:09 +00:00
Fan Zhang
856078fc50
Merge changes I06c1bc14,I5415b8ed into qt-dev am: a83638788b
...
am: 909b2192cb
2019-05-17 17:16:08 -07:00
Fan Zhang
b8ac55aec0
Merge changes I06c1bc14,I5415b8ed into qt-dev am: a83638788b
...
am: bc58c1f129
2019-05-17 17:11:18 -07:00
Fan Zhang
909b2192cb
Merge changes I06c1bc14,I5415b8ed into qt-dev
...
am: a83638788b
2019-05-17 16:43:01 -07:00
Fan Zhang
bc58c1f129
Merge changes I06c1bc14,I5415b8ed into qt-dev
...
am: a83638788b
2019-05-17 16:32:11 -07:00
TreeHugger Robot
a83638788b
Merge changes I06c1bc14,I5415b8ed into qt-dev
...
* changes:
Clean up a STOPSHIP string
Fix view overlap in wifi dpp enrollment.
2019-05-17 22:41:26 +00:00
Salvador Martinez
12731cce3d
Break infinite refresh loop in battery estimates
...
There was an infinite loop that could occur in BatterySaverUtils
what was caused by battery saver utils updating the battery estimate
which then told the page to check for an estimate and then it would
repeat from there. This cleans up the logic in that loop slightly
to prevent it from refreshing more than is necessary.
Test: atest BatteryUtilsTest
Bug: 132751712
Change-Id: I918484747ecd9735315570ad608489e0f61d7578
2019-05-17 15:36:55 -07:00
Lei Yu
81d15f029a
Set some BT icon background to white
...
Fixes: 132992480
Test: Manual
Change-Id: I22aad1ab327dd34ad67b9bbac10f6f2e3c9ec139
2019-05-17 14:47:01 -07:00
Fan Zhang
1f8cc8f96d
Clean up a STOPSHIP string
...
Bug: 110557011
Test: rebuild
Change-Id: I06c1bc1460cbb47feb6152298151477549a9e411
2019-05-17 13:44:01 -07:00
Fan Zhang
a10d3cfc78
Fix view overlap in wifi dpp enrollment.
...
Fixes: 132813855
Test: visual
Change-Id: I5415b8edaf1ce5ae122e4d1ee41e65ca825f72e6
2019-05-17 12:58:50 -07:00
Narayan Kamath
67d149ae37
Hide AppButtonsPreferenceController for system modules.
...
Bug: 131927465
Test: atest AppButtonsPreferenceControllerTest
Change-Id: I2d3aa3429f61325afe49bfe322522fe9ccd03b2c
2019-05-17 18:54:39 +01:00
Joel Galenson
e4c8efe245
Show the accessibility usage preference when Permissions Hub is disabled.
...
Fixes: 132909181
Test: See dialog with Permissions Hub disabled.
Test: atest AccessibilityUsagePreferenceControllerTest
Change-Id: I56a433d561b0d77d8ece0fd6752871fa79cec850
2019-05-17 10:19:49 -07:00
Alexey Kuzmin
14d8412455
Add a clarifying comment
...
Bug: 130332550
Test: no test
Change-Id: If6dea9b5deab35f8c2da1019c17be80bbf1c5fd8
2019-05-17 18:00:49 +01:00
Alexey Kuzmin
2fc186cef2
Merge "Play vibration preview when turning on vibration" into qt-dev am: 1a82d653f7
...
am: 09bc5975a4
2019-05-17 07:32:34 -07:00
Alexey Kuzmin
3f6dd2c01d
Merge "Play vibration preview when turning on vibration" into qt-dev am: 1a82d653f7
...
am: aa580944a6
2019-05-17 07:27:24 -07:00
Alexey Kuzmin
09bc5975a4
Merge "Play vibration preview when turning on vibration" into qt-dev
...
am: 1a82d653f7
2019-05-17 07:18:46 -07:00
Alexey Kuzmin
aa580944a6
Merge "Play vibration preview when turning on vibration" into qt-dev
...
am: 1a82d653f7
2019-05-17 07:15:50 -07:00
TreeHugger Robot
1a82d653f7
Merge "Play vibration preview when turning on vibration" into qt-dev
2019-05-17 13:59:43 +00:00
Kevin Chang
d8927cbabf
Revert "Change string of switchbar and installed service category title"
...
This reverts commit 7eddb0e4dc
2019-05-17 08:38:54 +00:00
Mill Chen
9862f8632a
Revert "Revert "Update dialog background color for dark theme""
...
This reverts commit 77259dc9bb
2019-05-17 16:26:10 +08:00
Kevin Chyn
2573421a79
Merge "De-dupe animation name" into qt-r1-dev
...
am: f0581b95fa
2019-05-17 00:30:20 -07:00
Xin Li
62b108d19f
[automerger skipped] Merge "DO NOT MERGE - Merge pie-platform-release (PPRL.190505.001) into master." am: 0a8e4aebf5 -s ours am: 148da1edf8 -s ours
...
am: 5f726765e5
2019-05-16 23:50:04 -07:00
Kevin Chyn
f0581b95fa
Merge "De-dupe animation name" into qt-r1-dev
2019-05-17 05:58:43 +00:00
Xin Li
0d61126115
[automerger skipped] DO NOT MERGE - Merge pie-platform-release (PPRL.190505.001) into master. am: 87f090ba57 -s ours am: af42065ea6 -s ours
...
am: e5107ffba2
2019-05-16 22:58:32 -07:00
Xin Li
5f726765e5
[automerger skipped] Merge "DO NOT MERGE - Merge pie-platform-release (PPRL.190505.001) into master." am: 0a8e4aebf5 -s ours
...
am: 148da1edf8
2019-05-16 21:53:09 -07:00
Xin Li
e5107ffba2
[automerger skipped] DO NOT MERGE - Merge pie-platform-release (PPRL.190505.001) into master. am: 87f090ba57 -s ours
...
am: af42065ea6
2019-05-16 21:26:24 -07:00
tmfang
a5be87fad5
Fix overlapping problem in display size screen.
...
All screen in Settings set clipToPadding to false by default,
so we see this side effect on display size screen.
To fix it, we set clipToPadding and clipChidren to true.
Fixes: 132905691
Test: visual
Change-Id: I58752c0ba7bd033cde97ff6047513a50ab933ae9
2019-05-17 12:04:43 +08:00
Xin Li
148da1edf8
[automerger skipped] Merge "DO NOT MERGE - Merge pie-platform-release (PPRL.190505.001) into master."
...
am: 0a8e4aebf5
2019-05-16 20:45:16 -07:00
Xin Li
af42065ea6
[automerger skipped] DO NOT MERGE - Merge pie-platform-release (PPRL.190505.001) into master.
...
am: 87f090ba57
2019-05-16 19:22:57 -07:00
Joshua Mccloskey
a396a8c1ba
Merge "Modified string" into qt-r1-dev
...
am: 4a6d3f6403
2019-05-16 19:16:15 -07:00
joshmccloskey
f5cbb30b04
Added information icon
...
am: 8fd6269f40
2019-05-16 19:15:28 -07:00
