Commit Graph

14493 Commits

Author SHA1 Message Date
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
Tim Peng
07b3675717 Phone fails to switch channel mode from stereo to mono
-Set codec to SBC when HD audio is off

Bug: 194349060
Test: make -j50 RunSettingsRoboTests

Change-Id: Iae4aa3f1d77350f5b4d91e7a687e048091c1daea
2021-10-29 03:28:14 +00:00
TreeHugger Robot
babbff7b82 Merge "Add location check for Wifi Scanning notify message" into sc-qpr1-dev am: 649135c11c am: c26248da5b
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16093937

Change-Id: Ib6922d82c5c6d7a059b8c43beefb12d554c3f3c0
2021-10-27 19:28:38 +00:00
TreeHugger Robot
c26248da5b Merge "Add location check for Wifi Scanning notify message" into sc-qpr1-dev am: 649135c11c
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16093937

Change-Id: I60a0411bb2b21ff8dc9fac37692ddf482ce2e6ab
2021-10-27 18:52:28 +00:00
TreeHugger Robot
3d353e63e2 Merge "Add location check for Wifi Scanning notify message" into sc-qpr1-dev am: 649135c11c
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16093937

Change-Id: I6057ce7a0de2ff19f662564a538a891d9c37c553
2021-10-27 18:52:19 +00:00
YUKAI HUNG
22a28d3f7e Merge "Fix the ExpandDividerPreference will flash one time in some corner cases" into sc-v2-dev am: 0ed32fca75
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16115940

Change-Id: I953a2e45433c6f7c563392ab98272261b37f3e9e
2021-10-25 17:02:36 +00:00
YUKAI HUNG
0ed32fca75 Merge "Fix the ExpandDividerPreference will flash one time in some corner cases" into sc-v2-dev 2021-10-25 16:49:01 +00:00
ykhung
36a57f4720 Fix the ExpandDividerPreference will flash one time in some corner cases
Bug: 204051529
Test: make SettingsRoboTests
Change-Id: Iaead6d2a596cbbf0281045b40e4b00f23ceb9f09
2021-10-25 22:22:49 +08:00
TreeHugger Robot
5c422e7ed2 Merge "Fix broken tests" into sc-v2-dev am: c07317f5a1
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16114300

Change-Id: Ic270be5214f6b795c3345ab88bc895842527f93b
2021-10-25 12:31:37 +00:00
TreeHugger Robot
c07317f5a1 Merge "Fix broken tests" into sc-v2-dev 2021-10-25 12:15:57 +00:00
Tsung-Mao Fang
1083ca0b90 Fix broken tests
Test: Run presubmit
Bug: 204031530
Change-Id: If95afeff91b2fb81b18bfdf6005ba785c6dc1525
2021-10-25 17:22:01 +08:00
ykhung
7681f7ee7f Log battery saver schedule type and percentage when its value is changed am: aa73e48950
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16101562

Change-Id: I7f555cccd53ae5c6e9e564d339042264e0601208
2021-10-25 04:03:40 +00:00
ykhung
96c6fcb778 Remove saver schedule type logging entry from BatterySaverController am: 58ff194380
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16101561

Change-Id: Id7810fa1777a91cdb404dd892117e42516d25417
2021-10-25 04:03:37 +00:00
ykhung
aa73e48950 Log battery saver schedule type and percentage when its value is changed
Bug: 15125481
Test: make SettingsGoogleRoboTests ROBOTEST_FILTER="com.android.settings.fuelgauge"
Change-Id: Ia728a4ea2da3930201d5634abda7aa8a8dd72133
2021-10-25 10:40:08 +08:00
ykhung
58ff194380 Remove saver schedule type logging entry from BatterySaverController
Bug: 15125481
Test: make SettingsGoogleRoboTests ROBOTEST_FILTER="com.android.settings.fuelgauge"
Change-Id: I698c4ef71217ecd68034cd5761e2b94cd868b38f
2021-10-23 15:27:37 +08:00
Sunny Shao
d2704ad4ca Fix alignment issue between Vision Settings and Font/Display
- Use the same approach of Vision page to tweak the padding of the header

