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

56925 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Bill Yi
e3f5ddcdfe [automerger skipped] Import translations. DO NOT MERGE 
am: 1ae748b09f -s ours
am skip reason: subject contains skip directive

Change-Id: Ibb1bf53b21569e91e4d9e1ce47577fa525aaaec0
 2019-09-15 15:28:41 -07:00
Bill Yi
1ae748b09f Import translations. DO NOT MERGE 
Change-Id: If6b8f670eb54a3f5b45efa0ba2a540cd25327260
Auto-generated-cl: translation import
 2019-09-14 18:38:18 -07:00
Ilya Matyukhin
51ac1a881e Merge "Fix "skip lock screen" not working for a secondary user" into qt-qpr1-dev am: 3df43a3eae 
am: 4dfe356797

Change-Id: Id0fe0d8c491a76bed3108c59acf3bb7d7179101c
 2019-09-13 02:34:52 -07:00
Ilya Matyukhin
4dfe356797 Merge "Fix "skip lock screen" not working for a secondary user" into qt-qpr1-dev 
am: 3df43a3eae

Change-Id: Iaeaedcde2e27f07cb5849a2cf670219fd143b934
 2019-09-13 02:28:52 -07:00
Ilya Matyukhin
3df43a3eae Merge "Fix "skip lock screen" not working for a secondary user" into qt-qpr1-dev 2019-09-13 09:10:32 +00:00
Ilya Matyukhin
a95459c640 Fix "skip lock screen" not working for a secondary user 
Bug: 140878309
Test: "Skip lock screen" is no longer grayed-out for a secondary user
Change-Id: I3aab6582bee07760b671034b0971c98b1c946a1c
 2019-09-13 09:10:15 +00:00
Bill Yi
ea1af11a80 [automerger skipped] Import translations. DO NOT MERGE am: 86dfbd6254 -s ours am: 5c90432dc1 -s ours 
am: eeca546428 -s ours
am skip reason: subject contains skip directive

Change-Id: Id1d0ad08693f87b8433bb6707b10a10f976442ab
 2019-09-12 17:54:51 -07:00
Bill Yi
308e8da240 [automerger skipped] Import translations. DO NOT MERGE am: 86dfbd6254 -s ours am: edbddf7f42 -s ours 
am: 3590e5d52c -s ours
am skip reason: subject contains skip directive

Change-Id: Id179916589bdb32c328b42136a4a9004a8da46ca
 2019-09-12 17:50:21 -07:00
Bill Yi
eeca546428 [automerger skipped] Import translations. DO NOT MERGE am: 86dfbd6254 -s ours 
am: 5c90432dc1 -s ours
am skip reason: subject contains skip directive

Change-Id: Ic722d4de71c99e005a84f5650c8bf9c82c392cd0
 2019-09-12 17:49:20 -07:00
Bill Yi
3590e5d52c [automerger skipped] Import translations. DO NOT MERGE am: 86dfbd6254 -s ours 
am: edbddf7f42 -s ours
am skip reason: subject contains skip directive

Change-Id: Ib0eeb1f2ac5bff404717b4550d48c32bc536ef61
 2019-09-12 17:42:18 -07:00
Bill Yi
5c90432dc1 [automerger skipped] Import translations. DO NOT MERGE 
am: 86dfbd6254 -s ours
am skip reason: subject contains skip directive

Change-Id: I9979a3422b5926a7e210ded393484f6eb28e8600
 2019-09-12 17:39:37 -07:00
Bill Yi
26378717af [automerger skipped] Import translations. DO NOT MERGE am: f066797849 -s ours 
am: 6ada8629a2 -s ours
am skip reason: subject contains skip directive

Change-Id: I4d460c8fd412c59964455dbf7190dfa2c0a9995f
 2019-09-12 17:35:35 -07:00
Bill Yi
6ada8629a2 [automerger skipped] Import translations. DO NOT MERGE 
am: f066797849 -s ours
am skip reason: subject contains skip directive

Change-Id: I83269163f1e1f3752a85cb4eaed860316efba142
 2019-09-12 17:28:34 -07:00
Bill Yi
edbddf7f42 [automerger skipped] Import translations. DO NOT MERGE 
am: 86dfbd6254 -s ours
am skip reason: subject contains skip directive

Change-Id: Ib139ea535e149923d50d835e030636df7edbf7cc
 2019-09-12 17:28:33 -07:00
Bill Yi
f066797849 Import translations. DO NOT MERGE 
Change-Id: I27cfc6c9ffa9def49d83eea920b88a5ce762fb53
Auto-generated-cl: translation import
 2019-09-12 16:10:45 -07:00
Bill Yi
86dfbd6254 Import translations. DO NOT MERGE 
Change-Id: I1cf797286a22443416d4b401e38f8923bb4edd43
Auto-generated-cl: translation import
 2019-09-12 15:54:53 -07:00
