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

54856 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Lucas Lin
06b7986eff Merge "Improve the wifi description for the case of private DNS broken" am: 37b17ae752 am: 5eda5a3e7f 
am: 9b29332cd3

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

Change-Id: I75dcf19b087d98eb328a33138daecd7bd25b5d1a
 2019-10-22 09:56:02 -07: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
Bill Yi
e127092dfd [automerger skipped] Import translations. DO NOT MERGE 
am: 476d82715a -s ours
am skip reason: subject contains skip directive

Change-Id: I22006097e4ff21843030e9bac2138c9d2c5b56f3
 2019-10-19 04:56:30 -07:00
Bill Yi
476d82715a Import translations. DO NOT MERGE 
Change-Id: I0d35ecce542fee9f4f6367d2a11a4cca2d4b4b60
Auto-generated-cl: translation import
 2019-10-19 00:50:29 -07:00
Anamika Singh
c455762580 Merge "Move Emergency call button" am: 2501f6e268 am: 251411674b 
am: 32f4f10d4a

Change-Id: I5457a7f278db3a87a22696d0a698a5aaf861e148
 2019-10-18 02:01:54 -07: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
Yi-Ling Chuang
e87289bbc4 Merge "Fix non responding slice toggling problem." into qt-qpr1-dev 
am: 5956f903cb

Change-Id: I2235eeb55d9ebcaaac399956d854471779c23b31
 2019-10-16 21:09:58 -07:00
TreeHugger Robot
5956f903cb Merge "Fix non responding slice toggling problem." into qt-qpr1-dev 2019-10-17 01:32:14 +00:00
Raff Tsai
3e8a86910c Merge "Make sure close button has proper color" am: 0f9ad6d7f9 am: 2bb6e54317 
am: f35dddaef5

Change-Id: Ie3330395e2c214b56b92cc44ae464ad7d2f48425
 2019-10-15 11:36:40 -07: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
9a65c35a9f DO NOT MERGE - Merge QD1A.190821.011 into stage-aosp-master am: acfebe21ac 
am: c789e737f8

Change-Id: I0dc7cbba09c4e1405c61e68442a43fe4d703bf0a
 2019-10-15 10:30:34 -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
dfc67693f5 [automerger skipped] Merge changes Ifaed6ca8,I4a78e2e7,I945d3c2f,Ia0d1333c,I5dfe4843 am: bc6a65ca32 am: 951e9b7742 
am: 9507e5f2f9 -s ours
am skip reason: change_id Ifaed6ca8aba8f34ecb27abb863aeaf679132934f with SHA1 dfd9aa99e5 is in history

Change-Id: I8f79a9268e0ccef959e3802406b22cffb86a8f0e
 2019-10-14 00:45:38 -07:00
SongFerngWang
1c976be2a7 [automerger skipped] Preferred network list add 5G item am: 76422cab68 am: 10d41f52b7 
am: 24b3051e9b -s ours
am skip reason: change_id I4a78e2e7fbb067ce841df4aaf1d5161607fdcf90 with SHA1 dd7f9b57f6 is in history

Change-Id: I2c6e54c59018227081f896beef1fca68dc7fa322
 2019-10-14 00:45:30 -07:00
SongFerngWang
35abbc425c [automerger skipped] RadioInfo network mode list and network mode string add 5G am: dc5149efef am: 8cd10f774d 
am: fae02cf405 -s ours
am skip reason: change_id I945d3c2fd175f45151bbeee475e388ccc2d67642 with SHA1 ec384c2f6f is in history

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

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

Change-Id: I5a90bf84d360c22f21e0fc830f480e9c7fb11d01
 2019-10-14 00:45:06 -07: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
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