PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
53,213 Commits 1 Branch 0 Tags
6ac45a7cebbe51f2da2ffc2ce8b264e5686c9f90
Commit Graph

53213 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
TreeHugger Robot
7177991eba Merge "Import translations. DO NOT MERGE" into qt-qpr1-dev 2019-09-11 03:43:27 +00: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
24df1249f0 Merge "Merging from qt-qpr1-sysui-dev @ build 5855545" into qt-qpr1-dev 2019-09-10 20:24:04 +00: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
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
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
Bill Yi
8d9317075c [automerger skipped] Import translations. DO NOT MERGE 
am: 53e826122d -s ours
am skip reason: subject contains skip directive

Change-Id: Idcf6bcf772195798c2853d81e1ab6623b17bf8df
 2019-09-07 18:27:34 -07:00
Bill Yi
53e826122d Import translations. DO NOT MERGE 
Auto-generated-cl: translation import

Change-Id: Ie16be62ead2b453c69d0201a5aa5e7ae3411405f
 2019-09-06 16:30:38 +00:00
Raff Tsai
6748951f07 Fix Settings crash when click uninstall button 
am: 2d709131ba

Change-Id: I5e7c8f9e5ea9ac6854be24ddd025ee0849a200cf
 2019-09-06 01:47:16 -07:00
Raff Tsai
2d709131ba Fix Settings crash when click uninstall button 
When mPackageName is null, mFinish is true. OnResume() doesn't
invoke refreshUI(). It causes uninstall button is still enabled.
The solution is hiding AppButtonsPreference when mFinish is true.

Fixes: 138524326
Test: make RunSettingsRoboTests ROBOTEST_FILTER
Change-Id: I9759e53f002afbd4c88d8d536df3bf01c343135e
(cherry picked from commit 88228c3399)
 2019-09-06 05:24:12 +00:00
Bill Yi
10ff483197 [automerger skipped] Import translations. DO NOT MERGE am: e2f5f9b876 -s ours 
am: f85844d8e6 -s ours
am skip reason: subject contains skip directive

Change-Id: I71ccaf502f0cff035cfc533f6a1183382b79fdb2
 2019-09-05 18:36:03 -07:00
Bill Yi
f85844d8e6 [automerger skipped] Import translations. DO NOT MERGE 
am: e2f5f9b876 -s ours
am skip reason: subject contains skip directive

Change-Id: I0a5fec1d9bb34749d2add5aa4691007208c6b2b6
 2019-09-05 18:30:04 -07:00
Bill Yi
e2f5f9b876 Import translations. DO NOT MERGE 
Auto-generated-cl: translation import

Bug: 140445577
Change-Id: I162cbffdd4239b49c258bae8df318f7c4ebd0643
 2019-09-05 17:10:26 -07:00
Joshua Mccloskey
b8e4bd45c2 Merge "Modified text to cancel enrollment" into qt-r1-dev am: fde49ec3ad 
am: cbeeed9942

Change-Id: I6a62cccc71ce78f49ab85713b162be1395f8769d
 2019-09-05 16:10:00 -07:00
Joshua Mccloskey
cbeeed9942 Merge "Modified text to cancel enrollment" into qt-r1-dev 
am: fde49ec3ad

Change-Id: I7691e528d2ceb433509558885ad8af750ddc6678
 2019-09-05 16:00:59 -07:00
Joshua Mccloskey
fde49ec3ad Merge "Modified text to cancel enrollment" into qt-r1-dev 2019-09-05 22:44:12 +00:00
Joshua Mccloskey
27c1468940 Merge "Updated security settings string." into qt-r1-dev am: b7ac44e643 
am: 648db67fec

Change-Id: Id42bb590b657ab4e3ae5164f51dcc50abb62a544
 2019-09-05 13:22:56 -07:00
Joshua Mccloskey
648db67fec Merge "Updated security settings string." into qt-r1-dev 
am: b7ac44e643

Change-Id: Ib890b97401801fb5bcea20d1cd4fa284c1dec09f
 2019-09-05 12:50:45 -07:00
