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

54123 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
86dfbd6254 Import translations. DO NOT MERGE 
Change-Id: I1cf797286a22443416d4b401e38f8923bb4edd43
Auto-generated-cl: translation import
 2019-09-12 15:54:53 -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
8173de150d Import translations. DO NOT MERGE 
Auto-generated-cl: translation import

Bug: 64712476
Change-Id: I60bd87b13925d699bc7db9f6f215321ff20eea44
 2019-09-11 19:10:50 -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
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
TreeHugger Robot
09c08d1da0 Merge "Import translations. DO NOT MERGE" into qt-r1-dev 2019-09-11 18:41:53 +00: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
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
c1bfd1f50d Import translations. DO NOT MERGE 
Auto-generated-cl: translation import

Bug: 140445577
Change-Id: Ife760913fdf573fb8820f604e90fae666cab08e5
 2019-09-11 01:46:53 +00: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
Xin Li
aac7f8e2cd Merge qt-r1-dev-plus-aosp-without-vendor (5817612) into stage-aosp-master 
Bug: 135460123
Change-Id: Ifbb4b45d2d592e4a4ede265d2c882dc1cb4a0410
Merged-In: Idcc078c0e541c04633db6d94c613ac4c861ba963
 2019-09-08 13:06:57 -07:00
Bill Yi
c47b5e1943 [automerger skipped] Import translations. DO NOT MERGE 
am: 53e826122d -s ours
am skip reason: subject contains skip directive

Change-Id: I79de9a02a1f3aefd51e6d436b939fc562bf3af72
 2019-09-06 17:51:15 -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
Bill Yi
059dddf30e [automerger skipped] Import translations. DO NOT MERGE 
am: e2f5f9b876 -s ours
am skip reason: subject contains skip directive

Change-Id: Ib855906069bdfa6390895a92091cb28dbe9fd943
 2019-09-05 18:30:03 -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
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
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
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
c542abdcaf Merge "Updated security settings string." into qt-r1-dev 
am: b7ac44e643

Change-Id: Ife05eee951852b471138afb3f73fd4e153cc9d43
 2019-09-05 13:17:36 -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
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
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
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
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
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
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
92c5a4fafd [automerger skipped] Import translations. DO NOT MERGE am: e6c59cd920 -s ours 
am: b227fad96a -s ours
am skip reason: subject contains skip directive

Change-Id: Ie130f1213412043590b081561fa371dc98158dc7
 2019-08-22 08:56:32 -07:00
Bill Yi
7aaf659356 [automerger skipped] Import translations. DO NOT MERGE am: e6c59cd920 -s ours 
am: 1f8f4362c4 -s ours
am skip reason: subject contains skip directive

Change-Id: I8d520cc26e8315f8bbb6eb1694547dfab1bc4e0a
 2019-08-22 08:55:21 -07:00
Bill Yi
1f8f4362c4 [automerger skipped] Import translations. DO NOT MERGE 
am: e6c59cd920 -s ours
am skip reason: subject contains skip directive

Change-Id: Ib440f82e3fe673be9aaa79557166119689d7446e
 2019-08-22 08:40:37 -07:00
Bill Yi
b227fad96a [automerger skipped] Import translations. DO NOT MERGE 
am: e6c59cd920 -s ours
am skip reason: subject contains skip directive

Change-Id: Ib9cd51789b9d1d747295f27f94905eca862b87d0
 2019-08-22 08:40:36 -07:00