Commit Graph

60452 Commits

Author SHA1 Message Date
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
21058df4b3 [automerger skipped] Merge "DO NOT MERGE - Merge qt-qpr1-dev-plus-aosp@6304901 into stage-aosp-master" into stage-aosp-master am: c6e000ff18 -s ours
am skip reason: subject contains skip directive

Change-Id: I6078067348010390012aa1ca5789ada3ab833b81
2020-03-20 18:31:56 +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
f261041e88 [automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: 65fb5c31c2 -s ours
am skip reason: subject contains skip directive

Change-Id: Id431f37dea177c4b4ad6a65744d7582f460b67a5
2020-03-20 17:45:16 +00:00
TreeHugger Robot
65fb5c31c2 Merge "Import translations. DO NOT MERGE" into rvc-dev 2020-03-20 17:24:57 +00:00
Beverly
509273cc03 Updates main page for Do Not Disturb
Settings > Sound > Do Not Disturb
- Update strings, more descriptive summary for DND Apps summary
- Move top-level ordering of preferences
- Remove old unused DND strings

Test: make RunSettingsRoboTests7
Test: make ROBOTEST_FILTER=ZenModeBypassingAppsPreferenceControllerTest RunSettingsRoboTests
Test: manual
Bug: 151845457
Merged-In: I9c23c558a9d764702e966d22e5c6e5c5425e4d32
Change-Id: I9c23c558a9d764702e966d22e5c6e5c5425e4d32
2020-03-20 17:12:55 +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
Rubin Xu
56d5cc244d Show in UI if admin has disabled face auth
Bug: 135747161
Test: manual
Change-Id: I13bf681be36a2ea5192f841ffcf423390189474c
2020-03-20 16:14:05 +00:00
kholoud mohamed
cefef920de Re-enable ignored tests
Also fix issue in one test.

Fixes: 151572330
Test: make RunSettingsRoboTests ROBOTEST_FILTER=InteractAcrossProfilesDetailsTest
Test: make RunSettingsRoboTests ROBOTEST_FILTER=InteractAcrossProfilesSettingsTest

Change-Id: I335b19223e39e19b04d719785aa08800237798cd
2020-03-20 15:53:46 +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
TreeHugger Robot
9e5e8d09d8 Merge "Update summary of low battery tip in tests." into rvc-dev am: 781ca5864d
Change-Id: I10f6bc63340ea0a3778e6e49fab8928ff61a9567
2020-03-20 15:15:27 +00:00
TreeHugger Robot
a3ff358fba Merge "Ignore broken tests" into rvc-dev am: 3eddda5985
Change-Id: I26a2a2fb149f9ba964fd7e2f2d2758474ddf55f0
2020-03-20 15:14:36 +00:00
TreeHugger Robot
7dfc4f48fc Merge "Ignore broken test cases" into rvc-dev am: 9e118ed61e
Change-Id: Iee5a10934cc3c6a5b4119ee06bfea2b345fcd769
2020-03-20 15:14:26 +00:00
TreeHugger Robot
781ca5864d Merge "Update summary of low battery tip in tests." into rvc-dev 2020-03-20 15:10:17 +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
TreeHugger Robot
3eddda5985 Merge "Ignore broken tests" into rvc-dev 2020-03-20 15:09:02 +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
TreeHugger Robot
9e118ed61e Merge "Ignore broken test cases" into rvc-dev 2020-03-20 15:02:06 +00:00
TreeHugger Robot
40a6857244 Merge "Enable Night Light preference searchable" into rvc-dev am: 1b0d27dbad
Change-Id: I28551ca6eda3fa50732838aff567ecaa04f2745a
2020-03-20 14:54:48 +00:00
TreeHugger Robot
1b0d27dbad Merge "Enable Night Light preference searchable" into rvc-dev 2020-03-20 14:40:25 +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
Bill Yi
9820335037 Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Change-Id: I2bf62a5341fd621088c6f565803c0c9864e6dcbf
2020-03-20 07:02:23 -07:00
Menghan Li
9abfb90214 Merge "Update R accessibility assets and strings (8/n)" into rvc-dev am: 9eb0906019
Change-Id: Ib0e2b619702d3a5b1ee6ef9e5938066a672586d0
2020-03-20 12:53:38 +00:00
Tsung-Mao Fang
86ddac58a9 Ignore broken tests
Bug: 151913744
Bug: 151572330
Test: robo test
Change-Id: I59abca488d8cff2eb043ebe66aff9563cf3a01d4
Merged-In: I59abca488d8cff2eb043ebe66aff9563cf3a01d4
(cherry picked from commit ae8fbea47a)
2020-03-20 12:49:53 +00:00
Tsung-Mao Fang
036f83983d Ignore broken test cases
Test: Run robo test
Bug: 151572330
Change-Id: I2e2f0664d6e26827513632772e6b77c9f8b089a7
Merged-In: I2e2f0664d6e26827513632772e6b77c9f8b089a7
(cherry picked from commit d4ba7c1fa7)
2020-03-20 12:49:13 +00:00
Menghan Li
9eb0906019 Merge "Update R accessibility assets and strings (8/n)" into rvc-dev 2020-03-20 12:36:29 +00:00
Yi-Ling Chuang
7166ab38c2 Update summary of low battery tip in tests.
Bug: 144865404
Test: robotests
Change-Id: I4ec1966f765e7b44dc7affbcb46ba35c3fe6caea
2020-03-20 20:19:23 +08:00
Yanting Yang
cf837e9ea8 Enable Night Light preference searchable
When the searchable attribute of preference is false, we do not collect
it to Settings Search, therefore, we can not get its sitemap relation
from index data.

Since we do not index the NightDisplayPreference, it caused the sitemap
relation loss. The relevant night light preferences can not map to
the correct parent page, Display page.

In order to fix the breadcrumb and grouping problem, remove the
searchable="false" of NightDisplayPreference to enable the indexing
again.

Bug: 151206664
Test: visual
Change-Id: Ia4f82b29cfe4f78ae55b20dad0356ac56b735307
2020-03-20 20:09:41 +08:00
TreeHugger Robot
1b626efa74 Merge "Revise strings to up to date for tutorial improvement." into rvc-dev am: a5a629c7fb
Change-Id: Iffd12985a04ff5d2b958c258bfee5eccc0561b56
2020-03-20 11:44:18 +00:00
TreeHugger Robot
a5a629c7fb Merge "Revise strings to up to date for tutorial improvement." into rvc-dev 2020-03-20 11:28:18 +00:00
Stanley Wang
ae4f8db19a Update Settings subtexts for R.
- Update subtexts
  "When screen is dark, it turns on for new notifications" &
  "Increased battery usage"

Fixes: 143267842
Test: Rebuilt rom and saw different screens.
Change-Id: I3c6d9f807da79037be90e1f19f0d0e0c82b79353
2020-03-20 11:20:14 +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
menghanli
e367ce2951 Update R accessibility assets and strings (8/n)
- Q behavior migration strings
- consistency for 1s or 3s
- Change the Shortcut from lock screen char limit

Bug: 148837311
Bug: 151635593
Test: Manual test
Change-Id: Icf6eae77e6dcbe55f53f896677de6513d0a33e7d
2020-03-20 10:03:05 +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
Peter_Liang
41f536df13 Revise strings to up to date for tutorial improvement.
Bug: 148989018
Test: manual test
Change-Id: If6691f36277fa13b89f6305864fad30152a3cda9
2020-03-20 15:22:30 +08:00
TreeHugger Robot
084933ec19 Merge "Update the icon of security IA." into rvc-dev am: 750ff89856
Change-Id: Id398fce942c15b7895bc3b30fca0bc0e8a259ca3
2020-03-20 06:25:02 +00:00
TreeHugger Robot
750ff89856 Merge "Update the icon of security IA." into rvc-dev 2020-03-20 06:11:06 +00: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