Commit Graph

30637 Commits

Author SHA1 Message Date
Fiona Campbell
a165e13de0 Merge "Fix displayed brightness value in settings." into rvc-dev am: 9a712271f2
Change-Id: Ia2626e63c27344c591b8a54b8cec8bf0973e020e
2020-03-23 09:04:51 +00:00
Fiona Campbell
9a712271f2 Merge "Fix displayed brightness value in settings." into rvc-dev 2020-03-23 08:54:26 +00:00
Eric Sandness
0d022fced2 Make Logic For Selecting Title Layout Consistent am: b02952a5d3
Change-Id: Ie91236f0ec08795a7db45baf98844fc10fcb4dcb
2020-03-23 07:55:47 +00:00
Bonian Chen
3ca9e69e2b Merge "[Settings] Apply ImsQueryController#isServiceStateReady to VoLte" into rvc-dev am: 31315e4172
Change-Id: I13bdb4cb0a9cf1cc8b7f9930a50a016d208acae3
2020-03-23 06:36:27 +00:00
Eric Sandness
b02952a5d3 Make Logic For Selecting Title Layout Consistent
Align the logic for selecting between the setup and non-setup versions
of the lock screen settings title layout, with the logic used in
ChooseLockGeneric.  This means using
WizardManagerHelper.isAnySetupWizard, rather than
WizardManagerHelper.isDeviceProvisioned.

Fixes: 151552453
Test: Manually verify screens in consumer setup, enterprise setup, and
Settings app

Change-Id: I75cd9e509320b9ef9b929dd592f16e8130d80a6e
2020-03-23 06:25:07 +00:00
Bonian Chen
31315e4172 Merge "[Settings] Apply ImsQueryController#isServiceStateReady to VoLte" into rvc-dev 2020-03-23 06:20:42 +00:00
Treehugger Robot
456b2bf87b Merge "Fixed NullPointerException" am: 5fb16be925 am: cbe5bbdcd5
Change-Id: Id2bbc0a3596bb9a82ea066dc512b206dd8f8b7a1
2020-03-23 06:18:45 +00:00
Treehugger Robot
cbe5bbdcd5 Merge "Fixed NullPointerException" am: 5fb16be925
Change-Id: Ie99fc2139875e0f8dfbfbe0bd31f55f135607996
2020-03-23 06:00:05 +00:00
TreeHugger Robot
d582019b63 Merge "[Wi-Fi] Fix exception when WifiTracker2 callbacks to Wi-Fi Settings" into rvc-dev am: dea87bd85b
Change-Id: I2573e4a5f478a60bc07424dec42b828ccb6e642e
2020-03-23 02:42:30 +00:00
TreeHugger Robot
dea87bd85b Merge "[Wi-Fi] Fix exception when WifiTracker2 callbacks to Wi-Fi Settings" into rvc-dev 2020-03-23 02:07:56 +00:00
tim peng
f51bd0decb Merge "Update header information in output switcher" into rvc-dev am: f8f1b271b1
Change-Id: I2406caf1ecdb217658c310f4db948c627adcf790
2020-03-23 01:59:00 +00:00
tim peng
f8f1b271b1 Merge "Update header information in output switcher" into rvc-dev 2020-03-23 01:47:25 +00:00
TreeHugger Robot
981d9e37cb Merge "Fix ContextualAdaptiveSleepSliceTest" into rvc-dev am: a4e3d5ef8b
Change-Id: Idd8c529261fd853b5aba28f88139008ea489aa40
2020-03-21 03:14:28 +00:00
TreeHugger Robot
a4e3d5ef8b Merge "Fix ContextualAdaptiveSleepSliceTest" into rvc-dev 2020-03-21 02:58:15 +00:00
Joshua Duong
2a3d93f2cc Merge "Add visibility control to ADB QR code preference." into rvc-dev am: f5ff928958
Change-Id: Iaa687cccc1c6c7667350e8de751d7010cd872cf5
2020-03-20 19:16:42 +00:00
Joshua Duong
33659c99dc Merge "Add toast error message for no WiFi on wireless debugging." into rvc-dev am: 2f7a77b782
Change-Id: I502e79749c5df0b77a9024383545a1d273a5e10d
2020-03-20 19:16:40 +00:00
Joshua Duong
f5ff928958 Merge "Add visibility control to ADB QR code preference." into rvc-dev 2020-03-20 19:02:49 +00:00
Joshua Duong
2f7a77b782 Merge "Add toast error message for no WiFi on wireless debugging." into rvc-dev 2020-03-20 19:02:49 +00:00
TreeHugger Robot
c6e000ff18 Merge "DO NOT MERGE - Merge qt-qpr1-dev-plus-aosp@6304901 into stage-aosp-master" into stage-aosp-master 2020-03-20 18:15:00 +00:00
TreeHugger Robot
d83b13f1c8 Merge "[Wi-Fi] Fix Wi-Fi broken tests" into rvc-dev am: 534bb50ec6
Change-Id: I45bddca51ffc42668643f3b350294ebf1c1e4622
2020-03-20 16:32:40 +00:00
TreeHugger Robot
534bb50ec6 Merge "[Wi-Fi] Fix Wi-Fi broken tests" into rvc-dev 2020-03-20 16:21:05 +00:00
TreeHugger Robot
ab09a70636 Merge "Disable the sync now menu while no any synced item" into rvc-dev am: cdaf5d38b5
Change-Id: I6af9222e1a643d9f7cb669ea01fc3918ed4da407
2020-03-20 15:44:24 +00:00
Bonian Chen
b90fe0b04c [Settings] Apply ImsQueryController#isServiceStateReady to VoLte
Apply ImsQueryController#isServiceStateReady() to VoLte part

