Fan Zhang
88779708f1
Merge "Fix view overlap in landscape wifi dpp enrollment." into qt-dev
...
am: fa5aaf9212
Change-Id: I71ba4ed4badecf58a47ab458e9c7b66556299717
2019-05-20 20:09:51 -07:00
Badhri Jagan Sridharan
50ad7da280
Merge "Help URI for USB contaminant dialog" into qt-dev
...
am: 83c4ce4a48
Change-Id: I57fd9c464ccf72f0002c58466b58f5c3884980eb
2019-05-20 19:51:58 -07:00
Kevin Chyn
9f17f84a10
Merge "Update strings" into qt-r1-dev
2019-05-21 02:20:56 +00:00
Fan Zhang
fa5aaf9212
Merge "Fix view overlap in landscape wifi dpp enrollment." into qt-dev
2019-05-21 00:34:54 +00:00
Badhri Jagan Sridharan
83c4ce4a48
Merge "Help URI for USB contaminant dialog" into qt-dev
2019-05-21 00:31:45 +00:00
Salvador Martinez
9822f6ed92
Merge "Break infinite refresh loop in battery estimates" into qt-dev
...
am: e418874921
Change-Id: Ibf5d75ffec22c0948d89c3cdfc5feb7197869f30
2019-05-20 15:21:12 -07:00
Kevin Chyn
26306c7498
Update strings
...
Bug: 132787143
Test: Builds
Change-Id: I382c84fbeb6ca2c151d6a4fa2f7a3d29d7c72505
2019-05-20 14:54:42 -07:00
Salvador Martinez
e418874921
Merge "Break infinite refresh loop in battery estimates" into qt-dev
2019-05-20 21:22:23 +00:00
Narayan Kamath
4f6e6c0849
Merge "Hide AppButtonsPreferenceController for system modules." into qt-dev
...
am: 76cf0dbddd
Change-Id: I660159218ef2598a7df5c84f6837bcfc4b0b22f1
2019-05-20 01:12:27 -07:00
Narayan Kamath
76cf0dbddd
Merge "Hide AppButtonsPreferenceController for system modules." into qt-dev
2019-05-20 07:42:53 +00:00
Arc Wang
386318dbea
Fix view overlap in landscape wifi dpp enrollment.
...
Bug: 132813855
Test: manual
Change-Id: I961dcc88e044dc1ba6dc3d87d9820a2ced5196ee
2019-05-20 13:17:14 +08:00
Bill Yi
d109c07b0d
[automerger skipped] Import translations. DO NOT MERGE am: d6d1ac5e87
-s ours
...
am: 089d85f315
-s ours
am skip reason: subject contains skip directive
Change-Id: Ifa2b1317cefa553615957d2caa866d260e1c8395
2019-05-18 15:20:17 -07:00
Bill Yi
089d85f315
[automerger skipped] Import translations. DO NOT MERGE
...
am: d6d1ac5e87
-s ours
am skip reason: subject contains skip directive
Change-Id: Ic6626c84da89b05066387585c87a7cade7a85e22
2019-05-18 15:15:15 -07:00
Bill Yi
da23218146
[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev
...
am: ef6caf7871
-s ours
am skip reason: subject contains skip directive
Change-Id: I4ff0896ce16ef97cbff7fe5669f11aacce05975a
2019-05-18 07:46:42 -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
3cd9afbc15
Merge "Fix overlapping problem in display size screen." into qt-dev
...
am: 8416839234
Change-Id: Ie447001219cb9b7aff9d5c3826b46e9a21d9d109
2019-05-18 04:33:21 -07:00
TreeHugger Robot
8416839234
Merge "Fix overlapping problem in display size screen." into qt-dev
2019-05-18 11:22:34 +00:00
Kevin Chang
56c4f9f254
Merge "Revert "Change string of switchbar and installed service category title"" into qt-dev
...
am: f508ece42d
Change-Id: I2ea9c4d2afc7c6aaef134159c86ccb50a4467316
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
31db115319
Merge "Show the accessibility usage preference when Permissions Hub is disabled." into qt-dev
...
am: 51c92e5622
Change-Id: If6446cd203ff92753d6d697e570178cbfd72cd47
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
bc58c1f129
Merge changes I06c1bc14,I5415b8ed into qt-dev
...
am: a83638788b
Change-Id: If774abf9364a66eca020f65a5f2122c1faf5401a
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
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
09bc5975a4
Merge "Play vibration preview when turning on vibration" into qt-dev
...
am: 1a82d653f7
Change-Id: I7a1d856cdede78d708ecc9601832a0d86bf42e20
2019-05-17 07:18:46 -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
.
Reason for revert: There's some side effects with string.
Create a new CL in master branch to fix it.
Bug: 132840332
Change-Id: I17526a06474d25bdb32beda96f5bb6371f0e5ade
2019-05-17 08:38:54 +00:00
Kevin Chyn
f0581b95fa
Merge "De-dupe animation name" into qt-r1-dev
2019-05-17 05:58:43 +00: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
Joshua Mccloskey
4a6d3f6403
Merge "Modified string" into qt-r1-dev
2019-05-17 02:10:24 +00:00
Badhri Jagan Sridharan
bf5686e5f5
Help URI for USB contaminant dialog
...
Bug: 132737150
Test: build test.
Change-Id: If6ac3b086edaee18cd982ef12220b480d12f5228
2019-05-16 18:08:37 -07:00
Kevin Chyn
8737949f0e
De-dupe animation name
...
Bug: 132916308
Test: Builds
Change-Id: Ief29915641826a270f54adc3752b62cd9ee99ebe
2019-05-16 17:06:37 -07:00
joshmccloskey
8fd6269f40
Added information icon
...
Bug: 132820419
Test: Manual.
Change-Id: If67a0ab96e9991f117e0a93c70a77266473b1df8
2019-05-16 19:10:15 +00:00
joshmccloskey
6513beb966
Modified string
...
Fixes: 132650058
Test: Builds.
Change-Id: I41e3b52570ec7e789692a179aaad96320de3db3a
2019-05-16 19:09:28 +00:00
Lei Yu
d6bdbfabc7
Merge "Use short summary in advanced BT header" into qt-dev
...
am: b6012f8d62
Change-Id: Ib222bc7eb04ce08942d7da6dfc5ef7dd07b7e129
2019-05-16 11:58:16 -07:00
Lei Yu
b6012f8d62
Merge "Use short summary in advanced BT header" into qt-dev
2019-05-16 18:18:45 +00:00
Alexey Kuzmin
486b89da28
Merge "Fix usage hint of ringtone vibration preview" into qt-dev
...
am: 71f6523200
Change-Id: Ia81d515bc26a87b636da2d1ce6e65ae5051cc405
2019-05-16 11:05:29 -07:00
TreeHugger Robot
71f6523200
Merge "Fix usage hint of ringtone vibration preview" into qt-dev
2019-05-16 16:51:32 +00:00
Leon Liao
dfae7fe0e0
Merge "Modify Accessibility Setting UI for timeout feature" into qt-dev
...
am: 764b8491e1
Change-Id: Icd56f53ece053032281761da0d6d650b0e76c9d7
2019-05-16 06:11:41 -07:00
Leon Liao
764b8491e1
Merge "Modify Accessibility Setting UI for timeout feature" into qt-dev
2019-05-16 13:02:56 +00:00
Pavel Grafov
52f1e826e9
Merge "Make credential confirmation activity resizeable." into qt-dev
...
am: e455680bd2
Change-Id: I94f9c4c8b214d52e62fe603b06fbef73dca59a0a
2019-05-16 05:26:23 -07:00
Pavel Grafov
e455680bd2
Merge "Make credential confirmation activity resizeable." into qt-dev
2019-05-16 12:05:14 +00:00
Leon Liao
d741850f0c
Modify Accessibility Setting UI for timeout feature
...
Using single timeout setting page instead of current two timeout pages
to keep the user experience simple and reduce confusion.
Current timeout page & API:
'Time to take action'
-- Settings.Secure.ACCESSIBILITY_INTERACTIVE_UI_TIMEOUT_MS
'Time to read'
-- Settings.Secure.ACCESSIBILITY_NON_INTERACTIVE_UI_TIMEOUT_MS
New timeout page & API:
'Time to take action(Accessibility timeout)'
-- Settings.Secure.ACCESSIBILITY_INTERACTIVE_UI_TIMEOUT_MS
-- Settings.Secure.ACCESSIBILITY_NON_INTERACTIVE_UI_TIMEOUT_MS
Bug: 132247225
Test: make RunSettingsRoboTests -j ROBOTEST_FILTER=AccessibilityTimeoutControllerTest
Test: make RunSettingsRoboTests -j ROBOTEST_FILTER=AccessibilitySettingsTest
Change-Id: I0b69682425324d3b1e0ff3f7b6e2c299b60cd215
2019-05-16 18:58:50 +08:00
Kevin Chyn
71f07614b9
Merge "Update footer buttons depending on entry point" into qt-dev
...
am: 7411ce155d
Change-Id: Iec08981b1956fa9e02ba7de2a5edf9398dc3dcc4
2019-05-15 19:15:36 -07:00