Commit Graph

56996 Commits

Author SHA1 Message Date
Chen Xu
b5443d9d45 Merge "move CellBroadcastMessage from telephony-common to app" am: 12a7368ad2 am: 04bcf7ec6c
am: 67f5eb6746

Change-Id: I0c18d41d6a3052585403e24090feb84c8f1a967f
2019-10-25 11:22:08 -07: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
James Mattis
9adf65c943 Merge "Support for hotspot client visibility." 2019-10-25 15:42:39 +00:00
TreeHugger Robot
5f1a837af5 Merge "Add work/personal profile tab for storage page" 2019-10-25 11:02:01 +00:00
Alex Johnston
8ec3dbe1ea Merge "Added a warning dialog when installing a CA certificate" 2019-10-25 09:34:41 +00:00
Raff Tsai
539ab8ace4 Add work/personal profile tab for storage page
- Add ProfileSelectStorageFragment
- Check featureFlag in SecondaryUserController to decide show/hide
workprofile item StorageDashboardFragment

Bug: 141601408
Test: manual
Change-Id: I97762d3b1a4985e2b186b34fc37c7976c2f69224
2019-10-25 16:57:24 +08:00
Aaron Huang
9fd9700a8a Merge "Replace getNetworkPrefixLength() with public API" am: f67076dad5 am: 7b82097220 am: 5b182f20cb
am: 9c39357454

Change-Id: Id0f3c816bb95d891cfb9f0109c0afedb7494f222
2019-10-24 22:55:54 -07:00
Aaron Huang
9c39357454 Merge "Replace getNetworkPrefixLength() with public API" am: f67076dad5 am: 7b82097220
am: 5b182f20cb

Change-Id: Ib6f188586b486fa5af0a8df57a65db654f66e311
2019-10-24 22:49:20 -07:00
TreeHugger Robot
cb62e99093 Merge "Modify Running Services layout" 2019-10-25 05:43:44 +00: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
Josh Hou
ad4895f9db Merge "Fix ViLTE is not available when WiFi Calling is disabled" 2019-10-25 05:40:08 +00: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
TreeHugger Robot
0a2eb3f534 Merge "Unable to adjust cast device's volume" 2019-10-25 04:08:44 +00:00
Raff Tsai
52ee4888be Modify Running Services layout
- Also remove some unused resource

Fixes: 139911198
Test: manual
Change-Id: I70447255df822c5b2a940ecbc3f2fa27707c660b
Screenshot: https://screenshot.googleplex.com/jBEdhunufTb
2019-10-25 10:42:35 +08: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
James Mattis
b16500d595 Support for hotspot client visibility.
Adding support for visibility into clients that connect to an active hotspot.

Bug: 137309578
Test: Tested manually on a Hawk
Change-Id: Ife4bb5ca7bbcf075683cb0a233f2b5716ccd51d9
2019-10-24 17:29:16 -07:00
Alex Johnston
c0c75a3e96 Added a warning dialog when installing a CA certificate
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.
Due to concerns around users installing CA certificates without understanding the conseqences,
this CL introduces a new warning dialog when a CA certificate is installed from settings.

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.

Screenshot of the screen: https://hsv.googleplex.com/5046848484016128

Change-Id: If95bffd1e68f14734fb20e8cc4b60eeb1c372358
2019-10-24 15:25:52 +01: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
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
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
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
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