Fixes: 202897526
Test: make RunSettingsGoogleRoboTests -j ROBOTEST_FILTER=com.android.settings.accessibility.AccessibilityScreenSizeForSetupWizardActivityTest
Change-Id: I06eb5cb3ea6952b2cfdaa71f15757e415b61f5cc
2021-10-23 11:09:18 +08:00
ykhung
e814c55b74 Unitfy saver schedule type log format and log in the background am: 62a350d18c
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16101560

Change-Id: I1a555fbba1cada703423c3f94d41f67b5b89b00d
2021-10-22 13:42:38 +00:00
ykhung
62a350d18c Unitfy saver schedule type log format and log in the background
Bug: 195306545
Test: make SettingsGoogleRoboTests
Change-Id: I13a01de804c3907d52f09def900ee1a057257ce3
2021-10-22 19:56:51 +08:00
Chienyuan
f06def46f7 RESTRICT AUTOMERGE Remove connection preferences "Files received via Bluetooth" am: 1b9a21ffb5
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16048451

Change-Id: I7a693b6644e200a7aa66f09704e39c178aa2baa7
2021-10-21 15:18:13 +00:00
TreeHugger Robot
c1770fe4cf Merge "RESTRICT AUTOMERGE Remove connection preferences "Files received via Bluetooth"" into sc-v2-dev 2021-10-21 15:04:46 +00:00
YUKAI HUNG
054f3b5199 Merge "Update app usage page power summary" into sc-v2-dev am: 8e97bdd76c
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16091765

Change-Id: Ifbe0fee50f01f00784bd65aa6124081b41b1f3c7
2021-10-21 10:48:11 +00:00
YUKAI HUNG
8e97bdd76c Merge "Update app usage page power summary" into sc-v2-dev 2021-10-21 10:31:31 +00:00
Wesley.CW Wang
23a5fb5e74 Update app usage page power summary
- Present empty string when this app consumed power but no usage time,
 usually they are some system components

Bug: 197749108
Test: make -j64 RunSettingsRoboTest
Change-Id: I1e88babb30c871748fa1f5fc23c7b4d834e384fd
2021-10-21 17:29:36 +08:00
changbetty
aab7b55926 Add location check for Wifi Scanning notify message
Bug: 203471614
Test: make RunSettingsRoboTests ROBOTEST_FILTER=NetworkProviderSettingsTest
Change-Id: I0fccd1a8dfd8e6ca499a6f87a59772f70961bc1d
2021-10-20 15:14:08 +00:00
Jason Hsu
33914ed556 Merge "Fix software shortcut in dialog did not update when content change." into sc-v2-dev am: 56e82fe112
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16005288

Change-Id: I9a37e193ad72c639a10ebe10cb0868215b1823c7
2021-10-20 10:21:32 +00:00
jasonwshsu
eba8e8da19 Fix software shortcut in dialog did not update when content change.
Root Cause: Dialog only get updated when clicked the trigger button to show dialog.

Solution: Update the software shortcut content in dialog if needed in onResume() stage.

Bug: 183342594
Test: atest AccessibilityDialogUtilsTest
Change-Id: Ibcd66d6c57f1790f96f234e49f456cbc2c990f64
2021-10-20 16:25:26 +08:00
YUKAI HUNG
212bd58428 Merge "Add missed "optional_uses_libs" to avoid testing failed" into sc-v2-dev am: 65022abe43
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16075738

Change-Id: I699fb1902bc400b3008ba3b21357a46b98a80b39
2021-10-19 06:43:41 +00:00
YUKAI HUNG
65022abe43 Merge "Add missed "optional_uses_libs" to avoid testing failed" into sc-v2-dev 2021-10-19 06:28:30 +00:00
TreeHugger Robot
40f8910e8f Merge "Revert "Add PowerSaveWhitelistExceptIdle as Optimizted modes condition"" into sc-v2-dev am: 57919fbcfb
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16063843

