Android/packages_apps_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
66,021 Commits 1 Branch 0 Tags
9e1f32a1b16b115d2f0aa5e134337dca202dbc09
Commit Graph

31819 Commits

Author SHA1 Message Date
Bonian Chen
a145956b50 Merge "[Settings] Refactor test case DataUsageSummaryPreferenceControllerTest" into rvc-dev am: 6fb4a18ded am: 67ff594c29 am: 70144aa952 am: 4ecc61dc8b 
Change-Id: I75aa3a915d801ee6ff6fd2a15f5a8fd9212588ef
 2020-04-21 09:51:22 +00:00
Alex Johnston
1533b727c6 Merge "Update Wi-Fi configs restrictions" into rvc-dev am: 56f06c59a1 am: cff2c22eb8 am: c249a00091 am: 5b7a2206a0 
Change-Id: I092eace874eaa5761655d78eb1afcf0b10c4865d
 2020-04-21 09:50:33 +00:00
Bonian Chen
70144aa952 Merge "[Settings] Refactor test case DataUsageSummaryPreferenceControllerTest" into rvc-dev am: 6fb4a18ded am: 67ff594c29 
Change-Id: I470d81f8bc4ffdb34a633b2dfb03ad9b04955ed1
 2020-04-21 09:09:12 +00:00
Alex Johnston
c249a00091 Merge "Update Wi-Fi configs restrictions" into rvc-dev am: 56f06c59a1 am: cff2c22eb8 
Change-Id: I80d08fdc22313137be796fd9cb2f82c3d95af7fe
 2020-04-21 09:09:05 +00:00
Bonian Chen
2ed42ae75c Merge "[Settings] Code refactor" into rvc-dev am: 5bc8aa7961 am: 0987923594 am: 9b2f98cb89 am: 0e262c4395 
Change-Id: I3acb6333a013d6c1ccd1c4f448479d1575e1711c
 2020-04-21 09:04:08 +00:00
Bonian Chen
0c34adf5c5 Merge "[Settings] Support of DSDS API" into rvc-dev am: 57c2df4c7c am: 05a2603d55 am: e3a90018ca am: 63d4d383a2 
Change-Id: Ibe2a9387bed1cb72029460edcb6440ea66734909
 2020-04-21 09:03:27 +00:00
Bonian Chen
67ff594c29 Merge "[Settings] Refactor test case DataUsageSummaryPreferenceControllerTest" into rvc-dev am: 6fb4a18ded 
Change-Id: I2b7f27f9a9c9e461c8ec64d241a7ccfe062fbc0f
 2020-04-21 08:56:44 +00:00
Alex Johnston
cff2c22eb8 Merge "Update Wi-Fi configs restrictions" into rvc-dev am: 56f06c59a1 
Change-Id: I5776862d5a425e2137e390c055c714f32dc25fa5
 2020-04-21 08:56:36 +00:00
Bonian Chen
6fb4a18ded Merge "[Settings] Refactor test case DataUsageSummaryPreferenceControllerTest" into rvc-dev 2020-04-21 08:48:36 +00:00
Alex Johnston
56f06c59a1 Merge "Update Wi-Fi configs restrictions" into rvc-dev 2020-04-21 08:41:10 +00:00
Bonian Chen
9b2f98cb89 Merge "[Settings] Code refactor" into rvc-dev am: 5bc8aa7961 am: 0987923594 
Change-Id: I92f68aa6ae3124b4fb496fcf77853676c628a437
 2020-04-21 08:33:32 +00:00
Bonian Chen
e3a90018ca Merge "[Settings] Support of DSDS API" into rvc-dev am: 57c2df4c7c am: 05a2603d55 
Change-Id: Ic148a5fa0d0387adebc09192d331754ecaf4e0d5
 2020-04-21 08:32:53 +00:00
Bonian Chen
0987923594 Merge "[Settings] Code refactor" into rvc-dev am: 5bc8aa7961 
Change-Id: Ibed580769fc846df8d3f6c6d58df8668bff34378
 2020-04-21 08:25:04 +00:00
