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
Alexey Kuzmin
14d8412455
Add a clarifying comment
...
Bug: 130332550
Test: no test
Change-Id: If6dea9b5deab35f8c2da1019c17be80bbf1c5fd8
2019-05-17 18:00:49 +01: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
Alexey Kuzmin
619c667c56
Merge "Fix usage hint of ringtone vibration preview" into qt-dev am: 71f6523200 am: 486b89da28
...
am: a8378744cb
2019-05-17 05:31:44 -07:00
Alexey Kuzmin
a6488be950
Merge "Fix usage hint of ringtone vibration preview" into qt-dev am: 71f6523200 am: bfcf644bed
...
am: cec630a67a
2019-05-17 05:30:49 -07:00
Leon Liao
21183ba013
Merge "Modify Accessibility Setting UI for timeout feature" into qt-dev am: 764b8491e1 am: e51e69284c
...
am: 72dd2e8079
2019-05-17 05:29:48 -07:00
Pavel Grafov
74f247d7df
Merge "Make credential confirmation activity resizeable." into qt-dev am: e455680bd2 am: 72b85a3798
...
am: f59ce06159
2019-05-17 03:36:32 -07:00
Kevin Chyn
36902a775c
Merge "Update footer buttons depending on entry point" into qt-dev am: 7411ce155d am: 931b2dbf09
...
am: 9c5ee1901a
2019-05-17 03:35:29 -07:00
Kevin Chang
da907b25f0
Merge "Fix no reaction when tapping permission dialog button in shortcut service page" into qt-dev am: 4891ea2d44 am: 55bfbfed1a
...
am: 4fedf61fc6
2019-05-17 03:34:33 -07: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
Leon Liao
3d7d5a4c66
Merge "Modify Accessibility Setting UI for timeout feature" into qt-dev am: 764b8491e1 am: dfae7fe0e0
...
am: 9eda4b017e
2019-05-17 00:38:05 -07: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
Pavel Grafov
4b6571849e
Merge "Merge "Make credential confirmation activity resizeable." into qt-dev am: e455680bd2 am: 52f1e826e9" into qt-r1-dev-plus-aosp
...
am: 79ecab0822
2019-05-16 21:58:23 -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
joshmccloskey
88582128aa
Merge "Re enable remove button after cancel" into qt-dev am: b195c402f3 am: ecb58423a3
...
am: 3bea5a13b1
2019-05-16 20:29:43 -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
Joshua Mccloskey
4a6d3f6403
Merge "Modified string" into qt-r1-dev
2019-05-17 02:10:24 +00:00
Xin Li
93b230b2c5
Merge "[automerger skipped] DO NOT MERGE - Merge pi-platform-release (PPRL.190505.001) into stage-aosp-master am: e6eeb7bd55 -s ours am: 90ecaab8f8
...
am: ec2c2c299d
2019-05-16 18:45:03 -07:00