joshmccloskey
a55cbf036f Modified text to cancel enrollment 
Fixes: 140446388
Test: Manual.
Change-Id: If3f0affb390743cd7973957b5dea69d5e012dcb1
 2019-09-05 12:23:44 -07:00
Joshua Mccloskey
b7ac44e643 Merge "Updated security settings string." into qt-r1-dev 2019-09-05 19:22:29 +00:00
Arc Wang
31a79feccd [Wi-Fi] Can't change EAP method for a saved enterprise Wi-Fi network 
Should only allow saved network UI initialization for once.

Bug: 140362368
Test: WifiConfigControllerTest
      manual:
      Manually change EAP method and other security fields for a saved
      Wi-Fi neterprise network.

Change-Id: Iddc1dae53849760f43b41b75262358dff6ba09af
Merged-In: Iddc1dae53849760f43b41b75262358dff6ba09af
 2019-09-05 14:57:07 +08:00
cosmohsieh
98690197e6 [Network Connection] Call NetworkRequestUserSelectionCallback#reject() if user quit activity without selection 
Call NetworkRequestUserSelectionCallback#reject() to notify framework that user quit this request without
selecting any network.

Bug: 138855477
Test: make RunSettingsRoboTests -j32 ROBOTEST_FILTER=com.android.settings.wifi.NetworkRequestErrorDialogFragmentTest
Change-Id: I4b06c9772598ab3f9416f32456cd0a65e2d70d68
Merged-In: I4b06c9772598ab3f9416f32456cd0a65e2d70d68
 2019-09-05 14:22:00 +08:00
joshmccloskey
e02042d140 Updated security settings string. 
Test: Manual.
Bug: 140445577
Change-Id: Ie31132dcfcc10a8970b32c1a9bd082990560a353
 2019-09-03 16:33:39 -07:00
Bill Yi
342026fa8c [automerger skipped] Import translations. DO NOT MERGE 
am: 6cf0558c80 -s ours
am skip reason: subject contains skip directive

Change-Id: I3e4886467395d5f362668583a56336f2a3e3da3a
 2019-09-02 09:10:52 -07:00
Bill Yi
6cf0558c80 Import translations. DO NOT MERGE 
Auto-generated-cl: translation import

Bug: 64712476
Change-Id: Ife4a90b13e0fea3568f7dd2097184b46cc542237
 2019-09-01 23:17:12 -07:00
Bill Yi
7d0a313e1c [automerger skipped] Import translations. DO NOT MERGE am: d595d265f0 -s ours 
am: 42b697c5fa -s ours
am skip reason: subject contains skip directive

Change-Id: I672f90c2d80f4a9141a31211fe5d516a377374b6
 2019-08-30 19:04:21 -07:00
Bill Yi
42b697c5fa [automerger skipped] Import translations. DO NOT MERGE 
am: d595d265f0 -s ours
am skip reason: subject contains skip directive

Change-Id: I3b7728ea50f17bfcb92153699909602836b9fd27
 2019-08-30 18:57:26 -07:00
Bill Yi
384d1455ed [automerger skipped] Import translations. DO NOT MERGE 
am: acf9750118 -s ours
am skip reason: subject contains skip directive

Change-Id: I3d44017502a4a676a80ded624af6698cffde9fba
 2019-08-30 18:36:39 -07:00
Bill Yi
67a6005f02 Import translations. DO NOT MERGE 
Auto-generated-cl: translation import

Bug: 64712476
Change-Id: If0969b48cec65b4596c96c0da99714858a6923a3
 2019-08-30 17:35:08 -07:00
Bill Yi
acf9750118 Import translations. DO NOT MERGE 
Auto-generated-cl: translation import

Bug: 64712476
Change-Id: I893b442565d5ac2caa0607111c523ecef27c7bf6
 2019-08-30 17:04:50 -07:00
Bill Yi
d595d265f0 Import translations. DO NOT MERGE 
Auto-generated-cl: translation import

Bug: 64712476
Change-Id: I59f54fe4b2f22bb52495436350e1c7e3cf02e800
 2019-08-30 16:49:34 -07:00
