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

54281 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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
Joshua Mccloskey
b7ac44e643 Merge "Updated security settings string." into qt-r1-dev 2019-09-05 19:22:29 +00: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
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
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
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
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
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
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
Bill Yi
89f71578fc [automerger skipped] Import translations. DO NOT MERGE 
am: 18183ad552 -s ours
am skip reason: subject contains skip directive

Change-Id: Idfa1574adf65da278f9f428610e30c0c258d915b
 2019-08-26 10:55:23 -07:00
Bill Yi
0a4c821751 [automerger skipped] Import translations. DO NOT MERGE am: 2a7b5e2abc -s ours 
am: acd8a48b6c -s ours
am skip reason: subject contains skip directive

Change-Id: Id08d6339706794b2ea849de8285f0882e1a31d75
 2019-08-26 10:54:50 -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
acd8a48b6c [automerger skipped] Import translations. DO NOT MERGE 
am: 2a7b5e2abc -s ours
am skip reason: subject contains skip directive

Change-Id: Ie41ed82249c2c5296d1bb030e37518bcbf1bcb5b
 2019-08-26 10:47:40 -07:00
Bill Yi
3f81ee5f55 [automerger skipped] Import translations. DO NOT MERGE 
am: 9781a780e4 -s ours
am skip reason: subject contains skip directive

Change-Id: Id9c07a0e7ae93ab863f31bacdd6447c9118af59a
 2019-08-26 10:45:16 -07:00
Bill Yi
9781a780e4 Import translations. DO NOT MERGE 
Auto-generated-cl: translation import

Bug: 64712476
Change-Id: Icd19559f196f76e42d29fe3d9e77bf92d7376a07
 2019-08-26 05:04:21 -07:00
Bill Yi
18183ad552 Import translations. DO NOT MERGE 
Auto-generated-cl: translation import

Bug: 64712476
Change-Id: I21b57a34501c5882af563b0026d52940cc70b3bc
 2019-08-26 04:50:21 -07:00
Bill Yi
2a7b5e2abc Import translations. DO NOT MERGE 
Auto-generated-cl: translation import

Bug: 64712476
Change-Id: Iea44d6e2097aff936635e25e2cc2f241ef34f121
 2019-08-26 04:36:33 -07:00
Xin Li
cfb15a41ff [automerger skipped] DO NOT MERGE - Merge build QP1A.190711.019 into stage-aosp-master am: bd8030e8b2 -s ours 
am: aba2be1b76

Change-Id: I7c2e196f3226c93937b990e0a2ca0daf44ea8722
 2019-08-24 02:03:02 -07:00
Xin Li
aba2be1b76 [automerger skipped] DO NOT MERGE - Merge build QP1A.190711.019 into stage-aosp-master 
am: bd8030e8b2 -s ours
am skip reason: subject contains skip directive

Change-Id: Iee517157cc283eb8d9d92aef77ce396a8bb6f7a9
 2019-08-24 01:17:05 -07:00
Xin Li
2b7dd17756 [automerger skipped] DO NOT MERGE - Merge build QP1A.190711.001 into stage-aosp-master history am: f92905cfe9 -s ours 
am: 657ac4e451

Change-Id: Iec169be2f57b78f76972516d013f637772a0be4a
 2019-08-23 21:22:31 -07:00
Jayachandran Chinnakkannu
b5617b6f21 Merge "[Settings] hide preferred network mode UI" into qt-r1-dev 
am: 7afb9854a7

Change-Id: I561ecbcd376ac4be2003e291f5528130673460fd
 2019-08-23 20:36:56 -07:00
Xin Li
657ac4e451 [automerger skipped] DO NOT MERGE - Merge build QP1A.190711.001 into stage-aosp-master history 
am: f92905cfe9 -s ours
am skip reason: subject contains skip directive

Change-Id: Ic9c32eaa8b51660a9b2a7e95e6edf66700c40b96
 2019-08-23 20:35:43 -07:00
Jayachandran Chinnakkannu
7afb9854a7 Merge "[Settings] hide preferred network mode UI" into qt-r1-dev 2019-08-24 00:09:32 +00:00
Xin Li
bd8030e8b2 DO NOT MERGE - Merge build QP1A.190711.019 into stage-aosp-master 
Bug: 139893257
Change-Id: I54b340294458df6016b7893838e1b0f6e61daf11
 2019-08-23 06:45:17 +00:00
Xin Li
f92905cfe9 DO NOT MERGE - Merge build QP1A.190711.001 into stage-aosp-master history 
Bug: 139893257
Change-Id: Iff267db7ff7312a786dc5004a7421b395da178a9
 2019-08-23 06:42:10 +00:00
Arc Wang
ea15072a94 Merge "[Wi-Fi] Support hidden SSID Wi-Fi networks for Wi-Fi QR code scanner & generator" into qt-qpr1-dev 
am: 318be48d07

Change-Id: I6a33141d8e12a3a16d723b506c986eff941956c9
 2019-08-22 22:23:57 -07:00
TreeHugger Robot
318be48d07 Merge "[Wi-Fi] Support hidden SSID Wi-Fi networks for Wi-Fi QR code scanner & generator" into qt-qpr1-dev 2019-08-23 05:04:35 +00:00
Bonian Chen
128de7bdb6 [Settings] hide preferred network mode UI 
Hide preferred network mode UI no matter home, roaming or no service
when KEY_HIDE_PREFERRED_NETWORK_TYPE_BOOL been enabled.

Bug: 137681413
Test: atest PreferredNetworkModePreferenceControllerTest
      atest EnabledNetworkModePreferenceControllerTest
      Manual with AT&T SIM card in out of servce and in service

Change-Id: Ia0d1333c6cbae3a3717c8db6b77fbb9ea8cec968
 2019-08-22 14:36:12 -07:00
Bill Yi
5e5109e304 [automerger skipped] Import translations. DO NOT MERGE am: e6c59cd920 -s ours am: b227fad96a -s ours 
am: 92c5a4fafd -s ours
am skip reason: subject contains skip directive

Change-Id: Id650db71b5de1ed86c95a02122870032118ff84b
 2019-08-22 09:12:05 -07:00
Android Build Merger (Role)
fa115507c2 Merge "[automerger skipped] Import translations. DO NOT MERGE am: e6c59cd920 -s ours am: b227fad96a -s ours am: 32c8779c92 -s ours am skip reason: subject contains skip directive" into qt-qpr1-dev-plus-aosp 2019-08-22 16:11:12 +00:00