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

60847 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
TreeHugger Robot
2a5213f207 Merge "Update ZenModeSettingsTest" into rvc-dev am: 0ff0929e0f 
Change-Id: I6cd9a171153e7cef2473a134fa4f922c1a7ebefd
 2020-04-21 14:31:09 +00:00
TreeHugger Robot
0ff0929e0f Merge "Update ZenModeSettingsTest" into rvc-dev 2020-04-21 14:12:15 +00:00
Beverly
d796da16f0 Update ZenModeSettingsTest 
String was updated

Test: make ROBOTEST_FILTER=ZenModeSettingsTest RunSettingsRoboTests
Fixes: 154568594
Change-Id: Ia67f7ff2e3692cc4f40b87e94e3d3952002a9e87
 2020-04-21 09:31:16 -04:00
Pavel Grafov
8d8eb618e7 Merge "Stop disabling wifi toggle when tethering is restricted" into rvc-dev am: 9341983324 
Change-Id: Ia3a28b881005c732d0158890b68de22d97703068
 2020-04-21 10:52:43 +00:00
Pavel Grafov
9341983324 Merge "Stop disabling wifi toggle when tethering is restricted" into rvc-dev 2020-04-21 10:40:12 +00:00
Jason Hsu
d31f5d58d8 Merge "Show default description only if description and html description are empty" into rvc-dev am: 0055a74794 
Change-Id: I4a4fa05ec2f2a1a6aa615030a446d46ef9065caf
 2020-04-21 09:44:20 +00:00
TreeHugger Robot
aade7d4eb2 Merge "[Wi-Fi] Show not show Wi-Fi edit UI for never connected open Wi-Fi networks" into rvc-dev am: 8a80769a7e 
Change-Id: If95a32057db5aa8bfb9f6cd3c3896333c6b9cc84
 2020-04-21 09:42:21 +00:00
Jason Hsu
0055a74794 Merge "Show default description only if description and html description are empty" into rvc-dev 2020-04-21 09:41:15 +00:00
TreeHugger Robot
8a80769a7e Merge "[Wi-Fi] Show not show Wi-Fi edit UI for never connected open Wi-Fi networks" into rvc-dev 2020-04-21 09:20:52 +00:00
Bonian Chen
f09a56e322 Merge "[Settings] Refactor test case DataUsageSummaryPreferenceControllerTest" into rvc-dev am: 6fb4a18ded 
Change-Id: I6d8e2ed82aba6c03763128d311de5b9d7b42f1c0
 2020-04-21 08:57:45 +00:00
Alex Johnston
cdc42618c9 Merge "Update Wi-Fi configs restrictions" into rvc-dev am: 56f06c59a1 
Change-Id: Iee667169f8b996270611ca5e53f71c6e7065734d
 2020-04-21 08:57:40 +00:00
TreeHugger Robot
cc468908f4 Merge "Ignore a lot of failed roboletric test cases" into rvc-dev am: a10969bfc5 
Change-Id: I9d4529017b38ff89746d496553f4179e3564fd38
 2020-04-21 08:57:30 +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
TreeHugger Robot
a10969bfc5 Merge "Ignore a lot of failed roboletric test cases" into rvc-dev 2020-04-21 08:35:09 +00:00
Bonian Chen
c1eb5bf440 Merge "[Settings] Code refactor" into rvc-dev am: 5bc8aa7961 
Change-Id: Ie76ffbf51abd1550f40a053d32e2dc65afac6cf9
 2020-04-21 08:25:47 +00:00
Bonian Chen
5bc8aa7961 Merge "[Settings] Code refactor" into rvc-dev 2020-04-21 08:21:28 +00:00
Bonian Chen
ab0c02393e Merge "[Settings] Support of DSDS API" into rvc-dev am: 57c2df4c7c 
Change-Id: I54de1254ccb967fc40d1b3533b67d725feb0baa7
 2020-04-21 08:18:28 +00:00
Arc Wang
205b585cf3 [Wi-Fi] Show not show Wi-Fi edit UI for never connected open Wi-Fi networks 
When users click a Wi-Fi network and it's
WifiConfiguration.getNetworkSelectionStatus().hasEverConnected()
is false, WifiSettings2 will launch the Wi-Fi edit UI for users
to edit password again.
It's not necessary to show the Wi-Fi edit UI if the Wi-Fi network
is a open network.

Bug: 154548505
Test: manual
      Click a never connected secure Wi-Fi and edit UI shows.
      Click a never connected open Wi-Fi and edit UI does not show.
Change-Id: Ie8489aff001942f92fbfaafd772f84b1b4a09cf4
 2020-04-21 16:04:03 +08:00
Bonian Chen
57c2df4c7c Merge "[Settings] Support of DSDS API" into rvc-dev 2020-04-21 07:55:07 +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
Xiangyu/Malcolm Chen
88bf3999d1 Merge "Define a helper link for 5G limitation in DSDS footer." into rvc-dev am: eb27c7d94a 
Change-Id: I1123f2c8bf6a4bbc6fe2a4c84813446fc9df3eef
 2020-04-21 07:01:26 +00:00