Change-Id: Ia964565d7a79b311b34e7be235ebb7c38b92793c
2021-10-18 15:25:25 +00:00
TreeHugger Robot
57919fbcfb Merge "Revert "Add PowerSaveWhitelistExceptIdle as Optimizted modes condition"" into sc-v2-dev 2021-10-18 15:08:46 +00:00
ykhung
4c1702cf2a Add missed "optional_uses_libs" to avoid testing failed
After adding the missed "optional_uses_libs" I can run the SettingsRoboTests test locally (screenshot: https://screenshot.googleplex.com/3nLrCwX4bLHGxvP)

Bug: 203408618
Test: make SettingsRoboTests
Change-Id: I1bfdb2204fe89c8d0dbcfb347d10fa74853051e9
2021-10-18 14:38:08 +00:00
Wesley.CW Wang
d11dec2f82 Revert "Add PowerSaveWhitelistExceptIdle as Optimizted modes condition"
- Reverts commit e7cca4cd81
 - Add try-catch to handle unexpected operate

Reason for revert: Previous fix will cause a side effect which makes app stuck at Optimize mode after switching state from Unrestricted to Optimize, add a try catch to handle previous issue first

BYPASS_INCLUSIVE_LANGUAGE_REASON=legacy naming, not edit by this code change

Bug: 199892006
Test: make SettingsRoboTests
Change-Id: I3b1850ab66bbf4cd605f14152a244a8ed7edd578
Merged-In: I3b1850ab66bbf4cd605f14152a244a8ed7edd578
2021-10-18 09:03:06 +00:00
SongFerng Wang
e590239085 Merge "The Network name is not same as statusbar at SIM Edit page" into sc-qpr1-dev am: 11af4846b2 am: 17fb53a1ad
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16055430

Change-Id: Ib4049920f72b9534ca744e33b7553856184248b1
2021-10-18 08:41:54 +00:00
SongFerng Wang
17fb53a1ad Merge "The Network name is not same as statusbar at SIM Edit page" into sc-qpr1-dev am: 11af4846b2
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16055430

Change-Id: Idc12ca6b932fc9143a4c83729af16b82fae1669e
2021-10-18 08:25:21 +00:00
SongFerng Wang
190e926aab Merge "The Network name is not same as statusbar at SIM Edit page" into sc-qpr1-dev am: 11af4846b2
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16055430

Change-Id: I7179fea2bf2925e5950bfffbad8289302a5ca772
2021-10-18 08:25:19 +00:00
SongFerng Wang
11af4846b2 Merge "The Network name is not same as statusbar at SIM Edit page" into sc-qpr1-dev 2021-10-18 08:13:49 +00:00
changbetty
064aa91e45 Add package name check for the calling app
Bug: 198661951
Test: make RunSettingsRoboTests ROBOTEST_FILTER=AddAppNetworksActivityTest
Change-Id: I68a543a5c9a5b74db30780f6a6d9f9bc9c6eec08
2021-10-18 03:17:06 +00:00
SongFerngWang
b172582c14 The Network name is not same as statusbar at SIM Edit page
Using subscriptionInfo to get the network name.

Bug: 203035698
Bug: 201591202
Test: make RunSettingsRoboTests
ROBOTEST_FILTER=RenameMobileNetworkDialogFragmentTest (PASS)

Change-Id: I84848a2801172b46f7cc3ff39d88ad57e34514a4
(cherry picked from commit 050b6d5224)
2021-10-15 21:33:27 +00:00
changbetty
435c3385f6 For Internet Picker - Information about Wi-Fi scanning when Wi-Fi is off
Bug: 202323013
Test: manual test
Test: make RunSettingsRoboTests ROBOTEST_FILTER=NetworkProviderSettingsTest
Change-Id: I4a26ec43bb7e1758b8170a7ff9fa7d5846cb4a35
(cherry picked from commit bfd3020038)
2021-10-15 21:33:24 +00:00
TreeHugger Robot
ea805db192 Merge "For Internet Picker - Information about Wi-Fi scanning when Wi-Fi is off" into sc-qpr1-dev am: c5cc2f81fe am: 49bd615d6b
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16048447

Change-Id: I1be4a0c1aaf8a0d30943b7669ae96e2b41363088
2021-10-15 20:32:46 +00:00