Android/packages_apps_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
54,213 Commits 1 Branch 0 Tags
def3e9f734dc73bd737d881752a1763dc2751683
Commit Graph

54213 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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
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
Bill Yi
500e7b2b71 Import translations. DO NOT MERGE 
Change-Id: I0f9786915ebc5c168487e7a5386d4f2060d27a12
Auto-generated-cl: translation import
 2019-09-24 18:54:26 -07:00
Felipe Leon
e42ab42c5c Settings: fix apn_editor carrier_enabled summaryOff string 
Change-Id: I44ccec73601806dc8facad122f1ab16ff3aca484
Signed-off-by: Felipe Leon <fglfgl27@gmail.com>
 2019-09-25 00:43:17 +03:00
Daniel Huang
f28625bcf1 Merge "In sim1 APN settings interface and hot plug out/in sim2, APN information change to sim2's" 
am: 51cb777530

Change-Id: I7d6675734eed90cbfb0ccda46c047883e460962f
 2019-09-24 02:32:29 -07:00
Daniel Huang
51cb777530 Merge "In sim1 APN settings interface and hot plug out/in sim2, APN information change to sim2's" 2019-09-24 09:21:51 +00:00
Yi-Ling Chuang
8d8c3e19b5 Merge "Enable dismissal feature on legacy suggestions." 
am: ee39335edc

Change-Id: Ibce2403de032bd3d7fce750f6cd80191a8b14441
 2019-09-22 20:03:21 -07:00
Treehugger Robot
ee39335edc Merge "Enable dismissal feature on legacy suggestions." 2019-09-23 02:45:25 +00:00
Yi-Ling Chuang
83ac0efd81 Enable dismissal feature on legacy suggestions. 
Add back the close button for legacy suggestions.

Fixes: 140786274
Test: robotest
Change-Id: Iaf0376bd482db4c4ff7d04a68131071c29c01ced
 2019-09-20 18:03:10 -07:00
苗苗 (Miao Miao)
9f4a65c893 In sim1 APN settings interface and hot plug out/in sim2, APN information change to sim2's 
STEPS TO REPRODUCE:
1. Insert two sim into device, sim1 is CUCC, sim2 is CMCC
2. Goto Settings-Network & Internet-sim1-MobileNetworkSettings-Access Point Names. It shows CUCC APN information
3. Hot plug out sim2
4. Hot plug in sim2, APN information changes to CMCC APN information

EXPECTED RESULTS:
When hot plug out/in sim2, sim1 APN settings interface should still keep its APN information instead of changing to sim2 APN information

Change-Id: I04c769f60ba1686b2c9bebcd07e3a04685979442
Bug: 141087659
Test:In sim1 APN settings interface, hot plug out/in sim2, it shows sim1 APN information all the time, test pass.
 2019-09-20 18:13:30 +08:00
Neil Fuller
b83ddefb5c Merge "Remove use of deprecated Time class" 
am: b3f8696c4d

Change-Id: Ie6dcfcde7ec223ed83b2d8d33f059924e3a566e9
 2019-09-17 09:56:45 -07:00
Treehugger Robot
b3f8696c4d Merge "Remove use of deprecated Time class" 2019-09-17 16:32:47 +00:00
Neil Fuller
4c77d00e34 Remove use of deprecated Time class 
Remove a use of the deprecated Time class.

Bug: 16550209
Test: treehugger only
Change-Id: If97b0d8ea78a76d613652ab623c3a48f5aa9aabb
 2019-09-17 13:53:17 +01:00
paulhu
52d24750a4 [Settings] Replace CONNECTIVITY_INTERNAL to TETHER_PRIVILEGED 
Settings is using CONNECTIVITY_INTERNAL to restrict launching
tether provisoning activity by provioning apps only. However,
CONNECTIVITY_INTERNAL will be deprecated from Android R, replace
the permission to TETHER_PRIVILEGED.

Bug: 32963470
Test: atest TetherServiceTest
Change-Id: I4c8312b92de8d5d9c9090c572e54622dc4fcf9d4
 2019-09-12 17:21:43 +08:00
Xin Li
aac7f8e2cd Merge qt-r1-dev-plus-aosp-without-vendor (5817612) into stage-aosp-master 
Bug: 135460123
Change-Id: Ifbb4b45d2d592e4a4ede265d2c882dc1cb4a0410
Merged-In: Idcc078c0e541c04633db6d94c613ac4c861ba963
 2019-09-08 13:06:57 -07:00
