Android/packages_apps_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
63,917 Commits 1 Branch 0 Tags
489cec0e1d75a6ed2b111f01ac0a9a22abf5c63e
Commit Graph

31228 Commits

Author SHA1 Message Date
Bonian Chen
8dfb729ceb Merge "[Settings] Code Refactor" into rvc-dev am: 0d3732a595 am: 5d88416ee0 am: ac48e7c606 am: fa41f98986 
Change-Id: I2a94611959bf373ab2a048599a50ed5a1ecf096a
 2020-04-01 17:07:27 +00:00
Bonian Chen
ac48e7c606 Merge "[Settings] Code Refactor" into rvc-dev am: 0d3732a595 am: 5d88416ee0 
Change-Id: Id9ee5713de1bb803ae74cf43e2bc2d7b3f3d8803
 2020-04-01 16:33:59 +00:00
Bonian Chen
0d3732a595 Merge "[Settings] Code Refactor" into rvc-dev 2020-04-01 16:07:47 +00:00
Bonian Chen
1a8b0b3db2 Merge "[Settings] Avoid from crash when pull out SIM" into rvc-dev am: cfbdcaf9f5 am: 98f1a405c6 am: 3f6f4e44e0 am: 41bc6897c1 
Change-Id: Ia08496a45987db0d553f0d2cc4b0aaecd650857a
 2020-04-01 08:05:48 +00:00
Bonian Chen
3f6f4e44e0 Merge "[Settings] Avoid from crash when pull out SIM" into rvc-dev am: cfbdcaf9f5 am: 98f1a405c6 
Change-Id: Ic20177035e6902b8d55c52baa039f540bdd574ac
 2020-04-01 07:29:24 +00:00
Bonian Chen
bd03b17a62 [Settings] Avoid from crash when pull out SIM 
Avoid from crash through exception handling.

Bug: 148803073
Test: m RunSettingsRoboTests -j
ROBOTEST_FILTER=WifiCallingSettingsForSubTest
Test: m RunSettingsRoboTests -j
ROBOTEST_FILTER=WifiCallingPreferenceControllerTest
Test: m RunSettingsRoboTests -j
ROBOTEST_FILTER=WifiCallingSettingsTest
Test: m RunSettingsRoboTests -j
ROBOTEST_FILTER=WifiCallingSliceHelperTest

Change-Id: I10aff50b6f3fc50b2f336ee320740f9f4a81e256
 2020-04-01 12:05:38 +08:00
Bonian Chen
39ff4e4495 [Settings] Code Refactor 
1. Code refactor for android.telephony.ims.ImsManager.
2. Remove unused methods

Bug: 140542283
Test: build pass
Change-Id: I187789a8a553a2c073b3591807dfebfafba6bc14
 2020-04-01 10:58:27 +08:00
Weilun Du
08e95d0db0 [Settings] Fix crashes caused by null bluetooth adapter and ethernet 
manager

Emulator system image doesn't support bluetooth and ethernet manager
yet.
BUG: 150408099

Signed-off-by: Weilun Du <wdu@google.com>
Change-Id: Iab4f7b962f01755fe7d84956f9b54374f1e17408
 2020-04-01 02:39:28 +00:00
TreeHugger Robot
5f7375b546 Merge "Add dnd messages + calls senders image resource" into rvc-dev am: 947cb48303 am: e9c4d17eb2 am: 81df373d42 am: 43d299ac8a 
Change-Id: I0ef739ea2386854001b719b1e2cf5e8cc43f4241
 2020-03-31 21:49:12 +00:00
TreeHugger Robot
53c6bfffae Merge "Disable conversation strip setting." into rvc-dev am: 04d64f470e am: 6e9938cf48 am: 0035707d32 am: 85f940b564 
Change-Id: Ia73d18279f72e0eaefe73f0053549a4287a68ffa
 2020-03-31 21:48:17 +00:00
TreeHugger Robot
81df373d42 Merge "Add dnd messages + calls senders image resource" into rvc-dev am: 947cb48303 am: e9c4d17eb2 
Change-Id: I12caf300aeefc9a15a97fdbe79598f2bdc538f1c
 2020-03-31 20:22:03 +00:00
