PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
52,456 Commits 1 Branch 0 Tags
2ce63571d953ec749fdc47ab0190a001de7d003b
Commit Graph

52456 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Android Build Merger (Role)
2ce63571d9 Merge "Merge "Hide AppButtonsPreferenceController for system modules." into qt-dev am: 76cf0dbddd am: 4f6e6c0849" into qt-r1-dev-plus-aosp 2019-05-20 14:16:31 +00:00
Narayan Kamath
cb3df9aaa5 Merge "Hide AppButtonsPreferenceController for system modules." into qt-dev am: 76cf0dbddd 
am: 4f6e6c0849

Change-Id: I96e051241ff9a787d570c6f3390f23381b2cda38
 2019-05-20 05:53:46 -07:00
Narayan Kamath
35870d6e5b Merge "Hide AppButtonsPreferenceController for system modules." into qt-dev am: 76cf0dbddd 
am: c756190b9c

Change-Id: Id0b6d238471148c51948144795b7c81f1913839a
 2019-05-20 05:52:08 -07:00
Narayan Kamath
c756190b9c Merge "Hide AppButtonsPreferenceController for system modules." into qt-dev 
am: 76cf0dbddd

Change-Id: Ic097d7c264bbc198c0ef3c0ed9099beb9339a2e0
 2019-05-20 05:14:33 -07: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
Bill Yi
4e27bd6e44 [automerger skipped] Import translations. DO NOT MERGE am: d6d1ac5e87 -s ours am: 089d85f315 -s ours 
am: d109c07b0d -s ours
am skip reason: subject contains skip directive

Change-Id: I6bf9d5d76ee47cc406048e7433b37ee22c966846
 2019-05-18 15:25:33 -07:00
Bill Yi
a97bd72607 [automerger skipped] Import translations. DO NOT MERGE am: d6d1ac5e87 -s ours am: 089d85f315 -s ours 
am: 68951dc3c4 -s ours
am skip reason: subject contains skip directive

Change-Id: Iec537b954ed7e258a7f618efc32361ccf4e71449
 2019-05-18 15:25:17 -07:00
Bill Yi
68951dc3c4 [automerger skipped] Import translations. DO NOT MERGE am: d6d1ac5e87 -s ours 
am: 089d85f315 -s ours
am skip reason: subject contains skip directive

Change-Id: I47b4a5a91a63b350f46fe1243e612a090a01d407
 2019-05-18 15:20:29 -07: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
694b005668 [automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev am: ef6caf7871 -s ours 
am: da23218146 -s ours
am skip reason: subject contains skip directive

Change-Id: Ib316d2f1c096b916702f02b434a74fb76dbacb48
 2019-05-18 07:50:54 -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
Bill Yi
e540a1513b [automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev am: ef6caf7871 -s ours 
am: 777c7edf00 -s ours
am skip reason: subject contains skip directive

Change-Id: Ib7afaada0e3afcc4fb0ef37f1e5388ca47cf5a8e
 2019-05-18 07:46:16 -07:00
Bill Yi
777c7edf00 [automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev 
am: ef6caf7871 -s ours
am skip reason: subject contains skip directive

Change-Id: I7cd7d2a2e1e684fa3a85b8f90490584fea834db9
 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

Change-Id: I34bdcc2512e95d3e389411e45265cab30173b30a
 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

Change-Id: Id33006b0b5faa3c583b1d1cfdbe0283f34107562
 2019-05-18 04:33:27 -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
tmfang
56c774de19 Merge "Fix overlapping problem in display size screen." into qt-dev 
am: 8416839234

Change-Id: I42e4f2ff3b40368f745a6d3b9cb0457893814fe5
 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

Change-Id: Ib54bc0af2eab9ad7e372cd43938559440eaa40b0
 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

Change-Id: Ib84258c2340009a9569e526308fc8114bdd71dea
 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

Change-Id: I1c01a995f3cacdd80f5f97bce342dd0ce0907fe2
 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

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
fffdc8461b Merge "Show the accessibility usage preference when Permissions Hub is disabled." into qt-dev am: 51c92e5622 
am: 14f64a0acf

Change-Id: I8413793208a829db4fe1637a22bb16a7181db124
 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

Change-Id: I4ba39337851dc106588a78f871d8457cb23d3205
 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

Change-Id: I677c4b76f44aa957eddf73d70c3291a4626f4903
 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

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
856078fc50 Merge changes I06c1bc14,I5415b8ed into qt-dev am: a83638788b 
am: 909b2192cb

Change-Id: I8c789433dc5d31775f5716ac4271b679f76a0637
 2019-05-17 17:16:08 -07:00
Fan Zhang
b8ac55aec0 Merge changes I06c1bc14,I5415b8ed into qt-dev am: a83638788b 
am: bc58c1f129

Change-Id: I324f3e67e41646fd673afdacc7ee9e59ec5772ae
 2019-05-17 17:11:18 -07:00
Fan Zhang
909b2192cb Merge changes I06c1bc14,I5415b8ed into qt-dev 
am: a83638788b

Change-Id: Ied606e581e3c63e9f6fa4f455959caf4b2870edf
 2019-05-17 16:43:01 -07: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
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
2fc186cef2 Merge "Play vibration preview when turning on vibration" into qt-dev am: 1a82d653f7 
am: 09bc5975a4

Change-Id: Ie42fcbe315d29b8ea8ff56171814d3ec0915715d
 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

Change-Id: Ib99e882054761d93657103bc0bdab7ed09c7e4c2
 2019-05-17 07:27:24 -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
Alexey Kuzmin
aa580944a6 Merge "Play vibration preview when turning on vibration" into qt-dev 
am: 1a82d653f7

Change-Id: Id403a259ae8302ca9b2ec82710f719f11f54c4b9
 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.

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
2573421a79 Merge "De-dupe animation name" into qt-r1-dev 
am: f0581b95fa

Change-Id: I675d8618a9a1f93526e83cd52bb1ca9719d14006
 2019-05-17 00:30:20 -07:00