Taesu Lee
39e4fbb746 Fix to show eUICC preference in eng build 
DEVELOPMENT_SETTINGS_ENABLED is not set before entering Developer
options in settings app even if it is in eng build. To show eUICC
preference in eng build, uses isDevelopmentSettingsEnabled() instead.

Test: Manual and make RunSettingsRoboTests

Change-Id: Ia1f46fad94bc62ca48dcfef7cd5d6188766aa380
Signed-off-by: Taesu Lee <taesu82.lee@samsung.com>
 2019-09-06 16:11:39 +09:00
Xin Li
d7a8e234e9 Merge "DO NOT MERGE - Merge Android 10 into master" 2019-09-05 16:53:18 +00:00
Xin Li
7195e05dfa DO NOT MERGE - Merge Android 10 into master 
Bug: 139893257
Change-Id: Idcc078c0e541c04633db6d94c613ac4c861ba963
 2019-09-04 13:34:43 -07:00
android-build-team Robot
18be91ff36 Merge cherrypicks of [9276111, 9276209, 9275845, 9276210, 9276238, 9276239, 9276211, 9276212, 9276240] into qt-c2f2-release 
Change-Id: I45413bfa9c192aacfcf992a9767d7e6cecf66181
 2019-08-27 01:42:59 +00:00
