PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
60,020 Commits 1 Branch 0 Tags
a165e13de0aa3356befbfbb685af77c04eb3af9d
Commit Graph

60020 Commits

This Branch
This Branch
All Branches
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
5fb16be925 Merge "Fixed NullPointerException" 2020-03-23 05:45:38 +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
Stanley Wang
78e9bdf9b7 Merge "Update Settings subtexts for R." into rvc-dev am: fb39c70875 
Change-Id: Iaeda191d1877ae40f0b3911cea911a876da97f0b
 2020-03-21 05:49:32 +00:00
Stanley Wang
6c6837424d Merge "Update Settings strings for R." into rvc-dev am: 61e7d2c24c 
Change-Id: If6f30aa662c0fd4696722df8e7f31b49b7929157
 2020-03-21 05:49:25 +00:00
Stanley Wang
fb39c70875 Merge "Update Settings subtexts for R." into rvc-dev 2020-03-21 05:30:25 +00:00
Stanley Wang
61e7d2c24c Merge "Update Settings strings for R." into rvc-dev 2020-03-21 05:30:00 +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
TreeHugger Robot
a37f3bc902 Merge "Add text showing in Settings footer that 5G may not be capable in DSDS." into rvc-dev am: 785e3f26bd 
Change-Id: I3e34e330287c1c3cee02e9c3985ac0e41c66969e
 2020-03-21 01:57:05 +00:00
TreeHugger Robot
785e3f26bd Merge "Add text showing in Settings footer that 5G may not be capable in DSDS." into rvc-dev 2020-03-21 01:39:29 +00:00
Malcolm Chen
b56fea748f Add text showing in Settings footer that 5G may not be capable in DSDS. 
Bug: 151657272
Test: build
Change-Id: Ieeb0787f76fcf41cc55e85ef8bf375dd77c9d6b5
 2020-03-20 16:14:14 -07:00
Stanley Wang
58f9ae3096 Update Settings strings for R. 
Bug:143267842
Test: Rebuilt rom and saw different screens.
Change-Id: Id2d89287fe36240d71de2092daac44a5da9be282
(cherry picked from commit 8694c34e09)
Merged-In: Id2d89287fe36240d71de2092daac44a5da9be282
 2020-03-20 22:31:44 +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
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
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
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