Commit Graph

56672 Commits

Author SHA1 Message Date
Josh Hou
ad4895f9db Merge "Fix ViLTE is not available when WiFi Calling is disabled" 2019-10-25 05:40:08 +00:00
TreeHugger Robot
0a2eb3f534 Merge "Unable to adjust cast device's volume" 2019-10-25 04:08:44 +00:00
Raff Tsai
138fcb715d Merge "Skip loading contextual cards if legacy cards are used" am: c53771e80a am: 81e9c58691 am: 9dbbf88d14
am: 6f99052cbc

Change-Id: Ie582c8628b267c26de965d6c990a3998e6f6d277
2019-10-24 19:13:56 -07:00
Raff Tsai
6f99052cbc Merge "Skip loading contextual cards if legacy cards are used" am: c53771e80a am: 81e9c58691
am: 9dbbf88d14

Change-Id: I52f7724fc50af20888d31821dc56732186a07c84
2019-10-24 19:08:08 -07:00
timhypeng
b2297dcdf9 Unable to adjust cast device's volume
- Update slider UI when receiving volume changed
- Do not create an infinite message loop

Bug: 143262277
Test: make -j42 RunSettingsRoboTests
Change-Id: If83a97cfce8b90c2eda7d55389775222bfc6bba0
2019-10-25 10:05:09 +08: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
Alex Johnston
8ed2568882 Merge "Added functionality to select type of certificate to be installed from the Settings app" 2019-10-24 11:35:24 +00:00
Josh Hou
c101faeb2b Fix ViLTE is not available when WiFi Calling is disabled
Bug: 141831293
Test: 1. Set carrier config carrier_wfc_ims_available_bool to false,
then verify Wi-Fi calling option is not shown.
      2. Set carrier config carrier_vt_available_bool to false, then
      verify video calling option is not shown.
      3. Set both carrier_wfc_ims_available_bool and
      carrier_vt_available_bool to false, then verify calling category
      is not shown.

Change-Id: Ibec13fbeb5acf1d62342286687b2ba969beb4e14
2019-10-24 18:25:37 +08:00
Alex Johnston
7659e53a94 Added functionality to select type of certificate to be installed from the Settings app
This is part of the changes to improve the UX and language for installing certificates.
Previously, the different types of certificate used the same installation flow. This CL
introduces a new settings page, where the type of certificate to be installed can be selected.

Bug: 139173976
Test: Atest com.android.settings.security
      manual testing from Settings by selecting the certificate type
	preference and ensuring the installation flow still worked as expected.

Change-Id: Iea7c91aa3801e429f0e22d29469958f4151b3cba
2019-10-24 10:37:21 +01:00
TreeHugger Robot
c6decc2d08 Merge "Fix runtime exception when cachedDevice is null" 2019-10-24 09:15:38 +00:00
Jason Chiu
d0fa488304 Fix the inverted logic of indexing injected entries
The if statement was misplaced while changing the coding style in
previous CL.

Bug: 132812768
Test: manual
Change-Id: I01a2494bf8103c806ec9b3cbd1ff9f8b8c01aebe
2019-10-24 15:41:51 +08:00
TreeHugger Robot
a0e9852083 Merge "Use a regular drawable as ConnectedDeviceDashboardActivity icon" 2019-10-24 06:41:17 +00:00
hughchen
d368c21832 Fix runtime exception when cachedDevice is null
Finish the activity after call super.onAttach().

Bug: 143187915
Test: make -j42 RunSettingsRoboTests
Change-Id: I8f205ef60797bd9eb96617d413f554613008f65b
2019-10-24 14:36:37 +08:00
TreeHugger Robot
578990ec7e Merge "Fix robolectric test error" 2019-10-24 03:52:56 +00:00
Raff Tsai
db0951b02c Fix robolectric test error
Bug: 143216191
Test: make RunSettingsRoboTests
Change-Id: Ia6015b333f34ebf994cce176d9bd45ec1ce3f5cb
2019-10-24 10:42:42 +08:00
Raff Tsai
5b4f01e4b2 Merge "Fix feature flag page animation" 2019-10-23 17:52:52 +00:00
Raff Tsai
b3b6236e64 Fix feature flag page animation
- Move add preference code to displayPreference()

Fixes: 143192095
Test: manual
Change-Id: Ib735ecd11fec6a3d45c9743577ea309755d6b010
2019-10-24 00:26:02 +08:00
Lucas Lin
cf596519cb Merge "Improve the wifi description for the case of private DNS broken" am: 37b17ae752 am: 5eda5a3e7f am: 9b29332cd3
am: 06b7986eff

Change-Id: I7b73ebcefba1df293595d38069a06d5ac0b260b5
2019-10-23 03:27:11 -07:00
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
Goven Liu
66bd88c9cd Merge "[Wi-Fi] Update "Factory MAC" to "Device MAC" in strings." 2019-10-23 10:16:44 +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
hughchen
02b116edcc Use a regular drawable as ConnectedDeviceDashboardActivity icon
Bug: 142629154
Test: rebuild
Change-Id: Idbce03dac48892003e10e3ecda497c33855c6c48
2019-10-23 11:55:49 +08:00
Raff Tsai
96635d9fb3 Use Resources.getDrawable(int, Theme)
- Resources.getDrawable(int) is deprecated. Use new function to replace
the old one.