Bonian Chen
f4e50520fe [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
(cherry picked from commit 128de7bdb6)
 2019-08-27 01:42:17 +00:00
Xin Li
bd8030e8b2 DO NOT MERGE - Merge build QP1A.190711.019 into stage-aosp-master 
Bug: 139893257
Change-Id: I54b340294458df6016b7893838e1b0f6e61daf11
 2019-08-23 06:45:17 +00:00
Xin Li
f92905cfe9 DO NOT MERGE - Merge build QP1A.190711.001 into stage-aosp-master history 
Bug: 139893257
Change-Id: Iff267db7ff7312a786dc5004a7421b395da178a9
 2019-08-23 06:42:10 +00:00
android-build-team Robot
620240f004 Snap for 5821701 from 91ca872a44 to qt-c2f2-release 
Change-Id: If14ef067b6b999603c017ab2cf810aeb4e284a86
 2019-08-22 03:26:47 +00:00
Bill Yi
91ca872a44 Import translations. DO NOT MERGE 
Auto-generated-cl: translation import

Bug: 64712476
Change-Id: Ia404cdb510ff6c09446362da5ca1738f20bcc9fe
 2019-08-21 12:57:11 -07:00
android-build-team Robot
c394b203d8 Snap for 5817401 from ba8880dd87 to qt-c2f2-release 
Change-Id: I9400648d5201ea6660831752332011338a392a66
 2019-08-21 02:19:37 +00:00
Bill Yi
d9c4bdf4fb [automerger skipped] Import translations. DO NOT MERGE 
am: ba8880dd87 -s ours
am skip reason: subject contains skip directive

Change-Id: Ic0805579cd91f4ec10fb11c34dfe3ca652a43f50
 2019-08-20 13:36:38 -07:00
Bill Yi
ba8880dd87 Import translations. DO NOT MERGE 
Auto-generated-cl: translation import

Bug: 139484065
Change-Id: I6c50b4480bec5326951eb809eabc7194d1d06b65
 2019-08-20 18:39:09 +00:00
Kevin Chyn
645480a4e4 Merge "Remove attention controller" into qt-r1-dev 
am: 41aafab963

Change-Id: I31966ea8f672f664a4d1feae8be30eb47d0a2d32
 2019-08-19 19:57:37 -07:00
android-build-team Robot
63a13925a5 Merge cherrypicks of [9231374, 9231389, 9231390, 9231391, 9231375, 9231286, 9231355, 9231376, 9231420, 9231462, 9231356, 9231421, 9231422, 9231402, 9231537, 9231557, 9231440, 9231441, 9231287, 9231288, 9231463, 9231464, 9231465, 9231423, 9231289, 9231392, 9230416, 9231466] into qt-c2f2-release 
Change-Id: I06a53fb0bfdb3588367768bd06aaaa8a6f94b83d
 2019-08-20 02:44:02 +00:00
Kevin Chyn
e3213d4b79 Remove delay from enroll start button 
Fixes: 139554930

Test: manual, button no longer delayed
Change-Id: I365308c2a00c122b80f70c904d11bb4a5d6cf404
Merged-in: I365308c2a00c122b80f70c904d11bb4a5d6cf404
(cherry picked from commit 058af41a42)
 2019-08-20 02:41:31 +00:00
TreeHugger Robot
41aafab963 Merge "Remove attention controller" into qt-r1-dev 2019-08-20 02:37:20 +00:00
Kevin Chyn
d1e331dbcd Merge "Remove delay from enroll start button" into qt-r1-dev 
am: ca2bbdfeca

Change-Id: Ide066e65d76c70175ade9ebeaf94e471cb11c806
 2019-08-19 15:09:00 -07:00
Kevin Chyn
ca2bbdfeca Merge "Remove delay from enroll start button" into qt-r1-dev 2019-08-19 21:50:22 +00:00
android-build-team Robot
25144933f8 Snap for 5811895 from 7892f729a5 to qt-c2f2-release 
Change-Id: I0540ce5f28f36beeca6c68c07277dac43a4fc8af
 2019-08-19 00:45:02 +00:00
Bill Yi
978cd2b768 [automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-r1-dev 
am: 7892f729a5 -s ours
am skip reason: subject contains skip directive

Change-Id: Ia2280686d74a66951529c333f5c7e6a05d989208
 2019-08-17 09:45:16 -07:00
TreeHugger Robot
7892f729a5 Merge "Import translations. DO NOT MERGE" into qt-r1-dev 2019-08-17 16:30:21 +00:00
Arc Wang
0e53b6293d Merge "[Wi-Fi] Fix multi SIM devices switch to mobile data automatically settings missing problem" into qt-r1-dev 
am: 54dbed859d

Change-Id: I0d5071d429dbd82d420e1199bd5baed0b687e2ae
 2019-08-17 07:18:03 -07:00
TreeHugger Robot
54dbed859d Merge "[Wi-Fi] Fix multi SIM devices switch to mobile data automatically settings missing problem" into qt-r1-dev 2019-08-17 13:58:53 +00:00
Bill Yi
0bb9d1e153 Import translations. DO NOT MERGE 
Auto-generated-cl: translation import

Bug: 64712476
Change-Id: Ie3771d039d46900090a8a4f58f325b9a5eb29e0a
 2019-08-17 01:35:46 -07:00
Kevin Chyn
058af41a42 Remove delay from enroll start button 
Fixes: 139554930

Test: manual, button no longer delayed
Change-Id: I365308c2a00c122b80f70c904d11bb4a5d6cf404
Merged-in: I365308c2a00c122b80f70c904d11bb4a5d6cf404
 2019-08-17 04:52:30 +00:00
Kevin Chyn
ddd4fb660e Merge "Update attention string" into qt-r1-dev 
am: e218dc0517

Change-Id: Id6f6bb10ef8a9bcb96e03da291df3f054bda5f32
 2019-08-16 19:43:00 -07:00
Kevin Chyn
e218dc0517 Merge "Update attention string" into qt-r1-dev 2019-08-17 02:01:31 +00:00
Arc Wang
91200e610d [Wi-Fi] Fix multi SIM devices switch to mobile data automatically settings missing problem 
Context#getResources loading is done based on the last SIM to
come up, we may get wrong customization settings.

This fix check the setting of active subscription and shows the preference.

Bug: 138956509
Test: CellularFallbackPreferenceControllerTest
      manual test:
          1. Insert feature supported SIM and check UI.
          2. Remove feature supported SIM and check UI.
          3. Turn airplane mode on and check 1. and 2..

Change-Id: I72b6db415429181395a02f163889bb1b9c0f070f
Merged-In: I72b6db415429181395a02f163889bb1b9c0f070f
 2019-08-17 01:37:21 +00:00
Kevin Chyn
8e1d1ca3ab Remove attention controller 
Bug: 139484065

Test: manual
Change-Id: Ideed761c978ba0831b04ed2cc294e9655dddb01c
 2019-08-16 16:34:09 -07:00
Kevin Chyn
821fbc83a1 Update attention string 
Bug: 139484065

Test: manual
Change-Id: Ie4619fb51709ba2651866b7841dd4d6b51f165d1
 2019-08-16 16:34:09 -07:00