PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
56,982 Commits 1 Branch 0 Tags
0a1f43a7c94764d733e40e70756de2ac6cdaec3c
Commit Graph

56982 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Mady Mellor
88de4328fd Merge "qt-r1-bubbles-dev @ build 5835883" into qt-qpr1-dev-plus-aosp 2019-09-11 22:40:20 +00:00
Xin Li
fe99707541 [automerger skipped] Merge qt-r1-dev-plus-aosp-without-vendor (5817612) into stage-aosp-master am: aac7f8e2cd -s ours 
am: 827172cee1 -s ours
am skip reason: change_id Idcc078c0e541c04633db6d94c613ac4c861ba963 with SHA1 7195e05dfa is in history

Change-Id: I717bb9c937ab8d3eaf4f5809efa874357f482a2e
 2019-09-11 14:57:08 -07:00
Xin Li
827172cee1 [automerger skipped] Merge qt-r1-dev-plus-aosp-without-vendor (5817612) into stage-aosp-master 
am: aac7f8e2cd -s ours
am skip reason: change_id Idcc078c0e541c04633db6d94c613ac4c861ba963 with SHA1 7195e05dfa is in history

Change-Id: I7826eee6fd99a83bf4e8a96bb51f0622fbdf84c3
 2019-09-11 14:09:27 -07:00
Bill Yi
55c230f407 Merge "[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-r1-dev am: 09c08d1da0 -s ours am: 8191079b21 -s ours 
am: f931d88a0b -s ours
am skip reason: subject contains skip directive

Change-Id: I9c658832c8fbfa2048d4bc23d0425fc9972fcede
 2019-09-11 12:17:45 -07:00
