PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
56,807 Commits 1 Branch 0 Tags
c5e1fc677c3dfb48c33c3861e8a46efe010ad07c
Commit Graph

56807 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
d73b17f24b [automerger skipped] Merge "Merge Coral/Flame into AOSP master" am: e2c2504c94 -s ours am: b8858e1d3f -s ours am: 980b9a285d -s ours 
am: 8f76ec4bde -s ours
am skip reason: change_id I46ad5cff3809191483b48fe292dba220a0d699c6 with SHA1 5eda5a3e7f is in history

Change-Id: I001aa859ea13e908a525df4b5a4b244ba564ad11
 2019-10-27 00:02:10 -07:00
Xin Li
8f76ec4bde [automerger skipped] Merge "Merge Coral/Flame into AOSP master" am: e2c2504c94 -s ours am: b8858e1d3f -s ours 
am: 980b9a285d -s ours
am skip reason: change_id I46ad5cff3809191483b48fe292dba220a0d699c6 with SHA1 5eda5a3e7f is in history

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

Change-Id: I7f8d5e2ba644d96e81db7dd22fe1714a22b0d9f7
 2019-10-26 23:38:17 -07: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
70aff23c40 [automerger skipped] Merge Coral/Flame into AOSP master am: 52bb254eea -s ours am: fef5e325f5 -s ours 
am: 5f29ade8a8 -s ours
am skip reason: change_id I46ad5cff3809191483b48fe292dba220a0d699c6 with SHA1 5eda5a3e7f is in history

Change-Id: Idf45bab3f828ff071f782741bb5773848d9194da
 2019-10-26 23:18:24 -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
f5c9422d18 [automerger skipped] Merge "move CellBroadcastMessage from telephony-common to app" am: 12a7368ad2 am: 04bcf7ec6c am: 67f5eb6746 
am: b5443d9d45 -s ours
am skip reason: change_id Iba5e727fc1a1adaf44a7fa1eebfefe34fa8644aa with SHA1 86a8e9b627 is in history

Change-Id: I1a424edad11cbbeb87f6f4da9d50cefea4960bce
 2019-10-25 11:34:47 -07:00
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