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

54979 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Xin Li
fef5e325f5 [automerger skipped] Merge Coral/Flame into AOSP master 
am: 52bb254eea -s ours
am skip reason: change_id I46ad5cff3809191483b48fe292dba220a0d699c6 with SHA1 5eda5a3e7f is in history

Change-Id: Ida1ac569c9fce2eebfbec2797378ac297389f53c
 2019-10-26 22:34:20 -07:00
Xin Li
e2c2504c94 Merge "Merge Coral/Flame into AOSP master" 2019-10-27 04:44:30 +00:00
Chen Xu
04bcf7ec6c Merge "move CellBroadcastMessage from telephony-common to app" 
am: 12a7368ad2

Change-Id: Idf2a9f4fd6c184a9aebef3e2e9298fcaeeecc9da
 2019-10-25 10:44:44 -07:00
Chen Xu
12a7368ad2 Merge "move CellBroadcastMessage from telephony-common to app" 2019-10-25 17:28:22 +00:00
Xin Li
52bb254eea Merge Coral/Flame into AOSP master 
Bug: 141248619
Change-Id: I3850f512dadd5e2c6d51af3c8abab1fa5dbc86ad
Merged-In: I46ad5cff3809191483b48fe292dba220a0d699c6
 2019-10-25 10:28:05 -07:00
Aaron Huang
7b82097220 Merge "Replace getNetworkPrefixLength() with public API" 
am: f67076dad5

Change-Id: Id37dd5521b1f95f7431d63e18dea3f8cc2b80eee
 2019-10-24 22:36:15 -07:00
Aaron Huang
f67076dad5 Merge "Replace getNetworkPrefixLength() with public API" 2019-10-25 05:15:16 +00:00
Raff Tsai
81e9c58691 Merge "Skip loading contextual cards if legacy cards are used" 
am: c53771e80a

Change-Id: Idae5d4948edc9767afae23f2fcbbd522410654b5
 2019-10-24 18:51:50 -07:00
Raff Tsai
c53771e80a Merge "Skip loading contextual cards if legacy cards are used" 2019-10-25 01:35:20 +00:00
Aaron Huang
9251280615 Replace getNetworkPrefixLength() with public API 
Use public API getPrefixLength() instead

Test: build pass

Change-Id: Ib85aa12dc22ac5b03c9bb7101beaf340014eb4fd
 2019-10-24 10:51:53 +00:00
Lucas Lin
5eda5a3e7f Merge "Improve the wifi description for the case of private DNS broken" 
am: 37b17ae752

Change-Id: I46ad5cff3809191483b48fe292dba220a0d699c6
 2019-10-23 02:52:01 -07:00
Lucas Lin
37b17ae752 Merge "Improve the wifi description for the case of private DNS broken" 2019-10-23 09:20:09 +00:00
Rahul Sabnis
c96469f2bd Refactor usages of getAliasName to use getAlias in Settings 
Bug: 142352567
Test: Manual
Change-Id: I40af1b1e0453900fd888317ae46b20ef359db473
 2019-10-22 15:34:40 -07:00
Niclas Rokicki
90f0230b54 Merge "translate="false" -> translatable="false"" 
am: b333e79df9

Change-Id: I3955c9f03c741efa86fcf03baafea81d7073d5ef
 2019-10-22 09:41:58 -07:00
Treehugger Robot
b333e79df9 Merge "translate="false" -> translatable="false"" 2019-10-22 16:29:50 +00:00
Niclas Rokicki
af548beaea translate="false" -> translatable="false" 
Fixed a typo related to String translation

Bug: 142888682
Test: Manual
Change-Id: I86fd2d9a4c5b085679ed627c7ecb7578da168ced
 2019-10-22 16:30:02 +08:00
Daniel Hunt
dfd5e4fed5 Skip loading contextual cards if legacy cards are used 
This stops a jarring animation that occurs when returning to the
settings top level when legacy contextual cards are enabled and
shown at the top of the top level list,

Bug: 142936956
Test: Manual
Change-Id: I43605adf6f1bf63cc40157ac97c8e3295dd3cd99
 2019-10-20 15:46:39 +00:00
Chen Xu
24a72eb92a move CellBroadcastMessage from telephony-common to app 
1. add slotIndex in SmsCbMesage(cellbroadcast can be received
when sim is absent)
2. move cellbroadcastMessage from telephony-common to app
next step, considering merging CellBroadcast to SmsCbMessage

Bug: 135956699
Bug: 141962867
Test: build & unit test
Change-Id: Iba5e727fc1a1adaf44a7fa1eebfefe34fa8644aa
(cherry picked from commit 86a8e9b627)
Merged-in: Iba5e727fc1a1adaf44a7fa1eebfefe34fa8644aa
 2019-10-20 04:05:06 +00:00
Anamika Singh
251411674b Merge "Move Emergency call button" 
am: 2501f6e268

Change-Id: Ie687f4b03f7ebf572057dca6678ac4d70666f76f
 2019-10-18 01:49:54 -07:00
Treehugger Robot
2501f6e268 Merge "Move Emergency call button" 2019-10-18 08:37:39 +00:00
Raff Tsai
2bb6e54317 Merge "Make sure close button has proper color" 
am: 0f9ad6d7f9

Change-Id: I3f785f159c9b0e46a293acb8656eb47c9b6e4550
 2019-10-15 03:32:29 -07:00
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