PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
54,908 Commits 1 Branch 0 Tags
9d49e1b51ff357fc499d027ea993e5c7a66fca5c
Commit Graph

54908 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
cosmohsieh
7aee812888 Merge "[Network Connection] Call NetworkRequestUserSelectionCallback#reject() if user quit activity without selection" into qt-qpr1-dev 
am: 17cbea0112

Change-Id: Icc3c00f542746c1ffa423c04c160ba85e53ad834
 2019-09-12 14:09:30 -07:00
TreeHugger Robot
17cbea0112 Merge "[Network Connection] Call NetworkRequestUserSelectionCallback#reject() if user quit activity without selection" into qt-qpr1-dev 2019-09-12 20:49:56 +00:00
paulhu
52d24750a4 [Settings] Replace CONNECTIVITY_INTERNAL to TETHER_PRIVILEGED 
Settings is using CONNECTIVITY_INTERNAL to restrict launching
tether provisoning activity by provioning apps only. However,
CONNECTIVITY_INTERNAL will be deprecated from Android R, replace
the permission to TETHER_PRIVILEGED.

Bug: 32963470
Test: atest TetherServiceTest
Change-Id: I4c8312b92de8d5d9c9090c572e54622dc4fcf9d4
 2019-09-12 17:21:43 +08:00
Arc Wang
40f22313dc Merge "[Wi-Fi] Can't change EAP method for a saved enterprise Wi-Fi network" into qt-qpr1-dev 
am: ec3055b9eb

Change-Id: I89755845ae509051e4fc2fcfb8f1dd1ee5ab195c
 2019-09-12 01:14:57 -07:00
TreeHugger Robot
ec3055b9eb Merge "[Wi-Fi] Can't change EAP method for a saved enterprise Wi-Fi network" into qt-qpr1-dev 2019-09-12 08:05:21 +00:00
Android Build Merger (Role)
a5c810d4a2 Merge "[automerger skipped] Import translations. DO NOT MERGE am: 8173de150d -s ours am: 9b956eb47f -s ours am skip reason: subject contains skip directive" into qt-qpr1-dev-plus-aosp 2019-09-12 05:57:41 +00:00
Bill Yi
938427d5f5 [automerger skipped] Import translations. DO NOT MERGE am: 8173de150d -s ours 
am: 9b956eb47f -s ours
am skip reason: subject contains skip directive

Change-Id: I56786fa936a90e1870aa8b49ccd3eb1e4e1c2de3
 2019-09-11 22:57:29 -07:00
Bill Yi
c46430c80e [automerger skipped] Import translations. DO NOT MERGE am: 8173de150d -s ours 
am: e6107df474 -s ours
am skip reason: subject contains skip directive

Change-Id: I3fe8c6432c4b840365aeebdbf2c455a4e98bd514
 2019-09-11 22:57:28 -07:00
Bill Yi
525b411585 [automerger skipped] Import translations. DO NOT MERGE 
am: deee385ba8 -s ours
am skip reason: subject contains skip directive

Change-Id: I270de5daddcee5c1ed3c779bcad217dd1526cbe8
 2019-09-11 22:54:54 -07:00
Bill Yi
e6107df474 [automerger skipped] Import translations. DO NOT MERGE 
am: 8173de150d -s ours
am skip reason: subject contains skip directive

Change-Id: I010ba47035a6530ec5d50abd363a6ea013515551
 2019-09-11 22:50:29 -07:00
Bill Yi
9b956eb47f [automerger skipped] Import translations. DO NOT MERGE 
am: 8173de150d -s ours
am skip reason: subject contains skip directive

Change-Id: Ica53f59adc22c9442b6c823abc35a63c2e864d8e
 2019-09-11 22:50:27 -07:00
Bill Yi
deee385ba8 Import translations. DO NOT MERGE 
Auto-generated-cl: translation import

Bug: 64712476
Change-Id: I1b2826dd790519a2946d8505aec03f72b1815f04
 2019-09-11 19:26:07 -07:00
Bill Yi
8173de150d Import translations. DO NOT MERGE 
Auto-generated-cl: translation import

Bug: 64712476
Change-Id: I60bd87b13925d699bc7db9f6f215321ff20eea44
 2019-09-11 19:10:50 -07:00
Mady Mellor
91ba8e9b66 qt-r1-bubbles-dev @ build 5835883 
Test: presubmit setup on source branch

Bug: 129158983
Bug: 136034310
Bug: 137876221

Change-Id: I5ade70c2101d09eed4698ce29bd3242483ec7f8b
Merged-In: If2b813f24cf5998829fe417e32179c5e8283d308
Merged-In: I58f0287ed99a4daf3758316e4004bca05f17b0d1
 2019-09-11 22:42:17 +00:00
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
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
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
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
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
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
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
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
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
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
joshmccloskey
006edb1f6d Merge "Change cancel button type to skip for SUW" into qt-r1-dev 
am: ff01d52d50

Change-Id: Idcddf14e8aa3cfcd50b78ed112d51bf06424b840
 2019-09-09 23:20:26 -07:00
joshmccloskey
349e664035 Merge "Change cancel button type to skip for SUW" into qt-r1-dev 
am: ff01d52d50

Change-Id: I08e856f94da8ac0b1151d61e8717088672852f6a
 2019-09-09 23:20:15 -07:00
TreeHugger Robot
ff01d52d50 Merge "Change cancel button type to skip for SUW" into qt-r1-dev 2019-09-10 06:02:39 +00:00
joshmccloskey
d98257bae6 Change cancel button type to skip for SUW 
Test: Verified in SUW that enrollment will skip after
tapping the cancel button in the Introduction.
Fixes: 140702414

Change-Id: I9d9da0ff6d10b6ee6929cb52ff4a03a684f43d17
 2019-09-09 16:46:03 -07:00
Mady Mellor
ea79e343f0 qt-r1-bubbles-dev @ build 5835883 
Test: presubmit setup on source branch

Bug: 129158983
Bug: 136034310
Bug: 137876221
Change-Id: I58f0287ed99a4daf3758316e4004bca05f17b0d1
Merged-In: If2b813f24cf5998829fe417e32179c5e8283d308
 2019-09-09 21:48:54 +00:00
Miranda Kephart
28812b0feb Merging from qt-qpr1-sysui-dev @ build 5855545 
Test: manual, presubmit on the source branch

Merged-In: Idc3d5c39427722a5486552312552f7f77ef40980
Merged-In: Ieea5138da3d182735fb92eedd607f52750c91e19
Change-Id: Iefbdac334e3e1807f61e4832f7ac66b9023047f6
 2019-09-09 21:32:22 +00:00
Miranda Kephart
e9963e37d5 Merge branch 'fetch_qt-qpr1-sysui-dev_5855545' into merge_qt-qpr1-sysui-dev_5855545 
Test: manual, presubmit on the source branch

Merged-In: Idc3d5c39427722a5486552312552f7f77ef40980
Change-Id: Ieea5138da3d182735fb92eedd607f52750c91e19
 2019-09-09 20:27:44 +00:00