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

54738 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Android Build Merger (Role)
eec9cc07ca Merge "[automerger skipped] Import translations. DO NOT MERGE am: aa605a2ff8 -s ours am: 6fa03d4cad -s ours am skip reason: subject contains skip directive" into qt-qpr1-dev-plus-aosp 2019-10-06 22:10:28 +00:00
Bill Yi
09a0ca8303 [automerger skipped] Import translations. DO NOT MERGE am: aa605a2ff8 -s ours 
am: 6fa03d4cad -s ours
am skip reason: subject contains skip directive

Change-Id: I907eb3de51fb2427bc525282a87ceea97581815c
 2019-10-06 15:10:17 -07:00
Bill Yi
8491c7fc2b [automerger skipped] Import translations. DO NOT MERGE am: aa605a2ff8 -s ours 
am: 165a3e6152 -s ours
am skip reason: subject contains skip directive

Change-Id: I22a3b3c49c309e7ccd9424f16841722fd1a228b0
 2019-10-06 15:10:15 -07:00
Bill Yi
6fa03d4cad [automerger skipped] Import translations. DO NOT MERGE 
am: aa605a2ff8 -s ours
am skip reason: subject contains skip directive

Change-Id: I67820e45b4aceb3a9d3c141cc3be69e899551e2e
 2019-10-06 15:03:16 -07:00
Bill Yi
165a3e6152 [automerger skipped] Import translations. DO NOT MERGE 
am: aa605a2ff8 -s ours
am skip reason: subject contains skip directive

Change-Id: I8582fd40ccfab6c247144759b8eac47e021b3ee4
 2019-10-06 15:03:16 -07:00