cosmohsieh
82af911193 [automerger skipped] Merge "[Network Connection] Call NetworkRequestUserSelectionCallback#reject() if user quit activity without selection" into qt-qpr1-dev am: 17cbea0112 
am: 7aee812888 -s ours
am skip reason: change_id I4b06c9772598ab3f9416f32456cd0a65e2d70d68 with SHA1 0f2773fb78 is in history

Change-Id: I1a7f5d4f59880bf675f8971082174fb336d268eb
 2019-09-12 14:21:32 -07:00
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
Eran Messeri
d83c190f29 CredentialStorage: Install keys using KeyChain 
This is part of the work to unify the manual certificate
installation flow (via "Install from storage" in the Settings
app) with the programmatic one (using
DevicePolicyManager.installKeyPair).

The change to CredentialStorage is the crux of this work, where
the key is no longer installed by calling Keystore directly.

Instead, a new AsyncTask, InstallKeyInKeyChain, was created, which
calls KeyChainService.installKeyPair with the key data and associated
certificates (as well as the UID of the designated service, to allow
installation into the WiFi Keystore).

Once that task completes, if the key was installed successfully,
then it is marked as user-selectable.

Test: Manual CtsVerifier tests: KeyChain Storage Test, CA Cert Notification Test
Test: cts-tradefed run commandAndExit cts-dev -m CtsDevicePolicyManagerTestCases -t  com.android.cts.devicepolicy.MixedDeviceOwnerTest#testKeyManagement
Bug: 138375478
Change-Id: I7c4b4ea725a34307f58d27252c2958771001636f
 2019-09-12 15:54:30 +01:00
TreeHugger Robot
af1cd790bf Merge "Merge similar BaseSearchIndexProvider code together" 2019-09-12 11:22:40 +00:00
TreeHugger Robot
5479ffdbaa Merge "Replace png file with vector drawable" 2019-09-12 10:05:01 +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
ce024a0dc5 [automerger skipped] Merge "[Wi-Fi] Can't change EAP method for a saved enterprise Wi-Fi network" into qt-qpr1-dev am: ec3055b9eb 
am: 40f22313dc -s ours
am skip reason: change_id Iddc1dae53849760f43b41b75262358dff6ba09af with SHA1 9db4bf7dbb is in history

Change-Id: Ieb15ac82f64bb17a8a3bfcf0dfa31cb7640bfc86
 2019-09-12 01:21:54 -07: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
Raff Tsai
002a488354 Replace png file with vector drawable 
Bug: 139336138
Test: visual
Change-Id: I2c97accbb7a4e693f50d23ee340cbc5c09101747
 2019-09-12 15:24:43 +08:00
Bill Yi
481b51e7f3 Merge "[automerger skipped] Import translations. DO NOT MERGE am: 8173de150d -s ours am: 9b956eb47f -s ours 
am: a5c810d4a2 -s ours
am skip reason: subject contains skip directive

Change-Id: I636c33ea04b552a66024e99e1fa337f4808628d7
 2019-09-11 23:04:52 -07:00
Bill Yi
9f72af23d1 [automerger skipped] Import translations. DO NOT MERGE am: 8173de150d -s ours am: e6107df474 -s ours 
am: c46430c80e -s ours
am skip reason: subject contains skip directive

Change-Id: I93cd460214154bb1443bf1a37499eff0ece851c8
 2019-09-11 23:04:21 -07:00
Bill Yi
fc9b310060 [automerger skipped] Import translations. DO NOT MERGE am: deee385ba8 -s ours 
am: 525b411585 -s ours
am skip reason: subject contains skip directive

Change-Id: Ib2951aec554167b13c9c5000dae4dbbdd2975587
 2019-09-11 23:03:33 -07: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
Raff Tsai
1f30b1cd67 Merge similar BaseSearchIndexProvider code together 
Bug: 135053028
Test: robolectric, check search_index.db contains the same items
Change-Id: If3c18a170b0e671690df1fdf26e59a421d2c48cd
 2019-09-12 11:09:09 +08: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
e84a8863d5 [automerger skipped] Merge "qt-r1-bubbles-dev @ build 5835883" into qt-qpr1-dev-plus-aosp 
am: 88de4328fd -s ours
am skip reason: change_id If2b813f24cf5998829fe417e32179c5e8283d308 with SHA1 0c47113a5b is in history

Change-Id: I35a625ba0a09a0a35da1f38795dc34201838a084
 2019-09-11 17:17:30 -07:00
Mady Mellor
8eb388c906 [automerger skipped] qt-r1-bubbles-dev @ build 5835883 
am: ea79e343f0 -s ours
am skip reason: change_id If2b813f24cf5998829fe417e32179c5e8283d308 with SHA1 0c47113a5b is in history

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

Change-Id: I1e1e9db9f914e47c55df7d5f01a58d73098cc9a0
 2019-09-11 15:48:42 -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
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