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

54143 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Taesu Lee
c4c8f51bb0 Merge "Fix to show eUICC preference in eng build" am: e825c30137 
am: 9e81a2f4a8

Change-Id: I777273344c8eb4f791756be7fcb9755a5bf9e8b8
 2019-09-25 23:21:12 -07:00
Taesu Lee
9e81a2f4a8 Merge "Fix to show eUICC preference in eng build" 
am: e825c30137

Change-Id: Ie6ca5a575e5c5caa4c841286421d037649765397
 2019-09-25 23:14:10 -07:00
Treehugger Robot
e825c30137 Merge "Fix to show eUICC preference in eng build" 2019-09-26 05:53:10 +00:00
Bill Yi
444eac4f4a [automerger skipped] Import translations. DO NOT MERGE 
am: 500e7b2b71 -s ours
am skip reason: subject contains skip directive

Change-Id: I4a84a614577ee9558b05de1e30fe543ff2ece1d3
 2019-09-25 07:30:56 -07:00
Bill Yi
500e7b2b71 Import translations. DO NOT MERGE 
Change-Id: I0f9786915ebc5c168487e7a5386d4f2060d27a12
Auto-generated-cl: translation import
 2019-09-24 18:54:26 -07:00
Daniel Huang
1fec213233 Merge "In sim1 APN settings interface and hot plug out/in sim2, APN information change to sim2's" am: 51cb777530 
am: f28625bcf1

Change-Id: Ie151d421eae8321dc684f7d4a684f582fb60c3ac
 2019-09-24 02:39:02 -07:00
Daniel Huang
f28625bcf1 Merge "In sim1 APN settings interface and hot plug out/in sim2, APN information change to sim2's" 
am: 51cb777530

Change-Id: I7d6675734eed90cbfb0ccda46c047883e460962f
 2019-09-24 02:32:29 -07:00
Daniel Huang
51cb777530 Merge "In sim1 APN settings interface and hot plug out/in sim2, APN information change to sim2's" 2019-09-24 09:21:51 +00:00
Yi-Ling Chuang
b26711944b Merge "Enable dismissal feature on legacy suggestions." am: ee39335edc 
am: 8d8c3e19b5

Change-Id: I8fae05f98c2ad04e0d7fba7a2aa409c08f781c0b
 2019-09-22 20:09:51 -07:00
Yi-Ling Chuang
8d8c3e19b5 Merge "Enable dismissal feature on legacy suggestions." 
am: ee39335edc

Change-Id: Ibce2403de032bd3d7fce750f6cd80191a8b14441
 2019-09-22 20:03:21 -07:00
Treehugger Robot
ee39335edc Merge "Enable dismissal feature on legacy suggestions." 2019-09-23 02:45:25 +00:00
Bill Yi
cbfc75bb00 [automerger skipped] Import translations. DO NOT MERGE 
am: 73915b77ed -s ours
am skip reason: subject contains skip directive

Change-Id: I31f45d935e2c9a13feb71186730b99fffc102c9b
 2019-09-22 12:53:43 -07:00
Bill Yi
73915b77ed Import translations. DO NOT MERGE 
Change-Id: Ib6e2dcd3084a0399fec672c4fff3a51e8dd0d195
Auto-generated-cl: translation import
 2019-09-22 07:38:24 -07:00
Yi-Ling Chuang
83ac0efd81 Enable dismissal feature on legacy suggestions. 
Add back the close button for legacy suggestions.

Fixes: 140786274
Test: robotest
Change-Id: Iaf0376bd482db4c4ff7d04a68131071c29c01ced
 2019-09-20 18:03:10 -07:00
苗苗 (Miao Miao)
9f4a65c893 In sim1 APN settings interface and hot plug out/in sim2, APN information change to sim2's 
STEPS TO REPRODUCE:
1. Insert two sim into device, sim1 is CUCC, sim2 is CMCC
2. Goto Settings-Network & Internet-sim1-MobileNetworkSettings-Access Point Names. It shows CUCC APN information
3. Hot plug out sim2
4. Hot plug in sim2, APN information changes to CMCC APN information

EXPECTED RESULTS:
When hot plug out/in sim2, sim1 APN settings interface should still keep its APN information instead of changing to sim2 APN information

Change-Id: I04c769f60ba1686b2c9bebcd07e3a04685979442
Bug: 141087659
Test:In sim1 APN settings interface, hot plug out/in sim2, it shows sim1 APN information all the time, test pass.
 2019-09-20 18:13:30 +08:00
Neil Fuller
42b55bc6f6 Merge "Remove use of deprecated Time class" am: b3f8696c4d 
am: b83ddefb5c

Change-Id: Iafc1b00c254a5f7cc6af80b3eeeaf4418fbdbaf9
 2019-09-17 10:06:03 -07:00
Neil Fuller
b83ddefb5c Merge "Remove use of deprecated Time class" 
am: b3f8696c4d

Change-Id: Ie6dcfcde7ec223ed83b2d8d33f059924e3a566e9
 2019-09-17 09:56:45 -07:00
Treehugger Robot
b3f8696c4d Merge "Remove use of deprecated Time class" 2019-09-17 16:32:47 +00:00
Neil Fuller
4c77d00e34 Remove use of deprecated Time class 
Remove a use of the deprecated Time class.

Bug: 16550209
Test: treehugger only
Change-Id: If97b0d8ea78a76d613652ab623c3a48f5aa9aabb
 2019-09-17 13:53:17 +01: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
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
Taesu Lee
39e4fbb746 Fix to show eUICC preference in eng build 
DEVELOPMENT_SETTINGS_ENABLED is not set before entering Developer
options in settings app even if it is in eng build. To show eUICC
preference in eng build, uses isDevelopmentSettingsEnabled() instead.

Test: Manual and make RunSettingsRoboTests

Change-Id: Ia1f46fad94bc62ca48dcfef7cd5d6188766aa380
Signed-off-by: Taesu Lee <taesu82.lee@samsung.com>
 2019-09-06 16:11:39 +09: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