PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
98,955 Commits 1 Branch 0 Tags
d42db7ebbf2bc923677f35e1e1ef2a967e3fc38d
Commit Graph

15259 Commits

Author SHA1 Message Date
Hugh Chen
be094163b8 RESTRICT AUTOMERGE Fix make Bluetooth discoverable without additional permission am: 58d81fbbb4 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16130956

Change-Id: I6572efe48fb0ad0159e0177459d1929aaa4f86ce
 2021-11-09 07:24:27 +00:00
TreeHugger Robot
8072964193 Merge "RESTRICT AUTOMERGE Fix make Bluetooth discoverable without additional permission" into sc-v2-dev 2021-11-09 06:58:39 +00:00
Julia Reynolds
b106377155 Add ability to force rebuild list 
So that you can change between filters that
have the same sort order.

Test: robotests, manually switch between notifications (off) to
notifications (all)
Fixes: 169943424

Change-Id: I62bbe90f30abada2ec342487a1fa420e451b3caf
 2021-11-08 15:47:51 -05:00
TreeHugger Robot
bf6c779caa Merge "Fix broken tests" 2021-11-08 17:16:46 +00:00
TreeHugger Robot
7e94a9ff62 Merge "Check if pref is disabled by admin" into sc-v2-dev am: 87b3974dfd am: cd467e99d8 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16199770

Change-Id: Ib57d1de7591e1429440f746839078594fd97dfef
 2021-11-08 16:50:47 +00:00
TreeHugger Robot
cd467e99d8 Merge "Check if pref is disabled by admin" into sc-v2-dev am: 87b3974dfd 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16199770

Change-Id: I670cde971b45484e54b951a90e507acc7ef0c1dc
 2021-11-08 16:34:32 +00:00
Julia Reynolds
dc18e85e41 Fix broken tests 
Remove group conditions - we don't have a group page
and so don't need to test what its header would be

Test: this
Fixes: 201021319
Change-Id: I22049bc7ea2153a574ed5aa5428a5dfb295447a5
 2021-11-08 16:16:48 +00:00
Julia Reynolds
42896d7fe1 Check if pref is disabled by admin 
Test: robotests
Fixes: 137638270
Change-Id: I39953d5b7466281cff7a9a7ffaeb5ba99ab12934
 2021-11-05 18:07:58 +00:00
TreeHugger Robot
a63e7c7141 Merge "Revert "[Settings] Ignore failed test case"" 2021-11-05 13:47:20 +00:00
YUKAI HUNG
8d70e92bff Revert "[Settings] Ignore failed test case" 
This reverts commit 7cc1c69db5.

Reason for revert: test whether is can be passed or not

Change-Id: I08c538f1b5be0a5cfe299d1c9c0affb801b34dc2
 2021-11-04 22:12:19 +00:00
Weng Su
a27167dbd8 Remove ACCESS_COARSE_LOCATION permission checking 
- The calling package needs ACCESS_FINE_LOCATION permission to get WiFi
result data.

- The ACCESS_COARSE_LOCATION permission is not allowed.

Bug: 185126813
Test: manual test
make RunSettingsRoboTests ROBOTEST_FILTER=WifiDialogActivityTest

Change-Id: I2c9013a74d173066270b422ae2179b0d1018f2d7
 2021-11-05 01:36:13 +08:00
TreeHugger Robot
a6566fe3d7 Merge "Remove the text for untethered bt device" into sc-v2-dev am: 8118b9ff29 am: ac476ff63b 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16170316

Change-Id: Icf3de5a331dc58c0a815e8a0602b8fc69ccd3615
 2021-11-04 04:48:27 +00:00
TreeHugger Robot
ac476ff63b Merge "Remove the text for untethered bt device" into sc-v2-dev am: 8118b9ff29 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16170316

Change-Id: I89ae3ac6b59ff776e745c5885f03ff529f9c7677
 2021-11-04 04:25:46 +00:00
TreeHugger Robot
8118b9ff29 Merge "Remove the text for untethered bt device" into sc-v2-dev 2021-11-04 04:08:45 +00:00
TreeHugger Robot
a5bae59374 Merge "Add package name check for the calling app" into sc-v2-dev am: 12b7fd54ec am: 631c67dc8e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16062219

Change-Id: I7322c5f293cb90e50c5f402004113777119361cc
 2021-11-04 03:24:33 +00:00
TreeHugger Robot
f34c14d147 Merge "To use the getLaunchedFromPackage to get the actual package name" into sc-v2-dev am: 3b84fd462f am: d7bd386313 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16062214

Change-Id: I42bb1bc4fcfe2d964935f5fe1ccaa5d1409aac77
 2021-11-04 03:24:26 +00:00
TreeHugger Robot
631c67dc8e Merge "Add package name check for the calling app" into sc-v2-dev am: 12b7fd54ec 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16062219

Change-Id: I248616eaed0c9c3d19612d702b97e851f1847e2a
 2021-11-04 03:07:48 +00:00