Bill Yi
a63c2ced9f [automerger skipped] Import translations. DO NOT MERGE am: 2a7b5e2abc -s ours am: 272f241fd4 -s ours 
am: 2c4800b4f4 -s ours
am skip reason: subject contains skip directive

Change-Id: I35935d3c0f92a547906346ca014756334dfd9889
 2019-08-27 02:12:00 -07:00
Bill Yi
2c4800b4f4 [automerger skipped] Import translations. DO NOT MERGE am: 2a7b5e2abc -s ours 
am: 272f241fd4 -s ours
am skip reason: subject contains skip directive

Change-Id: I35eee950f35028f93b5fd93732076ea1e59777b8
 2019-08-27 01:18:06 -07:00
Bill Yi
6e9c3ee3b5 [automerger skipped] Import translations. DO NOT MERGE am: 18183ad552 -s ours 
am: b23b8117ef -s ours
am skip reason: subject contains skip directive

Change-Id: I7f6ca5313e2ea952b31b12fb8d7611414bbc8e22
 2019-08-27 01:17:04 -07:00
Jayachandran Chinnakkannu
ef97b13354 Merge "[Settings] hide preferred network mode UI" into qt-r1-dev am: 7afb9854a7 
am: ddc7dda71b

Change-Id: Ie4c47911942926efe0ba8295e9ba9ef05ec98826
 2019-08-27 01:14:37 -07:00
Bill Yi
b23b8117ef [automerger skipped] Import translations. DO NOT MERGE 
am: 18183ad552 -s ours
am skip reason: subject contains skip directive

Change-Id: Ifd79b8618022e2ae80e21af4e0677f0049304f33
 2019-08-27 00:50:02 -07:00
Jayachandran Chinnakkannu
ddc7dda71b Merge "[Settings] hide preferred network mode UI" into qt-r1-dev 
am: 7afb9854a7

Change-Id: Idfbc3f765fc834ab3cb7e07ec340a98606ce87ad
 2019-08-27 00:40:42 -07:00
TreeHugger Robot
d9989fc62b Merge "Import translations. DO NOT MERGE" into qt-r1-bubbles-dev 2019-08-26 19:04:13 +00:00
Bill Yi
80589d367d [automerger skipped] Import translations. DO NOT MERGE am: 2a7b5e2abc -s ours 
am: 272f241fd4 -s ours
am skip reason: subject contains skip directive

Change-Id: Ieaabc566a4f74cc640f6f7bd5ddc4fc66ca45d69
 2019-08-26 10:52:55 -07:00
Bill Yi
1168870624 [automerger skipped] Import translations. DO NOT MERGE 
am: 18183ad552 -s ours
am skip reason: subject contains skip directive

Change-Id: Iaef7f84ffabe3b1238ed4c3f65330fbb9b43ed38
 2019-08-26 10:52:18 -07:00
Bill Yi
272f241fd4 [automerger skipped] Import translations. DO NOT MERGE 
am: 2a7b5e2abc -s ours
am skip reason: subject contains skip directive

Change-Id: Id5178f84c020fa9a56f7159f44df89f7c069c5f9
 2019-08-26 10:48:23 -07:00
Bill Yi
c6b2785d65 [automerger skipped] Import translations. DO NOT MERGE 
am: 9781a780e4 -s ours
am skip reason: subject contains skip directive

Change-Id: I702fcf7582392b0e0b6d20a19844702786a90d5e
 2019-08-26 10:47:16 -07:00
Bill Yi
e3cbf6a8d1 Import translations. DO NOT MERGE 
Auto-generated-cl: translation import

Bug: 64712476
Change-Id: If0c4f3a5f240a8da2bfd94c4496f4a86fabb02e9
 2019-08-26 05:46:44 -07:00
Bill Yi
29e2efdad1 Import translations. DO NOT MERGE 
Auto-generated-cl: translation import

Bug: 64712476
Change-Id: I8f245fc67033985824bbd6e410f0163c39d6c162
 2019-08-26 05:32:34 -07:00