Bill Yi
e59984afb1 [automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-qpr1-dev 
am: 42eff7e319 -s ours
am skip reason: subject contains skip directive

Change-Id: I35cc62652e4cb9c2a7448b1db141cbba125c6f04
 2019-10-06 13:21:35 -07:00
TreeHugger Robot
42eff7e319 Merge "Import translations. DO NOT MERGE" into qt-qpr1-dev 2019-10-06 19:48:23 +00:00
SongFerngWang
a72e1c4612 Preferred network list add 5G item 
am: dd7f9b57f6

Change-Id: I70f89c6c5e5c43107788c58f1fc3ca44383b4ce5
 2019-10-06 09:20:09 -07:00
SongFerngWang
ffc927f77d RadioInfo network mode list and network mode string add 5G 
am: ec384c2f6f

Change-Id: I280fb1f3e0acddcb3a85eee876112e491bd4f8f4
 2019-10-06 09:20:06 -07:00
Bill Yi
4c257b0ef8 Import translations. DO NOT MERGE 
Change-Id: Ie4fdf91f299defd2a361d76455093db5a410d0d6
Auto-generated-cl: translation import
 2019-10-06 07:50:11 -07:00
Bill Yi
aa605a2ff8 Import translations. DO NOT MERGE 
Change-Id: I1af1cc81e5fffb4ead2146f8871efa5115f91be2
Auto-generated-cl: translation import
 2019-10-06 07:36:10 -07:00
SongFerngWang
dd7f9b57f6 Preferred network list add 5G item 
Preferred network list add 5G item, and change "recommended" from 4G to
5G, and add summary for 5G.

Bug: 138544359
Test: 1.fake the device network type bitmask to 5G, UI show 5G list
2.atest EnabledNetworkModePreferenceControllerTest.java :pass

Change-Id: I4a78e2e7fbb067ce841df4aaf1d5161607fdcf90
 2019-10-04 04:53:31 +00:00
SongFerngWang
ec384c2f6f RadioInfo network mode list and network mode string add 5G 
Bug: 131888757
Test: 1.build pass 2.RadioInfo set network mode work.
Change-Id: I945d3c2fd175f45151bbeee475e388ccc2d67642
 2019-10-04 12:39:59 +08:00
Bill Yi
7923617e30 [automerger skipped] Import translations. DO NOT MERGE 
am: ccd0c91498 -s ours
am skip reason: subject contains skip directive

Change-Id: I2f2bcc99472507969722b03882633814370e3e10
 2019-10-03 10:13:25 -07:00
Bill Yi
ccd0c91498 Import translations. DO NOT MERGE 
Change-Id: I33d1ef5a92b84fc166b35f7b5b341e7a92b35820
Auto-generated-cl: translation import
 2019-10-02 16:55:04 -07:00
Bonian Chen
f726a31457 Merge "[Settings Telephony] Carrier name API replacement" into qt-qpr1-dev 
am: 556b34d03d

Change-Id: Ibffb60c57aa4152b4681f3fe95dae7175f2e878e
 2019-10-01 19:53:31 -07:00
Bonian Chen
556b34d03d Merge "[Settings Telephony] Carrier name API replacement" into qt-qpr1-dev 2019-10-02 02:44:34 +00:00
Bill Yi
b489e62ba7 [automerger skipped] Import translations. DO NOT MERGE 
am: d57831b7d2 -s ours
am skip reason: subject contains skip directive

Change-Id: Idf60f77bdffa5efdd33d01c20f4e12076f9b9b87
 2019-10-01 17:07:00 -07:00
Bill Yi
d57831b7d2 Import translations. DO NOT MERGE 
Auto-generated-cl: translation import

Bug: 141777841
Change-Id: I5ef0e8ee2f723c81d4cc1c0be5daf311c7c38e84
 2019-10-01 16:05:46 -07:00
Bill Yi
cc1306957a [automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-qpr1-dev 
am: 833512a1d2 -s ours
am skip reason: subject contains skip directive

Change-Id: I20fe79ea6a6f6b3fd54da7ab03eaa233913287c1
 2019-10-01 15:18:03 -07:00
Joshua Mccloskey
b288f07bb2 Merge "Added new string." into qt-qpr1-dev 
am: 262f5fe91f

Change-Id: If8467461e0963648886c02159353c177e9b88d41
 2019-10-01 15:17:26 -07:00
TreeHugger Robot
833512a1d2 Merge "Import translations. DO NOT MERGE" into qt-qpr1-dev 2019-10-01 22:08:03 +00:00
Joshua Mccloskey
262f5fe91f Merge "Added new string." into qt-qpr1-dev 2019-10-01 22:05:41 +00:00
Bill Yi
881736b7ef Import translations. DO NOT MERGE 
Change-Id: I594742575ea6729d9c71e0ef04658f6513875aaf
Auto-generated-cl: translation import
 2019-10-01 12:53:15 -07:00
Bonian Chen
c7c84d2c87 [Settings Telephony] Carrier name API replacement 
Replacing TelephonyManager.getNetworkOperatorName() by
Obtaining carrier name from SubscriptionInfo.getCarrierName().

TelephonyManager.getNetworkOperatorName() only be used when there's no
SubscriptionInfo can be found.

Bug: b/140443508
Test: Manual testing
  atest MobileNetworkUtilsTest
  atest OpenNetworkSelectPagePreferenceControllerTest

Change-Id: I7a86395c86d31fe2ba54c04ac16b1a0ebfc843f3
 2019-10-01 17:59:43 +00:00
Paul Hu
67fe04814d Merge "[Settings] Replace CONNECTIVITY_INTERNAL to TETHER_PRIVILEGED" am: a67ca4cfd7 am: 3a728ae13b 
am: a6dadc465b

Change-Id: I08a04f4e627ce876a3cabd194a9838a0b5ce8459
 2019-10-01 03:15:14 -07:00
Paul Hu
a6dadc465b Merge "[Settings] Replace CONNECTIVITY_INTERNAL to TETHER_PRIVILEGED" am: a67ca4cfd7 
am: 3a728ae13b

Change-Id: Id211709644b505fa866b0661f9657991c36dbaf6
 2019-10-01 03:09:15 -07:00
Paul Hu
3a728ae13b Merge "[Settings] Replace CONNECTIVITY_INTERNAL to TETHER_PRIVILEGED" 
am: a67ca4cfd7

Change-Id: I7a2a4d76d1e0092188121d390c75c12eac20cdab
 2019-10-01 03:03:36 -07:00
Paul Hu
a67ca4cfd7 Merge "[Settings] Replace CONNECTIVITY_INTERNAL to TETHER_PRIVILEGED" 2019-10-01 09:50:28 +00:00
Bill Yi
beb37b072f [automerger skipped] Import translations. DO NOT MERGE 
am: 0631ad6efb -s ours
am skip reason: subject contains skip directive

Change-Id: I1338a125768855043cf83c6c5c759b470e12e7d4
 2019-09-30 12:42:10 -07:00
Bill Yi
0631ad6efb Import translations. DO NOT MERGE 
Change-Id: I10e5b04a3a580ba34f945305d011ac192a3c4dd3
Auto-generated-cl: translation import
 2019-09-30 03:35:57 -07:00
Bill Yi
37703c090a [automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-qpr1-dev 
am: b01e0ab05c -s ours
am skip reason: subject contains skip directive

Change-Id: Ie644497f111a2029d99a700b6333d3dec43fa948
 2019-09-28 14:16:37 -07:00
TreeHugger Robot
b01e0ab05c Merge "Import translations. DO NOT MERGE" into qt-qpr1-dev 2019-09-28 21:05:31 +00:00
Bill Yi
f7de50f5be Import translations. DO NOT MERGE 
Change-Id: Idfb9ca3c6ddf6aa0a9bc04a262b8e0fd76032867
Auto-generated-cl: translation import
 2019-09-28 04:11:34 -07:00
joshmccloskey
515772802f Changed string for translations. 
am: 186dbc65af

Change-Id: Id48a469817c96a13ac1311792ad4b8bcd61fe88f
 2019-09-27 16:41:36 -07:00
joshmccloskey
4259495574 Added new string. 
Fixes: 141762646
Test: Verified that string translates to spanish after changing
the language.

Change-Id: I48e34de15460c93c8f50d26821c4d64984f20c6d
 2019-09-27 23:15:32 +00:00
joshmccloskey
186dbc65af Changed string for translations. 
Fixes: 141762646
Test: Verified that string translates to spanish after changing
the language.

Change-Id: Ieebb2ec15cf5cff2afcfefcb130193bdce6086fe
 2019-09-27 21:56:46 +00:00
Kevin Chyn
a9c14ab4b1 Fix FaceSetupSliceTest 
am: acde97cf90

Change-Id: Ied72d5ae4b891ef1c5600b8d416b016d0aede23e
 2019-09-27 01:07:02 -07:00
Kevin Chyn
acde97cf90 Fix FaceSetupSliceTest 
Bug: 141380252

Test: make -j56 RunSettingsRoboTests

Change-Id: Ifb9a29d8f3115759a9e8e93e3721135c6ba229bf
 2019-09-26 22:32:52 -07:00
joshmccloskey
3511ad89ca Added different flow for re-enrollment 
am: bba7632f28

Change-Id: Ie5174848a3a35df197177b0aa2cf6c324813b8dd
 2019-09-26 20:06:48 -07:00
joshmccloskey
bba7632f28 Added different flow for re-enrollment 
In order to enable this new flow, a user must currently have an enrolled
face and the security setting face_unlock_re_enroll must be non-zero.

Ex.
1. Enroll Face.
2. adb shell settings put
(secure face_unlock_re_enroll|secure_face_unlock_must_re_enroll) 1
3. If settings is opened, close it.
4. Open settings
5. Verify the new flow appears.

Bug: 141380252
Bug: 141254937
Test: Verified that the user's face is deleted after clicking delete.
Test: Verified that the user can re-enroll after removing their face.
Change-Id: I2b36a0bda5cb10fb33dfb2a5627d8fa40f14fb7e
 2019-09-26 23:54:59 +00:00
Taesu Lee
1c20ea5644 Merge "Fix to show eUICC preference in eng build" am: e825c30137 am: 9e81a2f4a8 
am: c4c8f51bb0

Change-Id: I58dae46adec67c855a5e26542d75d15f116c37dc
 2019-09-25 23:28:11 -07:00
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
joshmccloskey
ab5bf98c03 Added mandatory scrolling for FaceIntroduction 
am: af1e831ab7

Change-Id: I1877ce4650fd393d08e2ff1c15944df8fbd4d6d7
 2019-09-25 10:58:00 -07:00
Bill Yi
5f968e68c7 [automerger skipped] Import translations. DO NOT MERGE am: 500e7b2b71 -s ours 
am: 444eac4f4a -s ours
am skip reason: subject contains skip directive

Change-Id: Ic8198769cb6d796e2add9491f538723fa3381d4c
 2019-09-25 07:46:21 -07: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
joshmccloskey
af1e831ab7 Added mandatory scrolling for FaceIntroduction 
Test: Verified in SUW/Settings user must scroll through contents in
order to go to the next screen.
Bug: 141380294

Change-Id: I483ab6ae6a282c81ba2f2c4d1d9d1f21c6cb9453
 2019-09-25 00:23:59 +00:00