PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
90,870 Commits 1 Branch 0 Tags
d77cc961267fd6c816c70ddcd47cf5a7cb85d4f9
Commit Graph

14482 Commits

Author SHA1 Message Date
SongFerng Wang
9a7f3aaf0e Merge "Lost the registered cellinfo item after the aggregation" into sc-v2-dev am: f0a3348ceb 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16262279

Change-Id: I38ea72134e9f0bf453d6125763e4d6af6f323487
 2021-11-17 06:55:17 +00:00
SongFerng Wang
f0a3348ceb Merge "Lost the registered cellinfo item after the aggregation" into sc-v2-dev 2021-11-17 06:42:29 +00:00
Gary Jian
782506f61c Merge "Added KEY_VONR_ENABLED_BOOL to obtain VoNR availability status" into sc-v2-dev am: 7f809bda12 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16259269

Change-Id: I1de09d91f66438c4ac521ac7624eae41e9b54b34
 2021-11-17 01:46:25 +00:00
Kevin Chyn
156db33a56 Disable combined controller only if all modalities require consent 
Additionally, ensure that consent is only requested for modalities
that have not been previously consented to. We retrieve the consent
requirement (which come from DPM) in onActivityResult instead of
onCreate, since the signal may not be ready immediately.

Fixes: 196060286
Fixes: 204592495
Test: make -j56 RunSettingsRoboTests ROBOTEST_FILTER=CombinedBiometricStatusPreferenceControllerTest

Change-Id: I984e61f28ffbf957c16cac4ea84f40b6ad7d8ae9
 2021-11-16 12:32:56 -08:00
Gary Jian
68b861930a Added KEY_VONR_ENABLED_BOOL to obtain VoNR availability status 
Bug: 205809218
Test: atest NrAdvancedCallingPreferenceControllerTest
Change-Id: I45ac1e95d669801c2d37f49943d7c16cfb7adae3
 2021-11-16 04:40:08 +00:00
SongFerngWang
4d00bce2b2 Lost the registered cellinfo item after the aggregation 
Bug: 204384218
Test: atest NetworkSelectSettingsTest
Change-Id: I8a1af6eadd5852788a5455dd637e1c63316bb802
Merged-In: I163ab8e966de57ddff7939a46fc47b05bea029e3
 2021-11-16 11:38:22 +08:00
Xin Li
bf45599d43 Merge sc-qpr1-dev-plus-aosp-without-vendor@7810918 
Bug: 205056467
Merged-In: I9ac05f5da437030e1b5db082ddaf7959f82acccd
Change-Id: Iaf8ebc4877a8276672354b45db0dd502c0f71bd3
 2021-11-11 16:54:23 +00:00
Etienne Ruffieux
e004eaa51b Make BluetoothCodecConfig and BluetoothCodecStatus public 
Tag: #feature
Bug: 200202780
Test: make RunSettingsRoboTests
Change-Id: I2a81216de050b143cee5c537d899a699d5012330
 2021-11-10 10:12:51 +00:00
YUKAI HUNG
a1d72c11c5 Merge "Fix incorrect usage for the logging method to cause no data in WW" into sc-v2-dev am: 6e12a31e5f 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16221114

Change-Id: I2d78a4287aa740f1e583c8f570d52c2dc8d90bf7
 2021-11-10 09:50:59 +00:00
ykhung
101dc6878a Fix incorrect usage for the logging method to cause no data in WW 
Fix incorrect usage for the logging method to cause the schedule type
and percentage data is not logged  into the WW, since
MetricsFeatureProvider doesn't support log Pair.of() data into the
WestWorld or Clearcut directly, it is used for EventLogWriter only

Bug: 202906853
Test: make SettingsRoboTests
Change-Id: I9f1d157c77df9bd74f441105318790a2505a9c01
 2021-11-10 15:39:30 +08:00
TreeHugger Robot
0f6c95d4fd Merge "Fix "battery saver" not in the top seaching result for indexing" into sc-v2-dev am: 5afb04e1b8 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16220939

Change-Id: I38c253e43ca1165916550503b13276bcf23b672a
 2021-11-10 02:18:39 +00:00
ykhung
64e49a9393 Fix "battery saver" not in the top seaching result for indexing 
Bug: 204964119
Test: make SettingsRoboTests
Change-Id: Ifbbf979abe9e96e7af66ec20173e996793d2703e
 2021-11-10 00:11:09 +08:00
TreeHugger Robot
22b763486d Merge "Fix incorrect usage for the logging method to cause no data in WW" into sc-v2-dev am: 6f6149c7ba 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16220930

Change-Id: Iefc9f1b9719bd1cc57bf79d7d8d873a4f4dbc995
 2021-11-09 15:22:38 +00:00
ykhung
48c3533cd0 Fix incorrect usage for the logging method to cause no data in WW 
Fix incorrect usage for the logging method to cause the schedule type
and percentage data is not logged  into the WW, since
MetricsFeatureProvider doesn't support log Pair.of() data into the
WestWorld or Clearcut directly, it is used for EventLogWriter only

Bug: 202906853
Test: make SettingsRoboTests
Change-Id: I0ca87ca96647f025adbd23f9f93a3cbd5f7d8579
 2021-11-09 21:01:40 +08:00
Hugh Chen
4640a2a077 RESTRICT AUTOMERGE Fix make Bluetooth discoverable without additional permission am: b1adf980a5 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16144999

Change-Id: Ieb2beb22a55230c7e7f283f6886b340b7821d67f
 2021-11-09 07:27:19 +00:00
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
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
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
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
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
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
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
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
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
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
Jason Chiu
594eb43159 Support slice deep links highlighting menu entries 
- Add an interface to get highlight menu key resource in Sliceable
- Force implementing the new interface in TogglePreferenceController and
  CustomSliceable at syntax level
- Update the slice index db schema

Bug: 204695404
Test: manual, robotest build pass, unit
Change-Id: I0b5068bccd04f1590023de7f3385bc0a4c6fa47b
 2021-11-01 14:27:34 +08:00
TreeHugger Robot
4ef8d14ed7 Merge "Fix alignment issue between Vision Settings and Font/Display" into sc-v2-dev am: 17df1ff01f 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16056987

Change-Id: I7b9a5992c671ed304e3ad2cdec7f546d6c77b446
 2021-11-01 02:50:16 +00:00
TreeHugger Robot
17df1ff01f Merge "Fix alignment issue between Vision Settings and Font/Display" into sc-v2-dev 2021-11-01 02:41:30 +00:00