TreeHugger Robot
d7bd386313 Merge "To use the getLaunchedFromPackage to get the actual package name" into sc-v2-dev am: 3b84fd462f 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16062214

Change-Id: Iec793d2d8f629bcb5d92cccf889e919db6450f54
 2021-11-04 03:07:40 +00:00
TreeHugger Robot
12b7fd54ec Merge "Add package name check for the calling app" into sc-v2-dev 2021-11-04 03:01:33 +00:00
Hugh Chen
ab3a70cf1e Remove the text for untethered bt device 
Bug: 204066796
Test: make -j64 RunSettingsRoboTests
Change-Id: I35fec4ff998332e6937fc9c360ea488b35b477f8
 2021-11-04 02:52:37 +00:00
TreeHugger Robot
3b84fd462f Merge "To use the getLaunchedFromPackage to get the actual package name" into sc-v2-dev 2021-11-04 02:51:01 +00:00
Jason Chiu
999a467e7c Merge "Search experience improvement for large screen" into sc-v2-dev am: 80dd47633c am: 3b3203cd50 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16101571

Change-Id: I65dd85d6ab63588900d367b52ec927a7cd9fa534
 2021-11-03 12:34:57 +00:00
Jason Chiu
3b3203cd50 Merge "Search experience improvement for large screen" into sc-v2-dev am: 80dd47633c 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16101571

Change-Id: Ib9b823860dc063f1295d329491c0f8c7f99a4d89
 2021-11-03 12:23:46 +00:00
Jason Chiu
80dd47633c Merge "Search experience improvement for large screen" into sc-v2-dev 2021-11-03 12:08:35 +00:00
Jason Chiu
e427cc6752 Search experience improvement for large screen 
- Support fragment and direct link in SearchResultTrampoline
- Start activity for SI case and start deep link trampoline for others
- Disable menu highlight whenever the search bar is clicked
- Don't overwrite SettingsApplication's homepage activity in
  SliceDeepLinkHomepageActivity
- Scroll to highlighted menu entry after homepage is loaded to prevent
  UI overlapping

Bug: 201724410
Test: manual, robotest build pass
Change-Id: I5115d17d829e85036000da2e80f0e5b0598c733f
 2021-11-03 18:44:01 +08:00
Wesley Wang
0f3a672a94 Merge "Move optimization mode backup timing into onPause" into sc-v2-dev am: bf9f91f0ad am: e67f12f9b7 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16177444

Change-Id: I1f9c5dd515fa42c7a30f86f9c7b135b39ff67cc5
 2021-11-03 07:06:04 +00:00
Jason Chiu
d13834de52 Merge "Define a constant Sliceable#NO_RES for no resource cases" into sc-v2-dev am: 1565bba600 am: 56dde819dc 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16177442

Change-Id: Ife6c9bbe5433a818d42bf91509160fea8ae924f8
 2021-11-03 07:05:55 +00:00
Wesley Wang
e67f12f9b7 Merge "Move optimization mode backup timing into onPause" into sc-v2-dev am: bf9f91f0ad 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16177444

Change-Id: I033d0ff341cae7cdb320abebfd1da765c6fa8e74
 2021-11-03 06:55:06 +00:00
Jason Chiu
56dde819dc Merge "Define a constant Sliceable#NO_RES for no resource cases" into sc-v2-dev am: 1565bba600 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16177442

Change-Id: I6a3448e6e54666b45f6f67288593034a03d50d64
 2021-11-03 06:54:55 +00:00
Wesley Wang
bf9f91f0ad Merge "Move optimization mode backup timing into onPause" into sc-v2-dev 2021-11-03 06:41:42 +00:00
Jason Chiu
1565bba600 Merge "Define a constant Sliceable#NO_RES for no resource cases" into sc-v2-dev 2021-11-03 06:38:46 +00:00
TreeHugger Robot
6d2db7a8cf Merge "Adjust optimize page logging timing" into sc-v2-dev am: b4e13a7af0 am: 3be2b733f2 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16170324

Change-Id: I66ecbb8213e9fb6301d75cacb493813180df1e18
 2021-11-03 05:41:03 +00:00
TreeHugger Robot
3be2b733f2 Merge "Adjust optimize page logging timing" into sc-v2-dev am: b4e13a7af0 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16170324

Change-Id: I4639aea50ec1cdb528f4f300c59550194f89ca60
 2021-11-03 05:29:56 +00:00