TreeHugger Robot
0035707d32 Merge "Disable conversation strip setting." into rvc-dev am: 04d64f470e am: 6e9938cf48 
Change-Id: I9995b090e07d81a3e46be1e9d80e87ab3b098dba
 2020-03-31 20:20:53 +00:00
TreeHugger Robot
947cb48303 Merge "Add dnd messages + calls senders image resource" into rvc-dev 2020-03-31 19:40:48 +00:00
TreeHugger Robot
04d64f470e Merge "Disable conversation strip setting." into rvc-dev 2020-03-31 19:21:51 +00:00
TreeHugger Robot
5aa24d76ab Merge "Use DEFAULT_LIST contact intent" into rvc-dev am: 07a3b1c6ed am: e15d04acf1 am: 767d51e123 am: 20074d4c41 
Change-Id: I8ee88fb72f11ed870bd585ed258efe5ecf6372e6
 2020-03-31 18:44:12 +00:00
TreeHugger Robot
ac9e47e275 Merge "Remove policy transparency for cross-profile calendar setting" into rvc-dev am: d0d3873aa7 am: c5507e6665 am: 0aeda894f3 am: 7a5c9cbfb2 
Change-Id: Ib9fd01710ccad4d86e671165295543d73aa7e477
 2020-03-31 18:38:31 +00:00
TreeHugger Robot
767d51e123 Merge "Use DEFAULT_LIST contact intent" into rvc-dev am: 07a3b1c6ed am: e15d04acf1 
Change-Id: I71d4f21a0e5fb349553bd09029b553873a95b97b
 2020-03-31 18:07:40 +00:00
TreeHugger Robot
0aeda894f3 Merge "Remove policy transparency for cross-profile calendar setting" into rvc-dev am: d0d3873aa7 am: c5507e6665 
Change-Id: Iea8e205dbdc145c6ccb268499bd7dce3137e0545
 2020-03-31 18:07:33 +00:00
TreeHugger Robot
07a3b1c6ed Merge "Use DEFAULT_LIST contact intent" into rvc-dev 2020-03-31 17:38:13 +00:00
TreeHugger Robot
d0d3873aa7 Merge "Remove policy transparency for cross-profile calendar setting" into rvc-dev 2020-03-31 17:31:16 +00:00
Beverly
5a4fb7986f Add dnd messages + calls senders image resource 
Add a visual representation of the call or message senders that can
bypass DND.

Test: manual
Bug: 151845457
Change-Id: Ie7d3598d5993e4c1cd62294ab9e17da47f2b6f76
 2020-03-31 13:29:35 -04:00
Steve Elliott
8a575029fc Disable conversation strip setting. 
Test: manual, robotests
Fixes: 149070144
Fixes: 149001624
Change-Id: I422872e38f7adead81938c39b6084bbc7ed911ae
 2020-03-31 13:24:46 -04:00
Bonian Chen
5b4acedda6 Merge "[Settings] Apply WifiCallingQueryImsState" into rvc-dev am: 54002ca154 am: d2fe2c9959 am: fa83a139ca am: c6c4b5def6 
Change-Id: I46c047359257ddd5cb3e331add4856b01c5c9739
 2020-03-31 17:03:06 +00:00
Bonian Chen
f5ed98caf3 Merge "[Settings] Remove internal ImsManager access within MobileNetworkUtils" into rvc-dev am: 311941c7d3 am: 855152fd22 am: f5b033015a am: f6a8037223 
Change-Id: Ied285b1b5347564db52d29aa1ea59a66a8df69f1
 2020-03-31 17:03:04 +00:00
Bonian Chen
fa83a139ca Merge "[Settings] Apply WifiCallingQueryImsState" into rvc-dev am: 54002ca154 am: d2fe2c9959 
Change-Id: I56e3d5cf3731b4188afbad5d88b8931b98fa21bf
 2020-03-31 16:38:36 +00:00
Bonian Chen
f5b033015a Merge "[Settings] Remove internal ImsManager access within MobileNetworkUtils" into rvc-dev am: 311941c7d3 am: 855152fd22 
Change-Id: Ica2bc8b657f244a6341e67dd28db5c213bf33be0
 2020-03-31 16:38:33 +00:00
