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

54670 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
820c723e59 Merge "Modified text to cancel enrollment" into qt-r1-dev 
am: fde49ec3ad

Change-Id: I9f412f3eebda4dde2995932ad2ca2a16e2d2a82a
 2019-09-05 15:59:59 -07:00
Joshua Mccloskey
fde49ec3ad Merge "Modified text to cancel enrollment" into qt-r1-dev 2019-09-05 22:44:12 +00:00
Xin Li
e99e27e78a [automerger skipped] Merge "DO NOT MERGE - Merge Android 10 into master" am: d7a8e234e9 -s ours am: 377369bd0d 
am: 3a8baab596

Change-Id: If7ff85c16d821207f67a52224afcb7edf539d415
 2019-09-05 14:29:14 -07:00
Xin Li
3a8baab596 [automerger skipped] Merge "DO NOT MERGE - Merge Android 10 into master" am: d7a8e234e9 -s ours 
am: 377369bd0d

Change-Id: Id7cae58babeb74b53bc047a2098fe05b06fbc066
 2019-09-05 14:05:27 -07:00
Joshua Mccloskey
f0c7ec75a4 Merge "Updated security settings string." into qt-r1-dev am: b7ac44e643 
am: c542abdcaf

Change-Id: I710540bf4b92950876f6f39031b8b84d49bea0e8
 2019-09-05 14:04:56 -07:00
Xin Li
377369bd0d [automerger skipped] Merge "DO NOT MERGE - Merge Android 10 into master" 
am: d7a8e234e9 -s ours
am skip reason: subject contains skip directive

Change-Id: I3a3eb2d8dfa2a3a55c55445bffa5ae5565a5ad5d
 2019-09-05 13:32:29 -07:00
Joshua Mccloskey
763e5588ba Merge "Updated security settings string." into qt-r1-dev am: b7ac44e643 
am: 648db67fec

Change-Id: Ie8c9b2a05d6b7ac5d02df2936eaf897fce585f3d
 2019-09-05 13:31:50 -07: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
c542abdcaf Merge "Updated security settings string." into qt-r1-dev 
am: b7ac44e643

Change-Id: Ife05eee951852b471138afb3f73fd4e153cc9d43
 2019-09-05 13:17:36 -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
Xin Li
d7a8e234e9 Merge "DO NOT MERGE - Merge Android 10 into master" 2019-09-05 16:53:18 +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
Xin Li
7195e05dfa DO NOT MERGE - Merge Android 10 into master 
Bug: 139893257
Change-Id: Idcc078c0e541c04633db6d94c613ac4c861ba963
 2019-09-04 13:34:43 -07:00
joshmccloskey
e02042d140 Updated security settings string. 
Test: Manual.
Bug: 140445577
Change-Id: Ie31132dcfcc10a8970b32c1a9bd082990560a353
 2019-09-03 16:33:39 -07:00
Bill Yi
575d79821a [automerger skipped] Import translations. DO NOT MERGE 
am: 6cf0558c80 -s ours
am skip reason: subject contains skip directive

Change-Id: I0dd23993b72e826f8bf6ac8df3542aa7fee88595
 2019-09-02 09:11:06 -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
Android Build Merger (Role)
1d0a2a83f6 Merge "[automerger skipped] Import translations. DO NOT MERGE am: d595d265f0 -s ours am: 42b697c5fa -s ours am skip reason: subject contains skip directive" into qt-qpr1-dev-plus-aosp 2019-08-31 02:04:35 +00:00
Bill Yi
ba228ef96b [automerger skipped] Import translations. DO NOT MERGE am: d595d265f0 -s ours 
am: 42b697c5fa -s ours
am skip reason: subject contains skip directive

Change-Id: I6c9235549213d93ed0a86b85fe9833216a459e6f
 2019-08-30 19:04:23 -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
231f0109d4 [automerger skipped] Import translations. DO NOT MERGE am: d595d265f0 -s ours 
am: a8e6569855 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ifea9af76e490aafd88aabea7515a69de7e3e2301
 2019-08-30 18:57:28 -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
aa7a7428d6 [automerger skipped] Import translations. DO NOT MERGE 
am: acf9750118 -s ours
am skip reason: subject contains skip directive

Change-Id: Ifd28024fc52f4d01f3fecc3c69a391135290ea04
 2019-08-30 18:36:39 -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
0003d9a87f [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: Idcc1af57aafcb361f267ab0defd607b6a70361f0
 2019-08-27 02:28:55 -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
2153c15c96 [automerger skipped] Import translations. DO NOT MERGE am: 18183ad552 -s ours 
am: b23b8117ef -s ours
am skip reason: subject contains skip directive

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

Change-Id: I9ba6cd2c3202f293b834fd70876bc7e7ee540245
 2019-08-27 01:24:28 -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
Bill Yi
f1f45f8be9 [automerger skipped] Import translations. DO NOT MERGE am: 2a7b5e2abc -s ours am: 272f241fd4 -s ours 
am: ce22e01572 -s ours
am skip reason: subject contains skip directive

Change-Id: Ifca4d60381bfa6a02231fffc129613ee2d85d80a
 2019-08-26 13:33:07 -07:00
Bill Yi
bc86400e94 [automerger skipped] Import translations. DO NOT MERGE am: 18183ad552 -s ours 
am: 89f71578fc -s ours
am skip reason: subject contains skip directive

Change-Id: Ib3a283cbe6ce6304774bb5b69481bd209f704e6a
 2019-08-26 12:57:21 -07:00
Bill Yi
050918c710 [automerger skipped] Import translations. DO NOT MERGE am: 2a7b5e2abc -s ours am: acd8a48b6c -s ours 
am: 0a4c821751 -s ours
am skip reason: subject contains skip directive

Change-Id: I89dda01cb409f7eba0d8e31e8ef76baf22bc9a87
 2019-08-26 12:53:09 -07:00
Xin Li
353864df86 [automerger skipped] DO NOT MERGE - Merge build QP1A.190711.019 into stage-aosp-master am: bd8030e8b2 -s ours am: aba2be1b76 
am: cfb15a41ff

Change-Id: I1a9e295c603ad011d184abb3fba2389174286f31
 2019-08-26 12:37:17 -07:00
TreeHugger Robot
d9989fc62b Merge "Import translations. DO NOT MERGE" into qt-r1-bubbles-dev 2019-08-26 19:04:13 +00:00
Xin Li
64f11bf200 [automerger skipped] DO NOT MERGE - Merge build QP1A.190711.001 into stage-aosp-master history am: f92905cfe9 -s ours am: 657ac4e451 
am: 2b7dd17756

Change-Id: I3e80710150b862745a3469c762e4028a4fa23299
 2019-08-26 11:39:51 -07:00
Jayachandran Chinnakkannu
f51fdf64a9 Merge "[Settings] hide preferred network mode UI" into qt-r1-dev am: 7afb9854a7 
am: b5617b6f21

Change-Id: Ia137a3f3454cff7af7c3aa7195eb89c049fadaf2
 2019-08-26 11:39:22 -07:00
Bill Yi
ce22e01572 [automerger skipped] Import translations. DO NOT MERGE am: 2a7b5e2abc -s ours 
am: 272f241fd4 -s ours
am skip reason: subject contains skip directive

Change-Id: I087b9c5b1524db8692a51d6d648fbcc4391d6d21
 2019-08-26 10:57:36 -07:00