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

54272 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jack Yu
eebac038d7 Merge "Change Wi-Fi Calling text for SFR France" am: 49358c53b2 
am: 7ddc969d3a

Change-Id: I4e8175f75c8f03a065a3c85dad516c9f15e14e7e
 2019-10-27 00:44:24 -07:00
Jack Yu
7ddc969d3a Merge "Change Wi-Fi Calling text for SFR France" 
am: 49358c53b2

Change-Id: Iaa58ec348cd836adfb20eedc38787934bc76d0df
 2019-10-27 00:37:24 -07:00
Jack Yu
49358c53b2 Merge "Change Wi-Fi Calling text for SFR France" 2019-10-27 07:20:47 +00:00
Xin Li
980b9a285d [automerger skipped] Merge "Merge Coral/Flame into AOSP master" am: e2c2504c94 -s ours 
am: b8858e1d3f -s ours
am skip reason: change_id I46ad5cff3809191483b48fe292dba220a0d699c6 with SHA1 5eda5a3e7f is in history

Change-Id: Ie2ee68c13325785c67a3bd484b6e658d51745873
 2019-10-26 23:23:40 -07:00
Xin Li
b8858e1d3f [automerger skipped] Merge "Merge Coral/Flame into AOSP master" 
am: e2c2504c94 -s ours
am skip reason: change_id I46ad5cff3809191483b48fe292dba220a0d699c6 with SHA1 5eda5a3e7f is in history

Change-Id: Ifc67e1652cb46474a16c6383cec2d81ca6e424d3
 2019-10-26 23:18:01 -07:00
Xin Li
5f29ade8a8 [automerger skipped] Merge Coral/Flame into AOSP master am: 52bb254eea -s ours 
am: fef5e325f5 -s ours
am skip reason: change_id I46ad5cff3809191483b48fe292dba220a0d699c6 with SHA1 5eda5a3e7f is in history

Change-Id: I2ac9b7a9cca2ef288a0918e9f1361b0309faee72
 2019-10-26 22:53:14 -07:00
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
67f5eb6746 Merge "move CellBroadcastMessage from telephony-common to app" am: 12a7368ad2 
am: 04bcf7ec6c

Change-Id: I4cb440a59d5f6de5815b8ee942b3f29d2a770d4b
 2019-10-25 11:09:18 -07: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
5b182f20cb Merge "Replace getNetworkPrefixLength() with public API" am: f67076dad5 
am: 7b82097220

Change-Id: I0e948700ba76f81db98628f35313dd11ff45df98
 2019-10-24 22:42:42 -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
9dbbf88d14 Merge "Skip loading contextual cards if legacy cards are used" am: c53771e80a 
am: 81e9c58691

Change-Id: I09b7f37f094c24144b0448f2e7f820cffd5ddadd
 2019-10-24 18:58:01 -07: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
9b29332cd3 Merge "Improve the wifi description for the case of private DNS broken" am: 37b17ae752 
am: 5eda5a3e7f

Change-Id: Idd568b71dab954a6b018594e15d3f695ea2aeac2
 2019-10-23 03:07:20 -07: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
Niclas Rokicki
f72fb5a049 Merge "translate="false" -> translatable="false"" am: b333e79df9 
am: 90f0230b54

Change-Id: Iad740a41439b112ffaff528ac74fccee7eb64150
 2019-10-22 09:48:57 -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
32f4f10d4a Merge "Move Emergency call button" am: 2501f6e268 
am: 251411674b

Change-Id: I97e20041d520f2795affe8c66e1d12e16ec5cfde
 2019-10-18 01:55:53 -07: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
f35dddaef5 Merge "Make sure close button has proper color" am: 0f9ad6d7f9 
am: 2bb6e54317

Change-Id: Iec6c4ec81a1be8f1635683a613fbde10c5dc1210
 2019-10-15 11:02:23 -07:00
Xin Li
c789e737f8 DO NOT MERGE - Merge QD1A.190821.011 into stage-aosp-master 
am: acfebe21ac

Change-Id: Ic67eed1985854f82ea33c59d88589cad46deda29
 2019-10-15 10:11:14 -07: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
9507e5f2f9 Merge changes Ifaed6ca8,I4a78e2e7,I945d3c2f,Ia0d1333c,I5dfe4843 am: bc6a65ca32 
am: 951e9b7742

Change-Id: Ifa44c34f2653e6e1146a9a6337f411761cc1ce17
 2019-10-14 00:39:16 -07:00
SongFerngWang
24b3051e9b Preferred network list add 5G item am: 76422cab68 
am: 10d41f52b7

Change-Id: I3356ff24d7d8669aae438bdccab9bccce5d3e295
 2019-10-14 00:39:09 -07:00
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