Bonian Chen
5bc8aa7961 Merge "[Settings] Code refactor" into rvc-dev 2020-04-21 08:21:28 +00:00
Bonian Chen
05a2603d55 Merge "[Settings] Support of DSDS API" into rvc-dev am: 57c2df4c7c 
Change-Id: I09ceb36bc6c8e73737bdb72c7bcc65080181b7ed
 2020-04-21 08:18:04 +00:00
Xiangyu/Malcolm Chen
ee407ebaf5 Merge "Define a helper link for 5G limitation in DSDS footer." into rvc-dev am: eb27c7d94a am: 9df4b0ce58 am: d8ea2851e1 am: 2edb453bc0 
Change-Id: Id9b94a945e2bc0e7a4176239f6eb07451616bd0c
 2020-04-21 07:59:35 +00:00
Bonian Chen
5fb56d339c Merge "[Settings] Avoid from EUICC access blocking main thread" into rvc-dev am: 7606dfd931 am: 7fdf4b50b1 am: 6196951dc8 am: 66a50ccae0 
Change-Id: I43d39c9d57bfb472ff9b43d73534937480742e0c
 2020-04-21 07:59:26 +00:00
Bonian Chen
57c2df4c7c Merge "[Settings] Support of DSDS API" into rvc-dev 2020-04-21 07:55:07 +00:00
Xiangyu/Malcolm Chen
d8ea2851e1 Merge "Define a helper link for 5G limitation in DSDS footer." into rvc-dev am: eb27c7d94a am: 9df4b0ce58 
Change-Id: I20f3b93990e2bbbed9a77a62fb7011d2e8e4bafb
 2020-04-21 07:15:34 +00:00
Bonian Chen
6196951dc8 Merge "[Settings] Avoid from EUICC access blocking main thread" into rvc-dev am: 7606dfd931 am: 7fdf4b50b1 
Change-Id: Ibf44b78427d38ccd1d3d685933054c82975d7ed3
 2020-04-21 07:15:28 +00:00
Bonian Chen
dcef423720 [Settings] Refactor test case DataUsageSummaryPreferenceControllerTest 
Refactor test case of DataUsageSummaryPreferenceControllerTest

Bug: 141833767
Test: make RunSettingsRoboTests -j ROBOTEST_FILTER=DataUsageSummaryPreferenceControllerTest
Change-Id: Ieb551a32d87c53cbd0765e19e710f1f0469da9d5
 2020-04-21 15:08:27 +08:00
tim peng
199871b647 Merge "Change the wording from "Stop casting" to "Stop"" into rvc-dev am: 58f9d0c7b9 am: 434ec84186 am: ae08d2a6e0 am: 7e2f5f34be 
Change-Id: I0c7019c121a2a87a2fd52c3c15e1c12c14c97476
 2020-04-21 07:01:43 +00:00
Xiangyu/Malcolm Chen
9df4b0ce58 Merge "Define a helper link for 5G limitation in DSDS footer." into rvc-dev am: eb27c7d94a 
Change-Id: I1a56d11a7c96f970fe1b0fe929e47f165ac1df29
 2020-04-21 07:00:43 +00:00
Bonian Chen
7fdf4b50b1 Merge "[Settings] Avoid from EUICC access blocking main thread" into rvc-dev am: 7606dfd931 
Change-Id: Ia7987b7418b430b0ae85b3340f29c2b52689f7eb
 2020-04-21 07:00:34 +00:00
Xiangyu/Malcolm Chen
eb27c7d94a Merge "Define a helper link for 5G limitation in DSDS footer." into rvc-dev 2020-04-21 06:47:18 +00:00
Bonian Chen
9bc2f7f8bc [Settings] Code refactor 
Minor code refactor

Bug: 141833767
Test: make RunSettingsRoboTests -j ROBOTEST_FILTER=DataUsagePreferenceControllerTest
Change-Id: I060e7c880d91a0e5059610c5ceae319d47c19c7a
 2020-04-21 14:43:48 +08:00
Bonian Chen
7606dfd931 Merge "[Settings] Avoid from EUICC access blocking main thread" into rvc-dev 2020-04-21 06:40:40 +00:00
tim peng
ae08d2a6e0 Merge "Change the wording from "Stop casting" to "Stop"" into rvc-dev am: 58f9d0c7b9 am: 434ec84186 
Change-Id: I3fe35e36decb38d96540649025fa20e39317c1c4
 2020-04-21 06:22:27 +00:00