TreeHugger Robot
b4e13a7af0 Merge "Adjust optimize page logging timing" into sc-v2-dev 2021-11-03 05:17:40 +00:00
Wesley.CW Wang
9b6eac28f3 Move optimization mode backup timing into onPause 
- Move to onPause to avoid some corner case (like kill apps from recent
 app won't trigger onDestroy)

Bug: 195306545
Test: make SettingsRoboTests
Change-Id: I89445a7138c30e6c869ce1c5c9a3f818997d99a7
 2021-11-03 12:38:10 +08:00
Jason Chiu
9fc0f18181 Define a constant Sliceable#NO_RES for no resource cases 
Fix: 204733076
Test: build
Change-Id: Ifa3b9db0e915a3ec056ad68a9a1862811594d423
 2021-11-03 12:23:49 +08:00
Bill Yi
5e67298476 Merge SP1A.211105.004 to aosp-master - DO NOT MERGE 
Merged-In: I62be3678022753eaba32209c33f95edf220294f1
Merged-In: I1d17526b87d442bc3513a1e7f526fcf5ff11e881
Change-Id: I63bda2d4f97e2c35d317675624c69d45e6dfbcaa
 2021-11-02 21:07:55 -07:00
Wesley.CW Wang
7fb4cbf005 Adjust optimize page logging timing 
- Log the optimize mode only when leave this page and mode changed
 - Update mOptimizationMode at onResume to make sure the state is sync
 with framework

Bug: 195306545
Test: make SettingsRoboTests
Change-Id: Iab116220cd7d2b1bdb1c170c4b47016c763bf4fe
 2021-11-03 12:05:15 +08:00
The Android Open Source Project
e5d3401aa1 Merge SP1A.211105.004 to stage-aosp-master - DO NOT MERGE 
Merged-In: I1d17526b87d442bc3513a1e7f526fcf5ff11e881
Change-Id: Ib2e431d8d28a3b0da86ec65cad345d8adda041ec
 2021-11-02 14:11:57 -07:00
Julia Reynolds
66cffd469f Merge "Migrate to using fixed permissions" 2021-11-02 20:47:58 +00:00
ronish
870ae982ed Add tests for QRCodeScannerPreferenceController 
Bug: 200536509
Test: make RunSettingsRoboTests -j40 ROBOTEST_FILTER="com.android.settings.display.QRCodeScannerPreferenceControllerTest"

Change-Id: Ib57a2d12afea93888654362b92b6caeb33823245
 2021-11-02 16:20:06 +00:00
Jason Chiu
7f6b9e26c9 Merge changes from topic "slice-highlight" into sc-v2-dev am: 6821b6be32 am: 026b1b5df6 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16151654

Change-Id: If46903bb26371ea90075d1c6cc063af4d10a88d4
 2021-11-02 02:43:42 +00:00
Jason Chiu
026b1b5df6 Merge changes from topic "slice-highlight" into sc-v2-dev am: 6821b6be32 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16151654

Change-Id: Ib03d41631d8bf961fa3ff3957eb5452411da7792
 2021-11-02 02:28:16 +00:00
Jason Chiu
6821b6be32 Merge changes from topic "slice-highlight" into sc-v2-dev 
* changes:
  Add highlight menu keys for all toggle pref controllers and custom slices
  Support slice deep links highlighting menu entries
 2021-11-02 02:14:09 +00:00
TreeHugger Robot
9abf3e5e76 Merge "Optimize battery optimize page control flow" into sc-v2-dev am: c6a5bcc933 am: 137f9acac1 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16138630

Change-Id: I53031d3f0c7abe2ac1a089534f0908c939ffb49c
 2021-11-01 08:20:08 +00:00
TreeHugger Robot
137f9acac1 Merge "Optimize battery optimize page control flow" into sc-v2-dev am: c6a5bcc933 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16138630

Change-Id: Ic9d497517b6778c413909917d485575a054dc331
 2021-11-01 08:07:13 +00:00
TreeHugger Robot
c6a5bcc933 Merge "Optimize battery optimize page control flow" into sc-v2-dev 2021-11-01 07:53:21 +00:00
Hugh Chen
b1adf980a5 RESTRICT AUTOMERGE Fix make Bluetooth discoverable without additional permission 
- Only enable device can be discoverable when the user launch
  "Connected Devices settings" through settings and systemui

Bug: 194695497
Test: make -j42 RunSettingsRoboTests and use test apk to manually test
to verify the device is not discoversable when open "Connected settings"
through test apk.

Change-Id: Ia04ab759b737acf30b782f5c5831dd59f25fb257
(cherry picked from commit d3abbb9821)
 2021-11-01 06:57:09 +00:00
Hugh Chen
58d81fbbb4 RESTRICT AUTOMERGE Fix make Bluetooth discoverable without additional permission 
- Only enable device can be discoverable when the user launch
  "Connected Devices settings" through settings and systemui

Bug: 194695497
Test: make -j42 RunSettingsRoboTests and use test apk to manually test
to verify the device is not discoversable when open "Connected settings"
through test apk.

Change-Id: Ia04ab759b737acf30b782f5c5831dd59f25fb257
 2021-11-01 06:56:12 +00:00
Wesley.CW Wang
151b88f76f Optimize battery optimize page control flow 
- Post the setup logic into background and setup once only when leaving
 this page, this can improve the performance since we won't setup
 every time when switching preference

Bug: 195306545
Bug: 199892006
Test: make SettingsRoboTests
Change-Id: I1c3ee4673cf5cdba0abe39f208dfb1412082c579
 2021-11-01 14:52:42 +08:00