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
Bill Yi
8d15e9a685
Import translations. DO NOT MERGE
...
Change-Id: I7f7f22146f8a2bb75a24dd30b81b97ea8a543ab6
Auto-generated-cl: translation import
2019-05-18 03:38:30 -07: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
41856191b4
Merge "Show the accessibility usage preference when Permissions Hub is disabled." into qt-dev am: 51c92e5622 am: 14f64a0acf
...
am: fffdc8461b
2019-05-17 22:42:33 -07:00
Joel Galenson
02ab9a74fd
Merge "Show the accessibility usage preference when Permissions Hub is disabled." into qt-dev am: 51c92e5622 am: 31db115319
...
am: e0a10aedd6
2019-05-17 22:00:08 -07:00
Fan Zhang
2f730260db
Merge changes I06c1bc14,I5415b8ed into qt-dev am: a83638788b am: 909b2192cb
...
am: 856078fc50
2019-05-17 21:58:56 -07:00
Fan Zhang
9842725a23
Merge changes I06c1bc14,I5415b8ed into qt-dev am: a83638788b am: bc58c1f129
...
am: b8ac55aec0
2019-05-17 21:57:36 -07:00
Alexey Kuzmin
7a48111584
Merge "Play vibration preview when turning on vibration" into qt-dev am: 1a82d653f7 am: 09bc5975a4
...
am: 2fc186cef2
2019-05-17 21:56:39 -07:00
Alexey Kuzmin
12f1fc8b94
Merge "Play vibration preview when turning on vibration" into qt-dev am: 1a82d653f7 am: aa580944a6
...
am: 3f6dd2c01d
2019-05-17 21:55:43 -07: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
Marc Plano-Lesay
336b2baa6f
Merge "Make the private DNS mode dialog entries full width."
2019-05-17 22:44:15 +00: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
Kevin Chyn
82ee26b6c1
Merge "De-dupe animation name" into qt-r1-dev am: f0581b95fa
...
am: 2573421a79
2019-05-17 14:48:45 -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
Xin Li
236d27b93f
[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
...
am: 62b108d19f
2019-05-17 13:52:04 -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
Android Build Merger (Role)
f16d4fb7a7
Merge "[automerger skipped] DO NOT MERGE - Merge pie-platform-release (PPRL.190505.001) into master. am: 87f090ba57 -s ours am: af42065ea6 -s ours am: e5107ffba2 am: 0d61126115 -s ours am skip reason: subject contains skip directive"
2019-05-17 19:32:24 +00:00
Xin Li
4ee7ab0563
[automerger skipped] DO NOT MERGE - Merge pie-platform-release (PPRL.190505.001) into master. am: 87f090ba57 -s ours am: af42065ea6 -s ours am: e5107ffba2
...
am: 0d61126115
2019-05-17 12:11:25 -07:00
Android Build Merger (Role)
18a8434165
Merge changes from topic "am-4f4390cd81144667b143214eb38ca2b9"
...
* changes:
Merge "Modified string" into qt-r1-dev am: 4a6d3f6403a396a8c1ba8fd6269f40f5cbb30b04
2019-05-17 19:11:03 +00:00
Joshua Mccloskey
084f457ab8
Merge "Modified string" into qt-r1-dev am: 4a6d3f6403
...
am: a396a8c1ba
2019-05-17 11:50:59 -07:00
joshmccloskey
7a8b7698fd
Added information icon am: 8fd6269f40
...
am: f5cbb30b04
2019-05-17 11:49:59 -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
TreeHugger Robot
7be4b6d655
Merge "Fix multiple instances for Google SignIn activity appearing in task stack"
2019-05-17 16:44:54 +00: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
Lei Yu
9a3984123c
Merge "Use short summary in advanced BT header" into qt-dev am: b6012f8d62 am: 28e19d2883
...
am: c15ca62386
2019-05-17 06:10:42 -07:00
Lei Yu
e615e50cf3
Merge "Use short summary in advanced BT header" into qt-dev am: b6012f8d62 am: d6bdbfabc7
...
am: bbf4219bf0
2019-05-17 05:32:47 -07:00