Bill Yi
b9e51812d7 [automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-r1-dev am: 09c08d1da0 -s ours am: 73a98df64b -s ours 
am: 7303be2997 -s ours
am skip reason: subject contains skip directive

Change-Id: Idd14bfa193826aa6de686adbe03e5e977d3a0e84
 2019-09-11 12:17:04 -07:00
Android Build Merger (Role)
f931d88a0b Merge "[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-r1-dev am: 09c08d1da0 -s ours am: 8191079b21 -s ours am skip reason: subject contains skip directive" into qt-qpr1-dev-plus-aosp 2019-09-11 19:10:12 +00:00
Bill Yi
1cd4a7040e [automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-r1-dev am: 09c08d1da0 -s ours 
am: 8191079b21 -s ours
am skip reason: subject contains skip directive

Change-Id: Ie08d32473345828c033f4ccd3d8373bc4d6466f3
 2019-09-11 12:10:01 -07:00
Bill Yi
7303be2997 [automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-r1-dev am: 09c08d1da0 -s ours 
am: 73a98df64b -s ours
am skip reason: subject contains skip directive

Change-Id: Ia3e5d45060f2c56472321a7d219587ce42ac15e9
 2019-09-11 12:09:59 -07:00
Bill Yi
73a98df64b [automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-r1-dev 
am: 09c08d1da0 -s ours
am skip reason: subject contains skip directive

Change-Id: I8a743a33b14e424069a75ac9d590ffca287300f1
 2019-09-11 12:03:01 -07:00
Bill Yi
8191079b21 [automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-r1-dev 
am: 09c08d1da0 -s ours
am skip reason: subject contains skip directive

Change-Id: I07fe60817626b45ba59b9e0f823aa7f462533b19
 2019-09-11 12:03:00 -07:00
Bill Yi
123901eba0 [automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-qpr1-dev am: 914bda7715 -s ours 
am: 23269a9dce -s ours
am skip reason: subject contains skip directive

Change-Id: Iebe020f2fea82262686de76856e5cc9d670e5454
 2019-09-11 11:49:11 -07:00
TreeHugger Robot
09c08d1da0 Merge "Import translations. DO NOT MERGE" into qt-r1-dev 2019-09-11 18:41:53 +00:00
Bill Yi
23269a9dce [automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-qpr1-dev 
am: 914bda7715 -s ours
am skip reason: subject contains skip directive

Change-Id: Ie6cf99a4b968e4983e5562741349e9cce58d806b
 2019-09-11 11:35:13 -07:00
TreeHugger Robot
914bda7715 Merge "Import translations. DO NOT MERGE" into qt-qpr1-dev 2019-09-11 18:18:32 +00:00
TreeHugger Robot
1171eb2eca Merge "Use TwoTargetPreference to replace customized layout" 2019-09-11 08:35:37 +00:00
Kevin Chang
ee15fa1c2d Change disable accessibility service dialog layout 
Bug: 140307087
Test: Visual
Change-Id: I78d573f121e2f799a8395fcd2d21ee48a5fffb23
 2019-09-11 15:47:08 +08:00
Bill Yi
cbfbd39821 Import translations. DO NOT MERGE 
Auto-generated-cl: translation import

Bug: 64712476
Change-Id: I1ee6e4e49b18ed13ab3e431583d316c0663a4f8f
 2019-09-10 22:37:57 -07:00
Bill Yi
9e58221558 Import translations. DO NOT MERGE 
Auto-generated-cl: translation import

Bug: 64712476
Change-Id: I1163141368fc482f675e7d9dd7b4503dfcd309bf
 2019-09-10 22:24:00 -07:00
Raff Tsai
98b55c5214 Use TwoTargetPreference to replace customized layout 
Bug: 139336138
Test: manual, robolectric
Change-Id: I0ffe90cd9ab5423b533507eeae47d5972704cf61
 2019-09-11 13:08:47 +08:00
Raff Tsai
883cdcf87c Merge "Fix settings panel refresh issue" 2019-09-11 04:58:06 +00:00
Bill Yi
235edcb18a [automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-qpr1-dev am: 7177991eba -s ours 
am: 3efa2416a0 -s ours
am skip reason: subject contains skip directive

Change-Id: I964d22c5e973caacf2980d98656f9def1cd95f11
 2019-09-10 21:14:55 -07:00
Bill Yi
3efa2416a0 [automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-qpr1-dev 
am: 7177991eba -s ours
am skip reason: subject contains skip directive

Change-Id: Ie0777550cf1f9db6ed3d3262331a80c4403ae61f
 2019-09-10 21:08:03 -07:00
TreeHugger Robot
7177991eba Merge "Import translations. DO NOT MERGE" into qt-qpr1-dev 2019-09-11 03:43:27 +00:00
Bill Yi
dee0813c89 Merge "[automerger skipped] Import translations. DO NOT MERGE am: c1bfd1f50d -s ours am: 59cd1121cc -s ours 
am: 8916a3cd66 -s ours
am skip reason: subject contains skip directive

Change-Id: Icf073b1edbce6fea129faa13b9a39b36346f0124
 2019-09-10 20:31:55 -07:00
Bill Yi
1c628f2e6b [automerger skipped] Import translations. DO NOT MERGE am: c1bfd1f50d -s ours am: 805197327f -s ours 
am: 5dcd93a895 -s ours
am skip reason: subject contains skip directive

Change-Id: I67b656cc06b136f540b36edf8712a8d7b9b50847
 2019-09-10 20:31:02 -07:00
Android Build Merger (Role)
8916a3cd66 Merge "[automerger skipped] Import translations. DO NOT MERGE am: c1bfd1f50d -s ours am: 59cd1121cc -s ours am skip reason: subject contains skip directive" into qt-qpr1-dev-plus-aosp 2019-09-11 03:23:08 +00:00
Bill Yi
5dcd93a895 [automerger skipped] Import translations. DO NOT MERGE am: c1bfd1f50d -s ours 
am: 805197327f -s ours
am skip reason: subject contains skip directive

Change-Id: Iae1bbc92d68d117d8ca3d5be730c0cb95e87cb0c
 2019-09-10 20:22:51 -07:00
Bill Yi
35687d03eb [automerger skipped] Import translations. DO NOT MERGE am: c1bfd1f50d -s ours 
am: 59cd1121cc -s ours
am skip reason: subject contains skip directive

Change-Id: I56468e249d157f9befdeeb06feb108dfbb143e03
 2019-09-10 20:22:51 -07:00
Bill Yi
805197327f [automerger skipped] Import translations. DO NOT MERGE 
am: c1bfd1f50d -s ours
am skip reason: subject contains skip directive

Change-Id: Ie4a0625a623ccb37a3de288121c366d25c8ab946
 2019-09-10 20:15:44 -07:00
Bill Yi
59cd1121cc [automerger skipped] Import translations. DO NOT MERGE 
am: c1bfd1f50d -s ours
am skip reason: subject contains skip directive

Change-Id: I6fcd972f09510bdba25fd0732dd37e168d356a70
 2019-09-10 20:15:44 -07:00
Bill Yi
d62965ba03 Import translations. DO NOT MERGE 
Auto-generated-cl: translation import

Bug: 140445577
Change-Id: Ica56884b49d5f16a84096f4c4f34bc0b639ad3e1
 2019-09-11 03:03:16 +00:00
Arc Wang
384f17707f Merge "[Wi-Fi] Change material design Wi-Fi signal icon for Wi-Fi Direct" 2019-09-11 01:47:38 +00:00
Bill Yi
c1bfd1f50d Import translations. DO NOT MERGE 
Auto-generated-cl: translation import

Bug: 140445577
Change-Id: Ife760913fdf573fb8820f604e90fae666cab08e5
 2019-09-11 01:46:53 +00:00
Miranda Kephart
81d7c8b042 [automerger skipped] Merge "Merging from qt-qpr1-sysui-dev @ build 5855545" into qt-qpr1-dev am: 24df1249f0 -s ours 
am: 882dfddf99 -s ours
am skip reason: change_id Idc3d5c39427722a5486552312552f7f77ef40980 with SHA1 314cd4a479 is in history

Change-Id: Id0902a12907f209f058f275de4c4bb6614d33dc1
 2019-09-10 14:07:01 -07:00
Miranda Kephart
b20af2e7c4 [automerger skipped] Merging from qt-qpr1-sysui-dev @ build 5855545 am: 28812b0feb -s ours 
am: b707154e3c -s ours
am skip reason: change_id Idc3d5c39427722a5486552312552f7f77ef40980 with SHA1 314cd4a479 is in history

Change-Id: I954ba5a0a9d43e6dd2c614dab19fec78b1169ddd
 2019-09-10 14:01:13 -07:00
Miranda Kephart
882dfddf99 [automerger skipped] Merge "Merging from qt-qpr1-sysui-dev @ build 5855545" into qt-qpr1-dev 
am: 24df1249f0 -s ours
am skip reason: change_id Ieea5138da3d182735fb92eedd607f52750c91e19 with SHA1 e9963e37d5 is in history

Change-Id: Ibf471a4f35352a1ed67ff4450bf99c351b77b542
 2019-09-10 13:52:49 -07:00
Miranda Kephart
b707154e3c [automerger skipped] Merging from qt-qpr1-sysui-dev @ build 5855545 
am: 28812b0feb -s ours
am skip reason: change_id Ieea5138da3d182735fb92eedd607f52750c91e19 with SHA1 e9963e37d5 is in history

Change-Id: I00083b6cc58401b599d096e8f360b629b6f91ee3
 2019-09-10 13:46:36 -07:00
Miranda Kephart
24df1249f0 Merge "Merging from qt-qpr1-sysui-dev @ build 5855545" into qt-qpr1-dev 2019-09-10 20:24:04 +00:00
Miranda Kephart
a4c50636a3 [automerger skipped] Merge "Merge branch 'fetch_qt-qpr1-sysui-dev_5855545' into merge_qt-qpr1-sysui-dev_5855545" into qt-qpr1-dev-plus-aosp 
am: e7e1027743 -s ours
am skip reason: change_id Idc3d5c39427722a5486552312552f7f77ef40980 with SHA1 314cd4a479 is in history

Change-Id: If1ce01e85e043552d70358d9381baefadd8e6417
 2019-09-10 10:49:05 -07:00
Miranda Kephart
fefc70918c [automerger skipped] Merge branch 'fetch_qt-qpr1-sysui-dev_5855545' into merge_qt-qpr1-sysui-dev_5855545 
am: e9963e37d5 -s ours
am skip reason: change_id Idc3d5c39427722a5486552312552f7f77ef40980 with SHA1 314cd4a479 is in history

Change-Id: I7f53eccabfbde9f38534664c0fa6a3db5512a442
 2019-09-10 10:31:41 -07:00
Miranda Kephart
e7e1027743 Merge "Merge branch 'fetch_qt-qpr1-sysui-dev_5855545' into merge_qt-qpr1-sysui-dev_5855545" into qt-qpr1-dev-plus-aosp 2019-09-10 17:20:56 +00:00
TreeHugger Robot
7ead5c7968 Merge "Add alsutton@ to OWNERS for backup settings" 2019-09-10 15:47:34 +00:00
Al Sutton
1fef77dd90 Add alsutton@ to OWNERS for backup settings 
Bug: 140479949
Test: build/make/tools/checkowners.py -c -v
packages/apps/Settings/src/com/android/settings/backup/OWNERS
Change-Id: I373aa0521feb0da8c4c5d98a7199ea9ca848123a
 2019-09-10 14:45:56 +01:00
TreeHugger Robot
500f1ddc8f Merge "Add padding for SliceView preference" 2019-09-10 10:03:39 +00:00
hughchen
a9e91a8512 Add padding for SliceView preference 
This CL adds padding to make it looks like wrapped by preference
category.

Bug: 133784331
Test: Manual
Change-Id: Ic5d3043fb78b64bebbe762fcd32b03c753167835
 2019-09-10 15:54:05 +08:00
joshmccloskey
1d2409e6b1 Merge "Merge "Change cancel button type to skip for SUW" into qt-r1-dev am: ff01d52d50 am: 006edb1f6d" into qt-qpr1-dev-plus-aosp 
am: fce2b7b76b

Change-Id: I583bc7effddf24dce3906f4288a87eeb458c6b66
 2019-09-09 23:33:23 -07:00
joshmccloskey
aa5415f269 Merge "Change cancel button type to skip for SUW" into qt-r1-dev am: ff01d52d50 am: 349e664035 
am: 56e312b2a3

Change-Id: I7633b25ef87117b8f3a65861c525531f1a2ccbd0
 2019-09-09 23:32:36 -07:00
Android Build Merger (Role)
fce2b7b76b Merge "Merge "Change cancel button type to skip for SUW" into qt-r1-dev am: ff01d52d50 am: 006edb1f6d" into qt-qpr1-dev-plus-aosp 2019-09-10 06:26:30 +00:00
joshmccloskey
56e312b2a3 Merge "Change cancel button type to skip for SUW" into qt-r1-dev am: ff01d52d50 
am: 349e664035

Change-Id: Iad6b5b3e8a637b910227d5cba56e09c8f075d4be
 2019-09-09 23:26:12 -07:00
joshmccloskey
99278c0528 Merge "Change cancel button type to skip for SUW" into qt-r1-dev am: ff01d52d50 
am: 006edb1f6d

Change-Id: Id8701b96d5fa1418cf020339d8b8b11a6ae07388
 2019-09-09 23:26:12 -07:00