Android/packages_apps_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
60,006 Commits 1 Branch 0 Tags
4acdc6f97ee37cc34182fcd7b7395217ca666349
Commit Graph

60006 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Calvin Pan
4acdc6f97e Merge "Clear the entries in updateState" into rvc-dev am: 861d3446ab am: 029ec754a3 
Change-Id: I4ab1847461455142739863fe4e53033277c78601
 2020-03-23 10:34:34 +00:00
Calvin Pan
029ec754a3 Merge "Clear the entries in updateState" into rvc-dev am: 861d3446ab 
Change-Id: I0574aaf33278a82500809e7803b61e5e12b49eb9
 2020-03-23 10:23:31 +00:00
Calvin Pan
861d3446ab Merge "Clear the entries in updateState" into rvc-dev 2020-03-23 10:11:58 +00:00
Fiona Campbell
878097999a Merge "Fix displayed brightness value in settings." into rvc-dev am: 9a712271f2 am: 9eae2b7531 
Change-Id: I7fa774d4e6c21f722c804325d864f1955db5f3ba
 2020-03-23 09:30:14 +00:00
Fiona Campbell
9eae2b7531 Merge "Fix displayed brightness value in settings." into rvc-dev am: 9a712271f2 
Change-Id: Ia027a69fd2e739aba88335a208644d9be663163b
 2020-03-23 09:04:26 +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
a4ad84f5e5 Make Logic For Selecting Title Layout Consistent am: b02952a5d3 am: 6d9451891a 
Change-Id: Iad0129b7d3628cc2ddbe0510f855c4861bf3f99a
 2020-03-23 08:19:15 +00:00
Eric Sandness
6d9451891a Make Logic For Selecting Title Layout Consistent am: b02952a5d3 
Change-Id: I3477638565f28b5ca4848fec6f85e8f4ea7a3e67
 2020-03-23 07:55:09 +00:00
Bonian Chen
cc337985fc Merge "[Settings] Apply ImsQueryController#isServiceStateReady to VoLte" into rvc-dev am: 31315e4172 am: 3ebf728910 
Change-Id: Ieb3e0265d29897b667f21db301b6fc0943e87a67
 2020-03-23 06:55:02 +00:00
Bonian Chen
3ebf728910 Merge "[Settings] Apply ImsQueryController#isServiceStateReady to VoLte" into rvc-dev am: 31315e4172 
Change-Id: I61ecd339475067337dc1d58ec5ac24da1036377b
 2020-03-23 06:35:54 +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
calvinpan
8c6218013d Clear the entries in updateState 
When user select the prefer network type that will also invoke
updateState(), so need to clear the entries to prevent adding duplicate
item.

Bug: 152031192
Test: By manual.
Change-Id: I05c5eae658cf72bdf05f5007b4aeba575ab14d61
 2020-03-23 14:09:54 +08:00
TreeHugger Robot
637a548baa Merge "[Wi-Fi] Fix exception when WifiTracker2 callbacks to Wi-Fi Settings" into rvc-dev am: dea87bd85b am: 7f0a093f5c 
Change-Id: I7feb5a370c5a80a6d78a2a418c31ada4f8d63a28
 2020-03-23 03:03:44 +00:00
TreeHugger Robot
7f0a093f5c Merge "[Wi-Fi] Fix exception when WifiTracker2 callbacks to Wi-Fi Settings" into rvc-dev am: dea87bd85b 
Change-Id: Icc3236048ae0cd07f4bb623bc59830332813584b
 2020-03-23 02:41:45 +00:00
tim peng
f76f1f41ee Merge "Update header information in output switcher" into rvc-dev am: f8f1b271b1 am: 30bc781200 
Change-Id: I2da55a8a664d165be81f5fe82ac3bb4d1fb52b65
 2020-03-23 02:14:04 +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
30bc781200 Merge "Update header information in output switcher" into rvc-dev am: f8f1b271b1 
Change-Id: I07b28fccc7cc1285506c18b5579350fbdcca23e2
 2020-03-23 01:58:34 +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
3277ad0cf6 Merge "Update Settings subtexts for R." into rvc-dev am: fb39c70875 am: 76c2ec77e3 
Change-Id: Ida303b4590886c38e90f8e233920db186102269f
 2020-03-21 06:05:27 +00:00
Stanley Wang
83d06ef1f4 Merge "Update Settings strings for R." into rvc-dev am: 61e7d2c24c am: a8d78418c0 
Change-Id: Ib375c8aee3658797113370493feb7e7d527a8939
 2020-03-21 06:04:18 +00:00
Stanley Wang
76c2ec77e3 Merge "Update Settings subtexts for R." into rvc-dev am: fb39c70875 
Change-Id: I35d894cd31031fa8019ca7b6f1552dcd0b1c1412
 2020-03-21 05:49:13 +00:00
Stanley Wang
a8d78418c0 Merge "Update Settings strings for R." into rvc-dev am: 61e7d2c24c 
Change-Id: I87df8f40a569b89d2275d5ce38e379eb3f9f96b9
 2020-03-21 05:48:43 +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
