Commit Graph

30718 Commits

Author SHA1 Message Date
tim peng
f864bed27e Merge "Hide volume slider in Output Switcher when volume adjustment is restricted" into rvc-dev am: db86b2ef2a
Change-Id: I7390f6a18144c796e5fb9a297c4678d469a1808a
2020-04-21 02:33:40 +00:00
tim peng
db86b2ef2a Merge "Hide volume slider in Output Switcher when volume adjustment is restricted" into rvc-dev 2020-04-21 02:17:30 +00:00
Xiangyu/Malcolm Chen
8ca377ffd4 Merge "Add check of canConnectTo5GInDsds to show NrDisabledInDsdsFooter" into rvc-dev am: 9674276bb5
Change-Id: Ia9defd6ddcc917f333568fef33f093eb024e6eb2
2020-04-20 19:27:12 +00:00
Xiangyu/Malcolm Chen
9674276bb5 Merge "Add check of canConnectTo5GInDsds to show NrDisabledInDsdsFooter" into rvc-dev 2020-04-20 19:10:15 +00:00
Julia Reynolds
4fa251613e Merge "Set explicit back target for history" into rvc-dev am: bb979153ed
Change-Id: I2c81ca3114f44cab401b7f698cde7ae5481b8ebb
2020-04-20 17:53:22 +00:00
Julia Reynolds
bb979153ed Merge "Set explicit back target for history" into rvc-dev 2020-04-20 17:40:18 +00:00
jasonwshsu
e7766cc455 Remove unused attribute 'EXTRA_SUMMARY_RES' am: 1be2666d11
Change-Id: I711b86a69ef33f24fa8dc1e175e3cb8c6741532b
2020-04-20 16:43:22 +00:00
Julia Reynolds
6c8451a89f Set explicit back target for history
Test: manual
Fixes: 153554906
Change-Id: Ic3198afae878e3cfbfbfa7e72b1c71a6f4e74a2e
2020-04-20 11:31:43 -04:00
jasonwshsu
1be2666d11 Remove unused attribute 'EXTRA_SUMMARY_RES'
* Magnification already use EXTRA_HTML_DESCRIPTION to replace it.

Bug: 154092127
Test: manual test
Change-Id: I5385907eb0911894159a80444493bf233bb43e1a
2020-04-20 23:09:59 +08:00
Julia Reynolds
a8bb57287c Merge "Update conversation bubble settings" into rvc-dev am: 608bd69328
Change-Id: Id6c256f18943631a727b212d39b102c93f1a0f63
2020-04-20 13:37:30 +00:00
Julia Reynolds
608bd69328 Merge "Update conversation bubble settings" into rvc-dev 2020-04-20 13:16:57 +00:00
Tim Peng
71dd32ded0 Hide volume slider in Output Switcher when volume adjustment is restricted
-Check UserManager.DISALLOW_ADJUST_VOLUME
-Hide slider when unsupported

Bug: 153922342
Test: 1.Open CTS-V app > Device Owner Tests
2.install CtsEmptyDeviceOwner.apk -"adb install -r -t CtsEmptyDeviceOwner.apk"
3.enter the command "adb shell dpm set-device-owner com.android.cts.emptydeviceowner/.EmptyDeviceAdmin"
4.push Check device owner button
5.open Policy transparency test and go to Disallow adjust volume > Enable the switch > Open settings.

Change-Id: Iac2793ead6d93d4eaada19c4eec33885d4b97138
2020-04-20 09:09:07 +00:00
Bonian Chen
6457a087c3 Merge "[DataUsage] UX enhancement" into rvc-dev am: d9dadc0511
Change-Id: I4a89a7a2075d723a8e70ed298b900546397239d5
2020-04-20 06:39:57 +00:00
Bonian Chen
a66cf69f1f [DataUsage] UX enhancement
Some of the field didn't take eu languages into consideration.
Enhance it through changing the:
1. Format of display
2. Parser after user input
3. IME support for comma in eu language