Fixes: 143078105
Test: manual
Change-Id: Ieea5b415d1a771b253401d826bfdb9d9a26f5ff2
2019-10-23 11:34:18 +08:00
govenliu
6a9afea52e [Wi-Fi] Update "Factory MAC" to "Device MAC" in strings.
As a follow-up to b/133466540, we should change "Factory MAC" to "Device MAC" in the strings to align with the language that we used for Q.

Sol: change the string naming.

Bug: 143151237
Test: Manual visual test to check if the strings changed correctly or not.
Change-Id: I0bba14d12d5d0ab2fa0c137e4576dd46878df031
2019-10-23 10:23:35 +08:00
Raff Tsai
062baadf4e Merge "Add personal/work tab for ManageApplications" 2019-10-22 23:47:32 +00:00
Niclas Rokicki
864177101d Merge "translate="false" -> translatable="false"" am: b333e79df9 am: 90f0230b54 am: f72fb5a049
am: fb084bcee8

Change-Id: Id7e001c2e400366d4cb48c1a4f7835f4c9a0f95b
2019-10-22 10:03:17 -07: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
Raff Tsai
968999416e Merge "Make injected entries searchable" 2019-10-22 09:35:36 +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
TreeHugger Robot
a7485f40b9 Merge "Fix non responding slice toggling" 2019-10-22 06:47:48 +00:00
Bonian Chen
c0025dcb18 Merge "[Settings] Remove unused SimPreferenceDialog" 2019-10-22 01:56:29 +00:00
Arc Wang
8eda6847f4 [Wi-Fi] Release the camera before opening
As per the Google's design mentioned at
https://developer.android.com/training/camera/cameradirect.html
Calling Camera.open() throws an exception
if the camera is already in use by another application,
so we wrap it in a try block one must release the camera before opening

Bug: 141662635
Test: Manual occurs once while testing 10 times
1.Open wifi settings,tap QR code icon
2.Make a incoming VoLTE call,tap incoming VoLTE call dialog
3.Check device
Signed-off-by: JeiFeng Lee <linger.lee@mediatek.com>

Change-Id: Ief62600af8b745cb4eae2e5ae277a2cebdda68eb
2019-10-21 15:38:41 +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
Bonian Chen
3b8d0faeed [Settings] Remove unused SimPreferenceDialog
Remove unused SimPreferenceDialog

Bug: 143018062
Test: build pass
Change-Id: Ia1b9d64a7956c8fe326d7df7635c7910cfd09951
2019-10-20 22:56:32 +08:00
Bonian Chen
d038372568 Merge "[Setting] Cleanup Unused SimSettings" 2019-10-20 13:16:29 +00:00
Bonian Chen
5cc9aad7a8 [Setting] Cleanup Unused SimSettings
There's no entry to access SimSettings.
Remove this unused UI.

Bug: 131324863
Test: manual
Change-Id: I3f50e528eb409215371a125184502d3531bad0a8
2019-10-20 09:01:30 +00:00
Bill Yi
bf071e3f39 [automerger skipped] Import translations. DO NOT MERGE am: 476d82715a -s ours
am: e127092dfd -s ours
am skip reason: subject contains skip directive

Change-Id: I6dfac82dc352d47356ae02d636f6c3a54555a6ae
2019-10-19 05:07:15 -07: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
Arc Wang
f709d7fdc2 Merge "[Wi-Fi] Updates internal AccessPoint list upon onAccessPointsChanged" 2019-10-19 11:05:26 +00: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
Raff Tsai
d041c32e5e Make injected entries searchable
Add a injected item in queryDynamicRawData. SettingsIntelligence will
query this method in query time.

Fixes: 132812768
Test: manual
Change-Id: I4e2f56e86537930e3102280f7e8dc7691ea1ec4e
2019-10-19 07:53:49 +08:00
Arc Wang
be55640ae3 [Wi-Fi] Updates internal AccessPoint list upon onAccessPointsChanged
Updating access point list requires WifiTracker's AccessPoints and
WifiNetworkFactory's matching scan results. When WifiNetworkFactory
sends the matching scan results to NetworkRequestDialogFragment, if
WifiTracker still does not receive scan results, UI will not be
updated.
This CL is to update internal AccessPoint list from WifiTracker
upon onAccessPointsChanged callback to reflect results properly.

Bug: 140600730
Test: manual, robotests
Change-Id: I0f9814821b3d56f3c55f1e6419c8b7a03b03589e
Signed-off-by: Daichi Ueura <daichi.ueura@sony.com>
2019-10-18 18:09:19 +08:00
Anamika Singh
d2cbfa2dee Merge "Move Emergency call button" am: 2501f6e268 am: 251411674b am: 32f4f10d4a
am: c455762580

Change-Id: I70e9fd65f94257d7ab2a254a8b2d703df5e2031b
2019-10-18 02:08:58 -07:00