3baeb593c7 Merge "Fix ContextualAdaptiveSleepSliceTest" into rvc-dev am: a4e3d5ef8b am: 17c6211285 
Change-Id: I193e8c5cb34efe53d9b62953fe8c3cddca485707
 2020-03-21 03:39:45 +00:00
TreeHugger Robot
17c6211285 Merge "Fix ContextualAdaptiveSleepSliceTest" into rvc-dev am: a4e3d5ef8b 
Change-Id: I5b2b39c33b525407b1b6da300dc853704f727061
 2020-03-21 03:14:30 +00:00
TreeHugger Robot
a4e3d5ef8b Merge "Fix ContextualAdaptiveSleepSliceTest" into rvc-dev 2020-03-21 02:58:15 +00:00
TreeHugger Robot
10b3981f72 Merge "Add text showing in Settings footer that 5G may not be capable in DSDS." into rvc-dev am: 785e3f26bd am: cdca282167 
Change-Id: I26026f93904a147300c843625170d2585d68b910
 2020-03-21 02:14:16 +00:00
TreeHugger Robot
cdca282167 Merge "Add text showing in Settings footer that 5G may not be capable in DSDS." into rvc-dev am: 785e3f26bd 
Change-Id: I52415cc41bf4e613a63459394579265e27c87c76
 2020-03-21 01:56:41 +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
c6e68b5830 Merge "Add visibility control to ADB QR code preference." into rvc-dev am: f5ff928958 am: 6fcb6b356a 
Change-Id: I869608c3ed88f6dfe3d3a3b8eb08ea03a278861b
 2020-03-20 19:15:46 +00:00
Joshua Duong
8017331f64 Merge "Add toast error message for no WiFi on wireless debugging." into rvc-dev am: 2f7a77b782 am: 6efa33e306 
Change-Id: I9293a4340a3e73db11c79c8874340d507d745b87
 2020-03-20 19:15:45 +00:00
Joshua Duong
6fcb6b356a Merge "Add visibility control to ADB QR code preference." into rvc-dev am: f5ff928958 
Change-Id: I90616c087e665c1d6980b9b6ac76f5f3d37be506
 2020-03-20 19:04:50 +00:00
Joshua Duong
6efa33e306 Merge "Add toast error message for no WiFi on wireless debugging." into rvc-dev am: 2f7a77b782 
Change-Id: I3d3ab0f1b54cef538b8bbc75c48c187a631f9742
 2020-03-20 19:04:48 +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
8a3c90359e [automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: 65fb5c31c2 -s ours am: feaa91837a -s ours 
am skip reason: subject contains skip directive

Change-Id: I2ae49f68605be4f91a35202a0f18ae70101139bd
 2020-03-20 18:12:49 +00:00
TreeHugger Robot
feaa91837a [automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: 65fb5c31c2 -s ours 
am skip reason: subject contains skip directive

Change-Id: I56114e77ffad0fe5b9ab7683624332406138bdf5
 2020-03-20 17:45:32 +00:00
TreeHugger Robot
65fb5c31c2 Merge "Import translations. DO NOT MERGE" into rvc-dev 2020-03-20 17:24:57 +00:00
TreeHugger Robot
7868ba726f Merge "[Wi-Fi] Fix Wi-Fi broken tests" into rvc-dev am: 534bb50ec6 am: 8e0807a069 
Change-Id: Ida2e8813fbb8b714f4d402cd2db5a18a341f657e
 2020-03-20 16:50:45 +00:00
TreeHugger Robot
8e0807a069 Merge "[Wi-Fi] Fix Wi-Fi broken tests" into rvc-dev am: 534bb50ec6 
Change-Id: I808a81e954fab8d93583300fedd006d3cb8bebe3
 2020-03-20 16:32:19 +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
72d61919a9 Merge "Disable the sync now menu while no any synced item" into rvc-dev am: cdaf5d38b5 am: 4758893d86 
Change-Id: Ifc83911fdf47a4f1385c627783f1b841e99bda8d
 2020-03-20 15:58:00 +00:00
TreeHugger Robot
4758893d86 Merge "Disable the sync now menu while no any synced item" into rvc-dev am: cdaf5d38b5 
Change-Id: I93e5f2becdd96c639d5b4c2b7157100732344258
 2020-03-20 15:44:04 +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
d0eacd10ef Merge "Update summary of low battery tip in tests." into rvc-dev am: 781ca5864d am: 41bb03252b 
Change-Id: I82eb456fdb139ce8dae954e8fa98c47ecc1e321b
 2020-03-20 15:31:40 +00:00
TreeHugger Robot
1cdaf85548 Merge "Ignore broken tests" into rvc-dev am: 3eddda5985 am: 8957104180 
Change-Id: I67b67dbe557ddd91317c785494544c8ee8dfcce3
 2020-03-20 15:31:33 +00:00