Bonian Chen
54002ca154 Merge "[Settings] Apply WifiCallingQueryImsState" into rvc-dev 2020-03-31 16:09:27 +00:00
Bonian Chen
311941c7d3 Merge "[Settings] Remove internal ImsManager access within MobileNetworkUtils" into rvc-dev 2020-03-31 16:09:27 +00:00
TreeHugger Robot
2391d48238 Merge changes Ia96af86c,Ifbe2ac30 into rvc-dev am: 4b45334288 am: 37e6acd9a5 am: 4bcd19b296 am: a7e1794024 
Change-Id: Ie27c34c685a035f0751488e95e35ee9cebf980ea
 2020-03-31 16:00:34 +00:00
TreeHugger Robot
4bcd19b296 Merge changes Ia96af86c,Ifbe2ac30 into rvc-dev am: 4b45334288 am: 37e6acd9a5 
Change-Id: I4b3fa69ed60dbbd4fe936d463673ef8767fd982c
 2020-03-31 15:34:52 +00:00
Beverly
82e7bc46cf Use DEFAULT_LIST contact intent 
Test: manual
Fixes: 152733367
Change-Id: Ib2addc353298e593160500347d0a9bbfa85d1e0b
 2020-03-31 11:09:50 -04:00
TreeHugger Robot
4b45334288 Merge changes Ia96af86c,Ifbe2ac30 into rvc-dev 
* changes:
  [Wi-Fi] Wi-Fi picker scrolls to top after a user clicked to connect
  [Wi-Fi] Fix Wi-Fi picker context menu 'Connect' button
 2020-03-31 15:01:09 +00:00
Kholoud Mohamed
f638279fae Merge "Show all apps that requested cross profile permission" into rvc-dev am: 7fb6f35c3a am: bf7e468f0c am: 3e5e6920eb am: 1910a64cf1 
Change-Id: I2b6b7f55b4e3870f54c9f41b360d460c628d638c
 2020-03-31 14:26:22 +00:00
Kholoud Mohamed
3e5e6920eb Merge "Show all apps that requested cross profile permission" into rvc-dev am: 7fb6f35c3a am: bf7e468f0c 
Change-Id: I1fcaa7e6bd6616a5df7187c36575bc6f9abdf1f7
 2020-03-31 13:52:36 +00:00
Kholoud Mohamed
7fb6f35c3a Merge "Show all apps that requested cross profile permission" into rvc-dev 2020-03-31 13:09:31 +00:00
Alex Kershaw
c364f5d95d Remove policy transparency for cross-profile calendar setting 
We will likely deprecate this setting in the next release, to be
replaced by usage of 'connected work and personal apps'. However, we are
keeping it in this release as it's still possible that a lightweight
calendar access API could be useful, if the admin and user approvals are
combined.

For now, the error message that refers to cross-profile calendar when
the setting is disabled is confusing admins, since we're not
recommending usage of this API at this time.

Remove the setting when it is disabled, rather than showing policy
transparency.

Fixes: 143477431
Test: manual
Change-Id: I65573a5ba892e12a4dabcdf23541f33516db0a8a
 2020-03-31 11:41:44 +01:00
Arc Wang
a76669656f [Wi-Fi] Wi-Fi picker scrolls to top after a user clicked to connect 
After a connect success callback, Wi-Fi picker scrolls to the connected
Wi-Fi network after it's added in.

Bug: 152576795
Test: make RunSettingsRoboTests ROBOTEST_FILTER=WifiSettings2
      manual
      Click a Wi-Fi network or it's context menu 'Connect' button
      to connect and see if  UI scroll to the top.
Change-Id: Ia96af86c9ed552324089f97db104975e28f6c1c7
 2020-03-31 17:24:54 +08:00
Arc Wang
3bb3808043 [Wi-Fi] Fix Wi-Fi picker context menu 'Connect' button 
1. Display the Wi-Fi dialog with MODE_CONNECT.
2. Connect with the WifiConfiguration from
   WifiConfigController2#getConfig() if it's available.

