Commit Graph

60800 Commits

Author SHA1 Message Date
Xiangyu/Malcolm Chen
f181589b71 Merge "Add check of canConnectTo5GInDsds to show NrDisabledInDsdsFooter" into rvc-dev am: 9674276bb5
Change-Id: I2e35616ac335cfb257d2de74ac83582f3b6019fb
2020-04-20 19:28:16 +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
44aed00a26 Merge "Set explicit back target for history" into rvc-dev am: bb979153ed
Change-Id: Ic0b76edf0c67693ac0563ce1b8bdc0f69ffcf17e
2020-04-20 17:54:44 +00:00
Julia Reynolds
bb979153ed Merge "Set explicit back target for history" into rvc-dev 2020-04-20 17:40:18 +00:00
jasonwshsu
615a2398fe Remove unused attribute 'EXTRA_SUMMARY_RES' am: 1be2666d11
Change-Id: Ia03258348afbbdf9549c1fadd4038be75ced45c0
2020-04-20 16:44:31 +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
7f486ec9d7 Merge "Update conversation bubble settings" into rvc-dev am: 608bd69328
Change-Id: I722abcb6f7b6be50ddbb8997e48bf6bf4f218e47
2020-04-20 13:39:23 +00:00
Julia Reynolds
608bd69328 Merge "Update conversation bubble settings" into rvc-dev 2020-04-20 13:16:57 +00:00
TreeHugger Robot
e0311ea5bc Merge "Make ActionDisabledByAdminDialog can adopt selected font" into rvc-dev am: 12a838d1f6
Change-Id: Ib0a2f2c1dd9ea3f08133e5989372db04d2c0fb17
2020-04-20 06:41:38 +00:00
Bonian Chen
9f4efa0ea2 Merge "[DataUsage] UX enhancement" into rvc-dev am: d9dadc0511
Change-Id: I613fbf2dc6e744958065f05f9fb392ddc9e1af36
2020-04-20 06:41:27 +00:00
TreeHugger Robot
12a838d1f6 Merge "Make ActionDisabledByAdminDialog can adopt selected font" into rvc-dev 2020-04-20 06:39:46 +00:00
Bonian Chen
d9dadc0511 Merge "[DataUsage] UX enhancement" into rvc-dev 2020-04-20 06:24:12 +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
TreeHugger Robot
0d54da879e [automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: 517dfeb385 -s ours
am skip reason: subject contains skip directive

Change-Id: I02b63a18f678d09f504f5c89266e3b99d48b5d42
2020-04-19 16:30:06 +00:00
TreeHugger Robot
517dfeb385 Merge "Import translations. DO NOT MERGE" into rvc-dev 2020-04-19 15:48:36 +00:00
Bill Yi
1b87a5528c Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Change-Id: I01bde29a6ada6179c207cf2f0f6bde1a8dbffceb
2020-04-19 01:38:42 -07:00
Bill Yi
12980747a1 [automerger skipped] Import translations. DO NOT MERGE am: f6f96f8a85 -s ours am: 90cce123e5 -s ours
am skip reason: subject contains skip directive

Change-Id: Idb464788b9d8897e3263967235b85b809a3b333f
2020-04-19 08:24:02 +00:00
Bill Yi
90cce123e5 [automerger skipped] Import translations. DO NOT MERGE am: f6f96f8a85 -s ours
am skip reason: subject contains skip directive

Change-Id: I3e5cce528fa6eccc7e7de29516b96e54cfddddb1
2020-04-19 08:05:02 +00:00
Bill Yi
f6f96f8a85 Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Change-Id: Ia460d84145b5e6f1ff7a4fb93ad34510ed1a6800
2020-04-18 22:28:22 -07:00
Julia Reynolds
9cbee26069 Update configure notifications screen am: f43cf08634
Change-Id: I1892d5d51bbf24ab2109e841c649a578de78500d
2020-04-17 20:59:37 +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
4deaf56720 Merge "Fix incorrect app count displayed under special app access" into rvc-dev am: 87883c7634
Change-Id: I8e9c0ce77944b57245ca25e3fe00bf427e061cd4
2020-04-17 10:19:04 +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
47e38c8260 Merge "Do not generate copyable slices for Settings Search" into rvc-dev am: 674e2c23a3
Change-Id: I08128e064ed1e31c162f990f018ce272bf528f48
2020-04-17 09:26:51 +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
68f1de2a53 Merge "Fix failures on com.android.settings.network.ApnEditorTest" into rvc-dev am: 7c84dc9959
Change-Id: I3f950f8a09bc89fe6769206ac5d2d2c1e2648478
2020-04-17 04:22:44 +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
5d6960e996 Merge "[Settings] Fix crashes caused by null bluetooth adapter and ethernet manager" into rvc-dev am: 7e3e5dfa06
Change-Id: Icf8bd0a19597127e27b6b736123143dc431fbabf
2020-04-17 03:05:33 +00:00
Zhen Zhang
7e3e5dfa06 Merge "[Settings] Fix crashes caused by null bluetooth adapter and ethernet manager" into rvc-dev 2020-04-17 02:56:50 +00:00
Edgar Wang
25a0edfb7c Merge "Remove duplicated search index data of "Live Caption"" into rvc-dev am: 2b01f9ba7d
Change-Id: Ied0879d5228de1061d4c0cf931be2bcd7ec05b58
2020-04-17 02:13:43 +00:00
Edgar Wang
2b01f9ba7d Merge "Remove duplicated search index data of "Live Caption"" into rvc-dev 2020-04-17 01:53:00 +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
Eugene Susla
c3694e0673 Merge "Implement auto revoke user whitelist intent handler" into rvc-dev am: ff8b793427
Change-Id: If3c06332beb2aec7658af48afd5354e4aa5fe050
2020-04-16 23:12:05 +00:00
Eugene Susla
ff8b793427 Merge "Implement auto revoke user whitelist intent handler" into rvc-dev 2020-04-16 22:52:45 +00: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
8f6de85b27 Merge "Fallback to AOSP emergency info if the original intent is broken" into rvc-dev am: afbf9e60c0
Change-Id: I21981e1ceb800febebd1f4e5d819ea4831eb3896
2020-04-16 16:16:22 +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
27d039315f Merge "Launch subscreens with the correct user" into rvc-dev am: 0c99ecaec1
Change-Id: I739234dc3861dba8de2502424dbca9ee454c5b50
2020-04-16 14:12:43 +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
3ca1b39596 Merge "Support another new intent for mainline module intent" into rvc-dev am: 158bbe17f3
Change-Id: I483ba72fa1243efd2822b778b1621a431df200e3
2020-04-16 11:15:56 +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
Menghan Li
1d2d72a716 Merge "Refines animation for caption preferences tutorial" into rvc-dev am: 5970337d26
Change-Id: Ib29cdca795c1b9432d0b377ed2fff2d269e2da3f
2020-04-16 06:37:26 +00:00
tim peng
93b092fff8 Merge "Incorrect panel layout after rotation" into rvc-dev am: ea3a83e288
Change-Id: Ice66c6c264c880246dbeec4e072fa1f902294fcb
2020-04-16 06:37:19 +00:00
Menghan Li
5970337d26 Merge "Refines animation for caption preferences tutorial" into rvc-dev 2020-04-16 06:25:03 +00:00