tim peng
434ec84186 Merge "Change the wording from "Stop casting" to "Stop"" into rvc-dev am: 58f9d0c7b9 
Change-Id: I7e9d43442830167d5764739ff64a1833de6accb0
 2020-04-21 06:09:15 +00:00
tim peng
58f9d0c7b9 Merge "Change the wording from "Stop casting" to "Stop"" into rvc-dev 2020-04-21 05:51:25 +00:00
tim peng
96f3309f58 Merge "Hide volume slider in Output Switcher when volume adjustment is restricted" into rvc-dev am: db86b2ef2a am: f864bed27e am: a50534ad62 am: 131e589a94 
Change-Id: I2efadcae636927b65fc4a8a7e2707242de1a3b35
 2020-04-21 03:33:02 +00:00
tim peng
a50534ad62 Merge "Hide volume slider in Output Switcher when volume adjustment is restricted" into rvc-dev am: db86b2ef2a am: f864bed27e 
Change-Id: I3fb1da1317942be19571153d35c133fc69110fd8
 2020-04-21 02:54:43 +00:00
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
4fe1de57a5 Change the wording from "Stop casting" to "Stop" 
-The string is freezed. Reuse current "Stop" string

Bug: 153705889
Test: make -j42 RunSettingsRoboTests
Change-Id: I39184dcbfda5937677ab171a66ad5dcbbb8e6b68
 2020-04-21 10:22:15 +08: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
fdb2d434ff Merge "Add check of canConnectTo5GInDsds to show NrDisabledInDsdsFooter" into rvc-dev am: 9674276bb5 am: 8ca377ffd4 am: d781fe860c am: 4d35849139 
Change-Id: Ibefe3cd3e37ebe3ae3f1b5f5d7044d50fd9d7e53
 2020-04-20 20:40:32 +00:00
Xiangyu/Malcolm Chen
d781fe860c Merge "Add check of canConnectTo5GInDsds to show NrDisabledInDsdsFooter" into rvc-dev am: 9674276bb5 am: 8ca377ffd4 
Change-Id: Iadec916a916cfc93147c68fa243a5f21f346dabe
 2020-04-20 19:47:57 +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
Malcolm Chen
80be9de6d0 Define a helper link for 5G limitation in DSDS footer. 
Bug: 152786064
Test: manual
Change-Id: I5a02f847531988217cc6ab47e3b35ed319c1027c
 2020-04-20 19:12: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
47f216d234 Merge "Set explicit back target for history" into rvc-dev am: bb979153ed am: 4fa251613e am: d81714214b am: f4dabba6e3 
Change-Id: Id3e85b99c55e7de2990e66804b22616c93ad5161
 2020-04-20 18:45:12 +00:00
Julia Reynolds
d81714214b Merge "Set explicit back target for history" into rvc-dev am: bb979153ed am: 4fa251613e 
Change-Id: I8e5a6417cf5ac57faa0e8378d41d0e65ea1b95b4
 2020-04-20 18:11:50 +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
jasonwshsu
b59175a5a3 Remove unused attribute 'EXTRA_SUMMARY_RES' am: 1be2666d11 am: e7766cc455 am: b25cd33e39 am: 86125faa38 
Change-Id: I2b40e454750f7a6d62696b30a9e4fc96133882d4
 2020-04-20 17:43:01 +00:00
Julia Reynolds
bb979153ed Merge "Set explicit back target for history" into rvc-dev 2020-04-20 17:40:18 +00:00
jasonwshsu
b25cd33e39 Remove unused attribute 'EXTRA_SUMMARY_RES' am: 1be2666d11 am: e7766cc455 
Change-Id: I833a26326c9c30269ee07eab6fe9ba58ffceaa00
 2020-04-20 17:02:56 +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
4b34bd1c31 Merge "Update conversation bubble settings" into rvc-dev am: 608bd69328 am: a8bb57287c am: 075f8a5256 am: f889af8b16 
Change-Id: I962e75a1cea26798f692ce4afd09b5394829dbd9
 2020-04-20 14:45:31 +00:00