Bug: 140542283
Test: m RunSettingsRoboTests -j ROBOTEST_FILTER=Enhanced4gBasePreferenceControllerTest
Test: m RunSettingsRoboTests -j ROBOTEST_FILTER=Enhanced4gLteSliceHelperTest
Change-Id: I1535df837f2e015cd1afb0891fd69a98c7d6991a
2020-03-20 23:33:47 +08:00
TreeHugger Robot
cdaf5d38b5 Merge "Disable the sync now menu while no any synced item" into rvc-dev 2020-03-20 15:25:04 +00:00
Joshua Duong
56ad92c3b9 Add visibility control to ADB QR code preference.
The preference should be hidden if isAdbWifiQrSupported() is false.

Bug: 150163684
Bug: 149843499

Test: make RunSettingsRoboTests ROBOTEST_FILTER=AdbQrCodePreferenceControllerTest
Change-Id: I3e833440fb1a6f369ac97cec8db04f2b99dd4640
(cherry picked from commit 6178918653)
Exempt-From-Owner-Approval: cherry-pick
2020-03-20 15:09:53 +00:00
Joshua Duong
75ae058627 Add toast error message for no WiFi on wireless debugging.
Show a toast to connect to a WiFi network when the user tries to
enable wireless debugging while not connected to any Wi-Fi network.

Bug: 150139061
Bug: 149843499

Test: make RunSettingsRoboTests ROBOTEST_FILTER=WirelessDebuggingPreferenceControllerTest
Test: make RunSettingsRoboTests ROBOTEST_FILTER=WirelessDebuggingEnablerTest

Change-Id: I389f5fddc874f60e8156ecf6ef2f1c6eddc1d7a5
Exempt-From-Owner-Approval: LGTM
(cherry picked from commit 564f6ba770)
2020-03-20 15:08:30 +00:00
Arc Wang
31f04d1585 [Wi-Fi] Fix Wi-Fi broken tests
Bug: 150910070
Test: make RunSettingsRoboTests -j ROBOTEST_FILTER=com.android.settings.wifi
Change-Id: Ie9b9384610857e2999fe4642a93c2d31ce3315f3
Merged-In: Ie9b9384610857e2999fe4642a93c2d31ce3315f3
2020-03-20 14:07:13 +00:00
Junyu Lai
2f60c6dddd Merge "Adjust code for API council feedback" into rvc-dev am: 040bfe3721
Change-Id: I68335aa9d56608b1ca2d0180d25cdbf077737697
2020-03-20 11:08:52 +00:00
Junyu Lai
040bfe3721 Merge "Adjust code for API council feedback" into rvc-dev 2020-03-20 11:03:47 +00:00
Bonian Chen
be71dbdda7 Merge "[Settings] mSubId should not be overridden in TelephonyBasePreferenceController" into rvc-dev am: 26fb6c29c1
Change-Id: I218e2a34c62eaef6307475d1c5add31d3ff9ded4
2020-03-20 11:01:52 +00:00
Bonian Chen
e495a049c4 Merge "[Settings] Avoid from accessing IMS with invalid subscription id" into rvc-dev am: 06899ffb8e
Change-Id: Ia9cef50655182a53cae97115708490848974b78e
2020-03-20 11:01:48 +00:00
Bonian Chen
26fb6c29c1 Merge "[Settings] mSubId should not be overridden in TelephonyBasePreferenceController" into rvc-dev 2020-03-20 10:52:38 +00:00
Bonian Chen
06899ffb8e Merge "[Settings] Avoid from accessing IMS with invalid subscription id" into rvc-dev 2020-03-20 10:48:03 +00:00
Bonian Chen
594c267e99 [Settings] mSubId should not be overridden in
TelephonyBasePreferenceController

mSubId is a protected member provided by parent class.
Overriding mSubId should be avoided.

Bug: 150535296
Test: manual
Change-Id: I391b034c9badd43094ab52b8b6488bca07ef3c86
2020-03-20 10:46:52 +00:00
Arc Wang
04854f8234 [Wi-Fi] Fix exception when WifiTracker2 callbacks to Wi-Fi Settings
When WifiTracker2 callbacks to Wi-Fi Settings, should check if the
activity is finishing at first.

Bug: 151677440
Test: make RunSettingsRoboTests -j ROBOTEST_FILTER=WifiSettings2Test
Change-Id: I95737eae3f67e6471c75ba845b57af2d721d5d37
2020-03-20 18:02:02 +08:00
Yi-Ling Chuang
6950877b7a Fix ContextualAdaptiveSleepSliceTest
ADAPTIVE_SLEEP has been moved from Settings.System to Settings.Secure
but the main logic hasn't synced with the change which leads to the
failure.

