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

54875 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
SongFerngWang
fae02cf405 RadioInfo network mode list and network mode string add 5G am: dc5149efef 
am: 8cd10f774d

Change-Id: I3d2f8561ebb74cb5bb73ad2cc65b4d0df3454851
 2019-10-14 00:39:02 -07:00
Bonian Chen
ef55302465 [automerger skipped] [Settings] hide preferred network mode UI am: 92eb42c69e 
am: b36ff74ac3 -s ours
am skip reason: change_id Ia0d1333c6cbae3a3717c8db6b77fbb9ea8cec968 with SHA1 128de7bdb6 is in history

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

Change-Id: Ic86a69026cb7db7049519aae4ee0367a13cf4c9a
 2019-10-14 00:38:46 -07: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
SongFerngWang
3146473921 String "CDME" is wrong 
am: dfd9aa99e5

Change-Id: I6d3dab30dbd9282a3a6589efebbf5e08a1359c4a
 2019-10-11 08:16:03 -07:00
SongFerngWang
dfd9aa99e5 String "CDME" is wrong 
Bug: 142376028
Test: build pass
Change-Id: Ifaed6ca8aba8f34ecb27abb863aeaf679132934f
 2019-10-10 20:18:30 +08: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
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
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
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
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
Yi-Ling Chuang
f8eb30800a Fix non responding slice toggling problem. 
The issue happens when users are toggling slices. Sometimes the toggle
doesn't work as expected because the pending intent of the toggle action
seems to be canceled for some reasons.

Hence, we replace FLAG_CANCEL_CURRENT with FLAG_UPDATE_CURRENT to prevent from
getting PendingIntent.CancelExcpetion from SliceActionView when toggling
slices.

Note that this change would only apply on Wifi, MobileData, Flashlight
and Bluetooth Slices.

Bug: 140719905
Test: rebuild and switch toggles
Change-Id: Iddbb16ddcbcf97b6f6e680b43645c04fbc061f39
 2019-10-04 17:17:19 +08: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