Bug: 141536928
Test: Manual input and check for results
Test: make RunSettingsRoboTests -j ROBOTEST_FILTER=BillingCycleSettingsTest
Change-Id: Ia7afc88c9043e924f205f966c4091248261b0aee
2020-04-20 12:54:43 +08:00
Julia Reynolds
b84e194474 Update configure notifications screen am: f43cf08634
Change-Id: Idc63949ef2f2ecaaae7891a01d6eb48cbf830eaa
2020-04-17 20:58:04 +00:00
Julia Reynolds
cecc69512d Update conversation bubble settings
Test: atest
Fixes: 153471239
Change-Id: If53571b17236e5f49a1750acc9816287f5de2b1a
2020-04-17 16:32:44 -04:00
Julia Reynolds
f43cf08634 Update configure notifications screen
Test: atest
Bug: 153150072
Change-Id: I99ebe2cad5036a154c40bce54dbd6ddbd23c2323
2020-04-17 12:47:06 -04:00
TreeHugger Robot
e1e61d67b0 Merge "Fix incorrect app count displayed under special app access" into rvc-dev am: 87883c7634
Change-Id: Ie8fa7609ffaf252d012cdbf54d758ed20f5e06e9
2020-04-17 10:18:53 +00:00
TreeHugger Robot
87883c7634 Merge "Fix incorrect app count displayed under special app access" into rvc-dev 2020-04-17 10:07:21 +00:00
Yanting Yang
e611ebfb33 Merge "Do not generate copyable slices for Settings Search" into rvc-dev am: 674e2c23a3
Change-Id: I23093ff82e7a4b5e51570653d1dfa015f09da675
2020-04-17 09:26:42 +00:00
Yanting Yang
674e2c23a3 Merge "Do not generate copyable slices for Settings Search" into rvc-dev 2020-04-17 09:06:28 +00:00
Yanting Yang
b6c30a2c31 Do not generate copyable slices for Settings Search
Copyable slices is to provide user a quickly sub-text copying way on
Settings Search. Since we plan to remove all sub-text from Settings
Search, the copying feature is no longer available.

Therefore, we don't need to generate copyable slices in Settings
anymore.

Impact search result:
Build number, Phone number, Hardware version, Serial number and IMEI