Fixes: 139319542
Test: robotests
Change-Id: I56f58cc3da5a4034e2bf2ed5a63ae3bc2fec2a21
2020-03-20 17:29:03 +08:00
Sanghee Kim
24565c1b83 Fixed NullPointerException
1. only one sim insertion.
2. sim removal in sim card lock setting menu.

Additionally, removed unnecessary code.

Test: manual

Change-Id: I5710b9c313d6e0b7c011a12e0179a4d5a4f7e580
Signed-off-by: Sanghee Kim <haya93@samsung.com>
2020-03-20 14:39:44 +09:00
Bonian Chen
4a49f426fb [Settings] Avoid from accessing IMS with invalid subscription id
Check subscription ID before accessing to IMS APIs

Bug: 149190278
Test: make and manual test
Change-Id: I0561529ccaf23c84d7d6dd3e268386ab82f17418
2020-03-20 13:31:35 +08:00
Sooraj Sasindran
9c35cfa688 Revert "access system resources with android.R package" am: 253ba4f3ef
Change-Id: I78a68e8eef3b3cee9911cb89a9bd09ce83020357
2020-03-20 04:58:39 +00:00
Daniel Bright
6249dfbd9f Merge "Revert "access system resources with android.R package"" into rvc-dev 2020-03-20 04:57:43 +00:00
Goven Liu
1853ed32df Merge "[Wi-Fi] Add API to handle help button click event" into rvc-dev am: b626a602c9
Change-Id: Idce71a7d430a0d6da7fb8fa821e3853e0c2a9921
2020-03-20 04:57:38 +00:00
Goven Liu
b626a602c9 Merge "[Wi-Fi] Add API to handle help button click event" into rvc-dev 2020-03-20 04:54:46 +00:00
TreeHugger Robot
8fd066d5d3 Merge "Update string for Adaptive sleep slice title." into rvc-dev am: b436d149e4
Change-Id: Ice2f1aae12ae46f1448bf11b25c78008c5ab4e34
2020-03-20 02:16:04 +00:00
Sooraj Sasindran
3e26fc0f21 Revert "access system resources with android.R package"
Revert "access system resources with android.R package"

Revert submission 10146616-sim_colors

Reason for revert: b/151455581
Bug:151455581
Reverted Changes:
I1e698d404:access system resources with android.R package
Id1eab78a8:access system resources with android.R package
I38b2e096e:access system resources with android.R package
I82bff7bd4:access system resources with android.R package
I554812a9d:access system resources with android.R package
I17831cd35:access system resources with android.R package
I2ccb04c0e:access system resources with android.R package
If25b159e1:access system resources with android.R package
Idc1095563:access system resources with android.R package
Ie0189ef3b:make sim_colors a system config

Change-Id: Ia2b1fd28dee08da03b6f1e7892ac3562edad00e4
2020-03-20 01:37:47 +00:00
Sooraj Sasindran
253ba4f3ef Revert "access system resources with android.R package"
Revert submission 10146616-sim_colors

Reason for revert: b/151455581
Bug:151455581
Reverted Changes:
Idc1095563:access system resources with android.R package
Id1eab78a8:access system resources with android.R package
I1e698d404:access system resources with android.R package
I38b2e096e:access system resources with android.R package
I82bff7bd4:access system resources with android.R package
I554812a9d:access system resources with android.R package
I17831cd35:access system resources with android.R package
I2ccb04c0e:access system resources with android.R package
If25b159e1:access system resources with android.R package
Ie0189ef3b:make sim_colors a system config

Change-Id: I1e370f0eadce02508b0a16e01e51c4ac5b002ac9
2020-03-20 01:37:30 +00:00
TreeHugger Robot
b436d149e4 Merge "Update string for Adaptive sleep slice title." into rvc-dev 2020-03-20 01:16:53 +00:00
govenliu
907e402cfa [Wi-Fi] Add API to handle help button click event
Add API to launch help page when Openroaming help button is tapped.

Bug: 146669261
Test: Add openSubscriptionHelpPage_shouldCallStartActivityForResult unit test to check StartActivityForResult had been launched correctly.
Change-Id: If18248e7d985215e65dfdc5742cd9007efbbff1a
2020-03-19 23:22:36 +00:00
Michael Groover
4605509b09 Merge "Add developer option to disable automatic adb grant revocation" into rvc-dev am: 0a189b3abe
Change-Id: Iddcb73d6300a4563d6ce146c27446d88638f212b
2020-03-19 21:37:41 +00:00
Varun Anand
38fc2238bd Merge "Fix the availability of UseOpenWifiPreferenceController." into rvc-dev am: 4ebfaec3a3
Change-Id: Ia42e358a40f86101ab8f104697861b325fbc3293
2020-03-19 21:36:13 +00:00
Michael Groover
0a189b3abe Merge "Add developer option to disable automatic adb grant revocation" into rvc-dev 2020-03-19 21:31:01 +00:00