Commit Graph

54908 Commits

Author SHA1 Message Date
Raff Tsai
0f9ad6d7f9 Merge "Make sure close button has proper color" 2019-10-15 10:11:56 +00:00
Xin Li
acfebe21ac DO NOT MERGE - Merge QD1A.190821.011 into stage-aosp-master
Bug: 141248619
Change-Id: I8d4b7b73176b7323ea231bd98c5f74f6b6e96471
2019-10-14 22:54:19 +00:00
SongFerng Wang
951e9b7742 Merge changes Ifaed6ca8,I4a78e2e7,I945d3c2f,Ia0d1333c,I5dfe4843
am: bc6a65ca32

Change-Id: I3ec33adf894393b43296e83b450f3a894785fc92
2019-10-14 00:34:20 -07:00
SongFerngWang
10d41f52b7 Preferred network list add 5G item
am: 76422cab68

Change-Id: I05771619c27d7ce0dd40fd83a9b3560758d29621
2019-10-14 00:34:10 -07:00
SongFerngWang
8cd10f774d RadioInfo network mode list and network mode string add 5G
am: dc5149efef

Change-Id: Id55735d6933965735249e6c25981c137877b00ed
2019-10-14 00:33:54 -07:00
Bonian Chen
b36ff74ac3 [Settings] hide preferred network mode UI
am: 92eb42c69e

Change-Id: Id16ca111b0fe79b83bc0eff0ebdaca03875718dc
2019-10-14 00:33:34 -07:00
Antony Sargent
0f1b14e467 [automerger skipped] Make EnabledNetworkModePreferenceController listen to setting changes
am: aa88b8cee6 -s ours
am skip reason: change_id I5dfe4843a681c613f49caf4584e9dbebc54e708a with SHA1 6d910e8608 is in history

Change-Id: Ieb25eb9b4d1c9d85bcaa6e0532f8814339070f4c
2019-10-14 00:33:09 -07:00
Anamika Singh
a6f03fd0db Move Emergency call button
This is google issue because in Q DecorView (base of CryptKeeper view)
has added Navigation bar forcefully due to which Emergency call button
was hidden on CryptKeeper view.
Made changes to shift ECC button above navigation bar.
Hence it will show just below CryptKeeper password entry view pattern/pin/password).

Bug: 142626673
Test: Manual

Change-Id: If60fad3936bc67adcf26019bdf16975b5706be83
2019-10-14 07:20:15 +00:00
SongFerng Wang
bc6a65ca32 Merge changes Ifaed6ca8,I4a78e2e7,I945d3c2f,Ia0d1333c,I5dfe4843
* changes:
  String "CDME" is wrong
  Preferred network list add 5G item
  RadioInfo network mode list and network mode string add 5G
  [Settings] hide preferred network mode UI
  Make EnabledNetworkModePreferenceController listen to setting changes
2019-10-14 07:14:54 +00:00
SongFerngWang
7fa128edcd String "CDME" is wrong
Bug: 142376028
Test: build pass
Change-Id: Ifaed6ca8aba8f34ecb27abb863aeaf679132934f
Merged-In: Ifaed6ca8aba8f34ecb27abb863aeaf679132934f
2019-10-14 05:01:18 +00:00
SongFerngWang
76422cab68 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
Merged-In: I4a78e2e7fbb067ce841df4aaf1d5161607fdcf90
2019-10-14 05:01:09 +00:00
SongFerngWang
dc5149efef 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
Merged-In: I945d3c2fd175f45151bbeee475e388ccc2d67642
2019-10-14 05:01:01 +00:00
Bonian Chen
92eb42c69e [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
Merged-In: Ia0d1333c6cbae3a3717c8db6b77fbb9ea8cec968
2019-10-14 05:00:52 +00:00
Antony Sargent
aa88b8cee6 Make EnabledNetworkModePreferenceController listen to setting changes
The controller for the "Preferred network type" preference on the SIM
details page wasn't listening for changes to the underlying global
setting, so changes to the setting would be reflected in SysUI but not
on this page if it happened to be showing.

Bug: 135667565
Test: make RunSettingsRoboTests
Change-Id: I5dfe4843a681c613f49caf4584e9dbebc54e708a
Merged-In: I5dfe4843a681c613f49caf4584e9dbebc54e708a
2019-10-14 04:59:03 +00:00
Luca Stefani
3aa74fe1d0 Make sure close button has proper color
Test: manual, change theme to dark
Change-Id: I9b1c159834c1afcc03a1df33e2ea3b28ce6fc6c0
2019-10-10 10:43:51 +02:00
Fang Li
03bdf907ae Change Wi-Fi Calling text for SFR France
Change Wi-Fi Calling text according to SFR requirement.

Test: Checked that changing name correctly.
Bug: 141255919
Change-Id: I598f9d4a3cbca166fe3449ec425702360a104213
2019-10-04 18:30:27 +09: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
lucaslin
570f7dbc4b Improve the wifi description for the case of private DNS broken
Currently, users don't know if the wifi description shows
"No internet" means it really doesn't have internet access or no
internet is because of private DNS resolution failed. So, Add a
new description for wifi when private DNS is broken.

Bug: 113242081
Test: make -j44 RunSettingsRoboTests \
      ROBOTEST_FILTER=WifiDetailPreferenceControllerTest

Change-Id: I44a7e51cf76dc3f2a6b9583f226af6649f9b1f5f
2019-09-26 15:55:01 +08: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