Bug: 143118037
Test: visual and robotests
Change-Id: I81474aed994678c42d73cc59e169573880de1378
2020-04-17 13:25:22 +08:00
Tom Hsu
a733ead043 Merge "Fix failures on com.android.settings.network.ApnEditorTest" into rvc-dev am: 7c84dc9959
Change-Id: Ifd84da0751b08efa551bcde8a3d7a2c21b2e4f20
2020-04-17 04:22:28 +00:00
Tom Hsu
7c84dc9959 Merge "Fix failures on com.android.settings.network.ApnEditorTest" into rvc-dev 2020-04-17 04:01:10 +00:00
Zhen Zhang
987a70e750 Merge "[Settings] Fix crashes caused by null bluetooth adapter and ethernet manager" into rvc-dev am: 7e3e5dfa06
Change-Id: If882edbe92b6efa5407be82528664b80f20d3e3f
2020-04-17 03:05:22 +00:00
Weilun Du
f8757b7112 [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
(cherry picked from commit 08e95d0db0)
2020-04-16 16:56:28 -07:00
tom hsu
969a6a613c Fix failures on com.android.settings.network.ApnEditorTest
Bug: 152376182
Test: make RunSettingsRoboTests
Change-Id: Ib718a4ed0163e07be748857a0dc7b2af92036c3f
2020-04-17 03:45:40 +08:00
TreeHugger Robot
8f39c1380c Merge "Fallback to AOSP emergency info if the original intent is broken" into rvc-dev am: afbf9e60c0
Change-Id: I921ee0886440878a8ec0c231cb511019148be8f5
2020-04-16 16:16:16 +00:00
TreeHugger Robot
afbf9e60c0 Merge "Fallback to AOSP emergency info if the original intent is broken" into rvc-dev 2020-04-16 16:01:43 +00:00
Julia Reynolds
f1801907d8 Merge "Launch subscreens with the correct user" into rvc-dev am: 0c99ecaec1
Change-Id: I40f34bf9f15c76ad1474a8d6096d47027d37b13a
2020-04-16 14:12:27 +00:00
Julia Reynolds
0c99ecaec1 Merge "Launch subscreens with the correct user" into rvc-dev 2020-04-16 13:57:50 +00:00
Sunny Shao
d63c5ebff5 Fix incorrect app count displayed under special app access
- This special app Google Play services will change its hasLauncherEntry
  value after receiving the MSG_LOAD_LAUNCHER.
- Update the summary while SpecialAppAccessPreferenceController is
  receiving the onLauncherInfoChanged callback.

Fixes: 150480524
Test: manual test
Change-Id: I26b99fce54606644ee5603b4ca4730267c0f7ce5
2020-04-16 21:38:03 +08:00
TreeHugger Robot
8142527b35 Merge "Support another new intent for mainline module intent" into rvc-dev am: 158bbe17f3
Change-Id: Ibeb68b99a9c40bc61edc9706d596809d0c11e4f0
2020-04-16 11:15:44 +00:00
TreeHugger Robot
158bbe17f3 Merge "Support another new intent for mainline module intent" into rvc-dev 2020-04-16 11:03:19 +00:00
Tsung-Mao Fang
54150c9942 Support another new intent for mainline module intent
Mainline module team would like to create a new intent to support v2 UX.
In Settings side, if we found system supports this intent,
then we should navigate user to new place.

Test: Run robo test
Fix: 151189987
Change-Id: If4b437236b70c83a1f29a5c3d9e322178c8a6ec6
2020-04-16 17:35:38 +08:00
Tsung-Mao Fang
b3bb7a0237 Fallback to AOSP emergency info if the original intent is broken
If the variant of emergency info is broken, we should try to show
AOSP emergency info instead.

Test: Rebuilt rom and see the Ui. Run robo test
Fix: 154114259
Change-Id: I5bc3f6cbf9102a7b7299c3edf718a58101effbf8
2020-04-16 17:23:52 +08:00
tim peng
4d97cc4e8e Merge "Incorrect panel layout after rotation" into rvc-dev am: ea3a83e288
Change-Id: Ia96f690a596633fab838eac2c5be99eec92508fc
2020-04-16 06:37:06 +00:00
tim peng
ea3a83e288 Merge "Incorrect panel layout after rotation" into rvc-dev 2020-04-16 06:10:15 +00:00
Julia Reynolds
e3cb4f094e Launch subscreens with the correct user
Test: atest
Fixes: 153556621
Change-Id: I5f3f0f408dc8e50db1762b1ce93f7748ea6332b0
2020-04-15 17:36:11 -04:00
TreeHugger Robot
10052a54ab Merge "Update flows for notification history" into rvc-dev am: 79a38a733f
Change-Id: Iad8a918c924115a7cbd04fa160dcf7be9a68fee8
2020-04-15 17:41:53 +00:00
TreeHugger Robot
79a38a733f Merge "Update flows for notification history" into rvc-dev 2020-04-15 17:32:47 +00:00
Calvin Pan
106c2d210d Merge "Add missing NR network mode in setPreferenceValueAndSummary" into rvc-dev am: 0758056d04
Change-Id: I32dd168ae94fa39923e373a0b25a8012998e2c45
2020-04-15 17:28:40 +00:00
TreeHugger Robot
65353e9dfe Merge "Fix breadcrumb for the search results of Custom restrictions page" into rvc-dev am: 82282b48cf
Change-Id: I7c13a0f6adeda0689911848c799a551f27971b99
2020-04-15 17:28:17 +00:00
PETER LIANG
4c7a690479 Merge "Revising the function name related to user shortcut type." into rvc-dev am: eb04ef4f75
Change-Id: I0f135b960440a997116e3cb6e79b2d5380cb7aad
2020-04-15 17:26:37 +00:00
Rubin Xu
b87ed9fac5 Merge "Improve work profile unification flow" into rvc-dev am: 81d8664d81
Change-Id: I17cc8fb5d338336c091f6620cc015880efb0c83b
2020-04-15 17:25:43 +00:00
TreeHugger Robot
00fea22696 Merge "[5G settings UI] add UI for the 5G limited VoLTE dialog" into rvc-dev am: 566d9f49bd
Change-Id: I3f3840b14f62be6badf1d0bd816327fb267e005c
2020-04-15 17:23:15 +00:00
TreeHugger Robot
6c2c780fd8 Merge "Revert "Don't write user_switcher_enabled value when enter this Settings"" into rvc-dev am: e13a54c438
Change-Id: Iff4980697cc6748777bf491f0d74e4aa7a1fde5b
2020-04-15 17:17:31 +00:00
TreeHugger Robot
9625a5ed1f Merge "Refactor the OpenSupportedLinks" into rvc-dev am: ccb37bb8d1
Change-Id: I298c67ecb36a20b733387ffdd88e5353c4445fdf
2020-04-15 17:00:26 +00:00
Calvin Pan
0758056d04 Merge "Add missing NR network mode in setPreferenceValueAndSummary" into rvc-dev 2020-04-15 14:32:18 +00:00
TreeHugger Robot
82282b48cf Merge "Fix breadcrumb for the search results of Custom restrictions page" into rvc-dev 2020-04-15 13:30:33 +00:00