Bug: 152826354
Test: make RunSettingsRoboTests ROBOTEST_FILTER=WifiSettings2
Change-Id: Ifbe2ac30b1c37c8eab3227ac0561fdd2de5cb706
 2020-03-31 17:01:22 +08:00
Robert Luo
ca0bfd0f36 Merge "Refine NFC payment wording for "Set default" and "Update" scenarios." into rvc-dev am: c3535eab06 am: c13ecfad98 am: 9fc4bfdcb5 am: 6271d783df 
Change-Id: Id99cfee39744982eff373b49934e2e446c49499b
 2020-03-31 08:47:03 +00:00
Robert Luo
9fc4bfdcb5 Merge "Refine NFC payment wording for "Set default" and "Update" scenarios." into rvc-dev am: c3535eab06 am: c13ecfad98 
Change-Id: I82be8b4c9c8a2929aac7570c198a2fed2c0eafc1
 2020-03-31 08:19:18 +00:00
Robert Luo
c3535eab06 Merge "Refine NFC payment wording for "Set default" and "Update" scenarios." into rvc-dev 2020-03-31 07:42:24 +00:00
Bonian Chen
a2411f9c3c Merge "[Settings] Code Refactor" into rvc-dev am: 268bdc12c6 am: 949ec8a1f0 am: 9e9597f7d8 am: 3c4dffc470 
Change-Id: I45977c850977be84c0dc1f6461e68a1941efc1a2
 2020-03-31 07:29:37 +00:00
Bonian Chen
9e9597f7d8 Merge "[Settings] Code Refactor" into rvc-dev am: 268bdc12c6 am: 949ec8a1f0 
Change-Id: I3fbf2b0e9a69d08c5926ce05d2bef76d36e6f84f
 2020-03-31 07:00:18 +00:00
Bonian Chen
7520adccee [Settings] Apply WifiCallingQueryImsState 
Apply design of WifiCallingQueryImsState to source code which accessing
WifiCalling.

Bug:  140542283
Test: m RunSettingsRoboTests -j
ROBOTEST_FILTER=WifiCallingSettingsForSubTest
Test: m RunSettingsRoboTests -j
ROBOTEST_FILTER=WifiCallingPreferenceControllerTest
Test: m RunSettingsRoboTests -j
ROBOTEST_FILTER=WifiCallingSettingsTest
Test: m RunSettingsRoboTests -j
ROBOTEST_FILTER=WifiCallingSliceHelperTest

Change-Id: I0db966742d63cfe9a1ef4e1b06f6b5c81f681927
 2020-03-31 14:40:18 +08:00
Bonian Chen
268bdc12c6 Merge "[Settings] Code Refactor" into rvc-dev 2020-03-31 06:24:15 +00:00
TreeHugger Robot
aa94953649 Merge "Get MediaDevice from devices list" into rvc-dev am: cd329951ba am: 46cc33c9a6 am: 210c260ce6 am: bebee5c18e 
Change-Id: I7c47427bdd8f33ba29e09780492582d69770e335
 2020-03-31 06:16:05 +00:00
Jason Chang
24b7398a19 Merge "New Settings preference for One Handed mode" 2020-03-31 05:58:30 +00:00
tim peng
85cbce813c Merge "No media status is visible in Output Switcher" into rvc-dev am: 5b0913c2b6 am: 4a82a5abb5 am: 2b47660696 am: f8c57507e2 
Change-Id: I4c9eaaf3b244f657bb6cc32a31526b22f535a20a
 2020-03-31 05:20:51 +00:00
TreeHugger Robot
210c260ce6 Merge "Get MediaDevice from devices list" into rvc-dev am: cd329951ba am: 46cc33c9a6 
Change-Id: Ied6e18f0806b1f32fb3adcec483adc34eb7a23aa
 2020-03-31 05:04:21 +00:00
TreeHugger Robot
cfcc352af6 Merge "Set face unlock toggle to unchecked when disabled by admin" into rvc-dev am: a2d56af9bd am: ea63b90c3d am: 4b997ee9fd am: 599f02eab1 
Change-Id: I9349594dd1e6e65c441f45563b7add8453ae5aea
 2020-03-31 05:03:23 +00:00