Bonian Chen
5b6c7a976e Merge "[Settings] Avoid from EUICC access blocking main thread" into rvc-dev am: 7606dfd931 
Change-Id: I3b9f0c36b51c1a27976e3d40aaaec257c137f256
 2020-04-21 07:01:17 +00:00
Sunny Shao
5094248487 Ignore a lot of failed roboletric test cases 
Bug: 154568213
Bug: 154568594
Bug: 154567856
Bug: 154566065
Bug: 154566012
Bug: 154566007
Bug: 154564960
Bug: 154564366
Bug: 154564361
Bug: 154564994
Bug: 154563784
Bug: 154564243
Bug: 154563562
Bug: 154564136
Bug: 154564211
Bug: 154563778
Bug: 154563910
Bug: 154562715
Bug: 154563116
Bug: 154562264
Bug: 154562785
Bug: 154563290
Bug: 154561690
Bug: 154562361
Bug: 154560878
Bug: 154560145
Test: make RunSettingsRoboTests
Change-Id: I220540d519b222ad7d3b69070a9262bb25f22d23
 2020-04-21 15:00:30 +08: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
c118a89a68 Merge "Change the wording from "Stop casting" to "Stop"" into rvc-dev am: 58f9d0c7b9 
Change-Id: Ie53b603df317bbc96d64d0796551745f3754bce9
 2020-04-21 06:10:05 +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
ab1a5a5fa0 Merge "Hide volume slider in Output Switcher when volume adjustment is restricted" into rvc-dev am: db86b2ef2a 
Change-Id: Ia7455d79077b2cc0ec08916bdc66cb30e6ea4616
 2020-04-21 02:34:26 +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
jasonwshsu
f74c0a72b6 Show default description only if description and html description are empty 
* AccessibilitySettings only get the description to pass to the
ToggleFeaturePreferenceFragment
* ToggleFeaturePreferenceFragment handle the default description logic

Bug: 154092127
Test: make -j64 RunSettingsRoboTests ROBOTEST_FILTER="com.android.settings.accessibility.AccessibilitySettingsTest"
Change-Id: I516a393aeef1472ca5d185d477a2b0b108fc5342
 2020-04-21 01:34:22 +00:00
Brad Ebinger
aa1ca9c180 [automerger skipped] Merge "Change to Contact Discovery Dialog Language based on Privacy Feedback" am: a7bf6a3046 am: f82153c3ec -s ours 
am skip reason: Change-Id Iadc46ac18c1ec8e63cfe0d4d162e7222bfbc9a12 with SHA-1 de2ffe1f16 is in history

Change-Id: Ia23bb55900200ca47b093aead2430e06fc9126a0
 2020-04-20 21:29:31 +00:00
Brad Ebinger
52cb98cac1 [automerger skipped] Merge "Set the CHAR_LIMIT to 110 in order to support more translations." am: a9295ea648 am: 2c60eb8851 -s ours 
am skip reason: Change-Id Ia71c87b47ed8b5b738f6d5a9b2693e7943f6797c with SHA-1 95aeac6790 is in history

Change-Id: Iade0e884c0b5e98704e6892b1cbbd66b0d3d9c36
 2020-04-20 21:29:23 +00:00
Brad Ebinger
f82153c3ec Merge "Change to Contact Discovery Dialog Language based on Privacy Feedback" am: a7bf6a3046 
Change-Id: I765918f1712bb80006a3d0751a84477a94c2d432
 2020-04-20 21:06:10 +00:00
Brad Ebinger
2c60eb8851 Merge "Set the CHAR_LIMIT to 110 in order to support more translations." am: a9295ea648 
Change-Id: I1d6e0324ee8db02a75e3f14ebfe24fad369b0bd2
 2020-04-20 21:04:14 +00:00
Brad Ebinger
a7bf6a3046 Merge "Change to Contact Discovery Dialog Language based on Privacy Feedback" 2020-04-20 20:40:50 +00:00
Brad Ebinger
a9295ea648 Merge "Set the CHAR_LIMIT to 110 in order to support more translations." 2020-04-20 20:40:02 +00:00
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
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
Brad Ebinger
6b87fa6705 Set the CHAR_LIMIT to 110 in order to support more translations. 
Increase the CHAR_LIMIT for contact_discovery_opt_in_summary.

Fixes: 153376000
Fixes: 150941009
Test: manual
Merged-In: Ia71c87b47ed8b5b738f6d5a9b2693e7943f6797c
Change-Id: Ia71c87b47ed8b5b738f6d5a9b2693e7943f6797c
 2020-04-20 12:08:58 -07:00
Brad Ebinger
f6a1184c0f Change to Contact Discovery Dialog Language based on Privacy Feedback 
Fixes: 153376820
Bug: 141950843
Test: verify text
Merged-In: Iadc46ac18c1ec8e63cfe0d4d162e7222bfbc9a12
Change-Id: Iadc46ac18c1ec8e63cfe0d4d162e7222bfbc9a12
 2020-04-20 19:08:07 +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