PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
75,264 Commits 1 Branch 0 Tags
22e18a86cc952c76aed2e6c3965d5c66582316ac
Commit Graph

75264 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
SongFerngWang
22e18a86cc [Testing] To migration NetworkScorerPickerPreferenceControllerTest 
1. Use AndroidJunit4 instead of RobolectricTestRunner
2. Use ApplicationProvider instead of RuntimeEnvironment to get context
3. Change Copy Right
4. Add a function which loads the Settings Resource.

Diff: https://diff.googleplex.com/#key=81Ufa1AWkLAi
Bug: 172047348
Test: atest -c NetworkScorerPickerPreferenceControllerTest
Change-Id: I9c1a4f957b92ab572eadbd8a0804bdc83608230b
 2020-10-30 13:34:22 +00:00
Bonian Chen
d682b2cc57 Merge "[Settings] Only display 1 SIM UI when multiple with same group UUID" 2020-10-21 08:37:37 +00:00
SongFerng Wang
c023d49669 Merge "To fix bug, summary is wrong if nr_enabled_bool=false" into rvc-qpr-dev am: 3e5defe561 am: 9493731935 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12875667

Change-Id: I3b06b785b0ae6d907f7cd6f09d7830c5b8cdb0c3
 2020-10-21 08:36:22 +00:00
SongFerng Wang
9493731935 Merge "To fix bug, summary is wrong if nr_enabled_bool=false" into rvc-qpr-dev am: 3e5defe561 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12875667

Change-Id: I2b69a34d035e70cbc1bea9a2482be876eeabda66
 2020-10-21 08:19:13 +00:00
SongFerng Wang
3e5defe561 Merge "To fix bug, summary is wrong if nr_enabled_bool=false" into rvc-qpr-dev 2020-10-21 08:05:48 +00:00
Bonian Chen
a6b249d625 [Settings] Only display 1 SIM UI when multiple with same group UUID 
Some carrier(s) expand their service through providing eSIM in companion
with pSIM. Group UUID is designed to group them together as an single
SIM.

Bug: 165363542
Test: make RunSettingsRoboTests ROBOTEST_FILTER=SubscriptionsPreferenceControllerTest
Change-Id: I0934a45a2917ab106627c733162efbee9a13f216
 2020-10-21 13:31:04 +08:00
Jeremy Goldman
29c4b84312 Merge "Update JUnit test readme to include atest command." 2020-10-21 04:08:21 +00:00
Treehugger Robot
ce272a0bb0 Merge "Highlight the MMS messages preference for ACTION_MMS_MESSAGE_SETTING" am: 21846b228b am: 0a2c406023 am: d719de84c1 am: e3dd9644b6 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1405190

Change-Id: Ie12fb48d3d17f6299ecc8be2000bc8e9142275aa
 2020-10-21 04:02:19 +00:00
Treehugger Robot
e3dd9644b6 Merge "Highlight the MMS messages preference for ACTION_MMS_MESSAGE_SETTING" am: 21846b228b am: 0a2c406023 am: d719de84c1 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1405190

Change-Id: I3005a83ba8d27238d2fbd883d77b4a20432cabc6
 2020-10-21 03:53:00 +00:00
Yanting Yang
3f92484ce8 Merge "Remove subtitles for the homepage IA" 2020-10-21 03:24:31 +00:00
Treehugger Robot
d719de84c1 Merge "Highlight the MMS messages preference for ACTION_MMS_MESSAGE_SETTING" am: 21846b228b am: 0a2c406023 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1405190

Change-Id: I91608590cc7b0255706d0ea4bdc896a778e72b8b
 2020-10-21 03:21:48 +00:00
Treehugger Robot
0a2c406023 Merge "Highlight the MMS messages preference for ACTION_MMS_MESSAGE_SETTING" am: 21846b228b 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1405190

Change-Id: I195b2215ba250f7831de87d6b325560712fa8112
 2020-10-21 02:52:54 +00:00
Treehugger Robot
21846b228b Merge "Highlight the MMS messages preference for ACTION_MMS_MESSAGE_SETTING" 2020-10-21 02:40:55 +00:00
Jeremy Goldman
ce3f58cc68 Merge "Move JUnit tests not from telephony settings into legacy directory." 2020-10-21 02:25:27 +00:00
Jeremy Goldman
ce46d9be6b Update JUnit test readme to include atest command. 
Test: N/A
Change-Id: I4c4521ad8077ce120e415afe2907cc26f63e3206
 2020-10-21 02:21:54 +00:00
TreeHugger Robot
7eac52422e Merge "Fix the Wi-Fi detailed settings un-editable issue." 2020-10-21 02:07:48 +00:00
Treehugger Robot
bde04e31cd [automerger skipped] Merge "Merge redfin/bramble support." am: 7881b23f1f -s ours am: bda0c67436 -s ours am: 9d867703c5 -s ours am: f2f13ca90a -s ours 
am skip reason: Change-Id I600c63a996b1684a2b801787d88974501062c073 with SHA-1 38747f76f3 is in history

Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1465940

Change-Id: Iaafef64fa7464e64ecc985ccdeb2632745f68990
 2020-10-20 21:08:05 +00:00
Weng Su
3a45d054eb Fix the Wi-Fi detailed settings un-editable issue. 
- The WifiEntry info might not be ready in early stage. (ex:
WifiEntry#canSetPrivacy())

- The Wi-Fi detailed setting listens to the WifiEntry callback to
refresh the preferences, it should first update the preference status to
be editable or not, and then display preferences to the UI.

- The privicy preference should be able to set back to selectable when
WifiEntry#canSetPrivicy() change from false to true.

Bug: 170148009
Test:
make RunSettingsRoboTests
ROBOTEST_FILTER=WifiNetworkDetailsFragment2Test
make RunSettingsRoboTests
ROBOTEST_FILTER=WifiPrivacyPreferenceController2Test

Change-Id: I567b2b80163631a01d165c0ac5c0aba392e014ef
 2020-10-21 04:30:09 +08:00
Treehugger Robot
f2f13ca90a [automerger skipped] Merge "Merge redfin/bramble support." am: 7881b23f1f -s ours am: bda0c67436 -s ours am: 9d867703c5 -s ours 
am skip reason: Change-Id I600c63a996b1684a2b801787d88974501062c073 with SHA-1 38747f76f3 is in history

Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1465940

Change-Id: I3886e4ba36d6361c60f65e28cde49fc7dd83cd1f
 2020-10-20 20:18:23 +00:00
Treehugger Robot
9d867703c5 [automerger skipped] Merge "Merge redfin/bramble support." am: 7881b23f1f -s ours am: bda0c67436 -s ours 
am skip reason: Change-Id I600c63a996b1684a2b801787d88974501062c073 with SHA-1 38747f76f3 is in history

Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1465940

Change-Id: Ie60eb5b5524b59ab0f8b2aa4079c08a685b02577
 2020-10-20 19:34:05 +00:00
Treehugger Robot
bda0c67436 [automerger skipped] Merge "Merge redfin/bramble support." am: 7881b23f1f -s ours 
am skip reason: Change-Id I600c63a996b1684a2b801787d88974501062c073 with SHA-1 38747f76f3 is in history

Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1465940

Change-Id: I70a4a5ebc491947ec7d9205d54301eb5dc28f4b9
 2020-10-20 19:03:54 +00:00
Yanting Yang
9aa4a5463f Remove subtitles for the homepage IA 
Remove the summary of the homepage IA if silky home enabled.

Fixes: 170933968
Test: robotest & visual with turning on/off silky home
Change-Id: I502b6590cece9b80e9923109fe0582cc4d9a1c56
 2020-10-20 23:54:03 +08:00
TreeHugger Robot
58a2df3eae Merge "Import translations. DO NOT MERGE ANYWHERE" 2020-10-20 15:48:56 +00:00
Bill Yi
13afb7d70d [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 0e41e1a5d4 -s ours am: 1300825559 -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12883569

Change-Id: I9b1e907f8e193d55f6962a0fa6a7ef4618b8797a
 2020-10-20 15:32:33 +00:00
Bill Yi
1300825559 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 0e41e1a5d4 -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12883569

Change-Id: I5148aa870c196f4dc41af2fd397db38ca6a03fe9
 2020-10-20 15:26:42 +00:00
Bill Yi
8995e8b9e9 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I60fe8a4ec1b33665a298365ac74d7622825d3ba7
 2020-10-20 06:19:23 -07:00
SongFerngWang
706036e5b3 To fix bug, summary is wrong if nr_enabled_bool=false 
The carrier config nr_enabled_bool is false, preferred network mode
should hide 5G UI. This bug is that the summary show 5G item when
nr_enabled_bool is false.
Solution: if nr_enabled_bool is false, it checks capability and then
removes 5G capability of network mode.

Bug: 170460943
Test: make RunSettingsRoboTests ROBOTEST_FILTER=\
EnabledNetworkModePreferenceControllerTest   (PASS)
Change-Id: I3f7d41c196569c0cb61e89cfc270b957e2f0add5
 2020-10-20 13:07:59 +00:00
Bill Yi
0e41e1a5d4 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I28e7c337cac0995e72c01cb8349febbbe1abaf72
 2020-10-20 04:45:30 -07:00
Jeremy Goldman
f9befbb347 Move JUnit tests not from telephony settings into legacy directory. 
In order to enable the junit tests as a blocking presubmit, we want
to ensure that all tests within this directory are being actively
maintained. A number of these tests were migrated to robolectric
sometime in 2017-2018, and because they are no longer maintained this CL
moves them into a separate folder, so that they will not be included in
the presubmit.

Please verify that this is the appropriate action to take for these
tests. In the future, the settings team may decide to delete this legacy
directory entirely.

Note that AutoSelectPreferenceControllerTest.setChecked_isChecked_showProgressDialog
is currently failing, but we can fix it in a separate CL.

Test: make SettingsUnitTests && adb install -r out/target/product/shamu/testcases/SettingsUnitTests/arm64/SettingsUnitTests.apk
Change-Id: Iafc15b9ac69b5ca2fec76d3c0c7e247ea0017d49
 2020-10-20 10:21:41 +00:00
TreeHugger Robot
886fe1e6ab Merge "Revert "Modify the privacy controller to be selectable in the next updateState()"" 2020-10-20 03:20:36 +00:00
Jeremy Goldman
c52961b5b9 Merge "JUnit readme displays updated apk file location" 2020-10-20 02:48:23 +00:00
Weng Su
67f95bfd2f Revert "Modify the privacy controller to be selectable in the next updateState()" 
This reverts commit f71149911b.

Reason for revert: Some unexpected code mixed in this CL.

Change-Id: I43574314554a9c62559f529e45f69c29ba6b5a77
 2020-10-20 02:12:28 +00:00
Treehugger Robot
7881b23f1f Merge "Merge redfin/bramble support." 2020-10-19 23:20:09 +00:00
Xin Li
5734fefefa Merge redfin/bramble support. 
Bug: 171218636
Merged-In: I600c63a996b1684a2b801787d88974501062c073
Change-Id: I2d54882d98577db7f5c2a70281d626a726adf947
 2020-10-19 10:08:23 -07:00
Yi Jiang
ac76152a6b Merge "Updates screen attention preference at onStart()." 2020-10-19 16:43:21 +00:00
Andrei-Valentin Onea
786d3578d1 Merge "Add support for @EnabledSince compat changes" am: 2d57867aba am: 38747f76f3 am: 8e111e3de3 am: acfad23908 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1455019

Change-Id: I2eef4a833d3305a13aad13477fb46cf40ecd3068
 2020-10-19 15:53:58 +00:00
Andrei-Valentin Onea
acfad23908 Merge "Add support for @EnabledSince compat changes" am: 2d57867aba am: 38747f76f3 am: 8e111e3de3 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1455019

Change-Id: Iec4b14d29945ae3088838428cc48b36ae71faeb2
 2020-10-19 15:26:01 +00:00
Andrei-Valentin Onea
8e111e3de3 Merge "Add support for @EnabledSince compat changes" am: 2d57867aba am: 38747f76f3 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1455019

Change-Id: I60df429605c78749c0259f7efffab026210a4977
 2020-10-19 14:56:40 +00:00
Jason Chiu
2d047a1e2f Merge "[Injection] Refine UI behavior for icon_uri" 2020-10-19 14:50:20 +00:00
Andrei-Valentin Onea
38747f76f3 Merge "Add support for @EnabledSince compat changes" am: 2d57867aba 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1455019

Change-Id: I600c63a996b1684a2b801787d88974501062c073
 2020-10-19 14:37:30 +00:00
Andrei-Valentin Onea
2d57867aba Merge "Add support for @EnabledSince compat changes" 2020-10-19 14:19:31 +00:00
Jeremy Goldman
6e6d785c06 JUnit readme displays updated apk file location 
Test: N/A
Change-Id: I265319c726b5b5ca3e8273be0be61e1b9063e7d6
 2020-10-19 10:16:38 +00:00
Weng Su
2e49b2e639 Merge "Modify the privacy controller to be selectable in the next updateState()" 2020-10-19 09:51:23 +00:00
TreeHugger Robot
868a15350a Merge "Add string for text of bluetooth switch" 2020-10-19 09:19:42 +00:00
Jason Hsu
3a90feaa26 Merge "Set the minimum height to the CheckBox" 2020-10-19 07:28:54 +00:00
Jason Chiu
fb36be1a2f [Injection] Refine UI behavior for icon_uri 
1. Make the icon provided by the content provider override static icon.
2. Apply the background settings "bg.hint" and "bg.argb" to icon_uri.

Bug: 167568758
Test: visual, robotest
Change-Id: I44c66d8ea2686df1dfe1f9ad28645da7e21414ed
 2020-10-19 15:25:58 +08:00
Weng Su
f71149911b Modify the privacy controller to be selectable in the next updateState() 
Listen WifiEntry#onUpdated() to update preference states will be modify
in next CLs.

Bug: 170148009
Test: make RunSettingsRoboTests ROBOTEST_FILTER=WifiPrivacyPreferenceController2Test
Change-Id: I5acf096970431a0b093dd7e0968f30c1959e3b7f
 2020-10-19 14:37:03 +08:00
TreeHugger Robot
ccccc79043 Merge "Fix output switcher will show 2 media session in some use cases" 2020-10-19 04:12:50 +00:00
TreeHugger Robot
42a891460e Merge "Import translations. DO NOT MERGE ANYWHERE" 2020-10-17 22:22:51 +00:00
TreeHugger Robot
1cc8bc0cbc Merge "Import translations. DO NOT MERGE ANYWHERE" 2020-10-17 20:02:06 +00:00