Commit Graph

137579 Commits

Author SHA1 Message Date
Chaohui Wang
6adf1bad31 Let SpaBridgeActivity support HIGHLIGHT_MENU_KEY
Also the SpaAppBridgeActivity.

Could be tested by,
adb shell am start -n com.android.settings/.ManageFullScreenIntent

adb shell am start \
  -a android.settings.MANAGE_APP_USE_FULL_SCREEN_INTENT \
  -d package:com.android.settings

adb shell am start -n com.android.settings/.UsageStatsActivity

Bug: 309075424
Test: manual - on tablet
Test: unit test
Change-Id: I778443e9d21d165904e415c66c03aafc7ac81372
2023-12-05 11:43:31 +08:00
Vlad Popa
e71281cfc7 Merge "Disable the Bt categorization list when audio type is known" into main 2023-12-05 03:33:36 +00:00
Haijie Hong
5ee4df403d Merge "Add flag to offload bluetooth callback/operations to background thread" into main 2023-12-05 03:24:50 +00:00
Hyundo Moon
1793200795 Merge "Fix failing BluetoothPermissionActivityTest" into main 2023-12-05 02:57:25 +00:00
Yiyi Shen
9f6efc946f Merge "[Audiosharing] Fix volume control." into main 2023-12-05 02:39:37 +00:00
Joseph Vincent
b940da0fcb Merge "Swap orders of GAIA signin and lock setup during Private space setup" into main 2023-12-04 23:19:34 +00:00
Tyler Freeman
e0f10d3fe2 feat(force invert): add force invert Settings preference in A11y > Color and Motion
Bug: 312289375
Test: atest packages/apps/Settings/tests/robotests/src/com/android/settings/accessibility/ColorAndMotionFragmentTest.java
  && atest packages/apps/Settings/tests/robotests/src/com/android/settings/accessibility/ToggleForceInvertPreferenceControllerTest.java
Flag: android.view.accessibility.Flags.forceInvertColor

Change-Id: I2739a1dfecbbddcd240a3113344987ade2b7c717
2023-12-04 14:12:43 -08:00
josephpv
fa6ee75c0e Swap orders of GAIA signin and lock setup during Private space setup
Bug: 312892127
Test: Verified manually Lock setup is before GAIA login
Change-Id: I05b7c61306e4988a59511988f88e26cdefbed194
2023-12-04 17:37:09 +00:00
Chaohui Wang
5e85aa3b07 Eagerly load PackageInfo to avoid flaky
Bug: 314562958
Test: manual - All apps > app detail
Change-Id: Ic225818299f5b38e2a94020a04fccc4005f95158
2023-12-04 13:23:50 +00:00
Santiago Seifert
77c2a331fb Merge "Show the output switcher when no media is playing" into main 2023-12-04 12:17:21 +00:00
Yiyi Shen
87e6d6e32c [Audiosharing] Fix main sharing flow.
Fetch the active device before starting the sharing. Because once the
sharing is started, all devices connected will switch to inactive.

Flagged with enable_le_audio_sharing

Bug: 305620450
Test: manual
Change-Id: Ie287d1094fe40dbcb42c121ea79409fc48e0eec7
2023-12-04 18:37:32 +08:00
Yiyi Shen
afbd9d9894 [Audiosharing] Fix volume control.
1. Unregister the volume control callbacks in onDestroy
2. Reuse SeekBarPreference#setProgress
3. Fetch volume from AudioManager if got invalid volume from VC service.

Flagged with enable_le_audio_sharing

Bug: 305620450
Test: manual
Change-Id: Id63d1dbff4c3cbdeb91c2537d951c39e1a932220
2023-12-04 10:16:25 +00:00
Chaohui Wang
b731e63096 Check isSimHardwareVisible earlier
In SimEidPreferenceController, to reduce flaky on no SIM devices.

Bug: 304560734
Test: manual - on "About phone / tablet" page
Test: unit test
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:8b7e6c28bcef0788b4fc637af16dcaef32a16c14)
Merged-In: I07ae9b785d0fbe24a866883080a466a2110ca68f
Change-Id: I07ae9b785d0fbe24a866883080a466a2110ca68f
2023-12-04 10:10:29 +00:00
Fan Wu
6e3bf1ee10 Merge "Add "test_suites" attribute to SettingsRoboTests." into main 2023-12-04 09:56:24 +00:00
FanWu
8731857550 Add "test_suites" attribute to SettingsRoboTests.
Reference: https://source.android.com/compatibility/tests/development/test-mapping#packaging_build_script_rules

Bug: 312571846

Test: config change
Change-Id: I8a3e99a59309f1f63294e0ff88fb0536164c1cd1
2023-12-04 09:00:50 +00:00
Jasmine Cha
9e45469833 Show the output switcher when no media is playing
- Support output switcher for system routing.
- Add an new string to indicate the device that
  audio will output to.

Bug: 284227163
Test: device/host atest
 atest MediaOutputPreferenceControllerTest
 atest AudioOutputSwitchPreferenceControllerTest
 atest MediaOutputIndicatorSliceTest

Change-Id: I94bcf84e7e93b3e4f5db1d95d5380a54a3e0c460
Signed-off-by: Jasmine Cha <chajasmine@google.com>
2023-12-04 08:19:05 +00:00
Chaohui Wang
d3cc9b20e4 Async load eid in SimEidPreferenceController
Avoid data loading in getAvailabilityStatus() to prevent ANR, override
updateNonIndexableKeys() for search availability.

Fix: 304560734
Test: manual - on "About phone" page
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:b6e44ce818a5284a612a31e0d451a33f9e1ce93e)
Merged-In: I9994abf3787f5db0edc71ff48d08e549a4b70bf7
Change-Id: I9994abf3787f5db0edc71ff48d08e549a4b70bf7
2023-12-04 07:53:34 +00:00
chelseahao
1340427763 [Audiosharing] Send intent to the qr code scanner.
Bug: 308368124
Test: Manual
Change-Id: I45abe790caecc6eb86e4ada2827ed740a5ee6a46
2023-12-04 05:15:04 +00:00
Hyundo Moon
b571a9768f Fix failing BluetoothPermissionActivityTest
Bug: 314052293
Test: atest SettingsRoboTests:com.android.settings.bluetooth.BluetoothPermissionActivityTest
Change-Id: Ic62fa4f21a49f865ff713fcf4dea635179441a99
2023-12-04 12:37:18 +09:00
Chaohui Wang
de3fe3744f Refresh the App Info Settings
When apk upgraded or downgraded.

And only close the page when the package is fully removed.

Bug: 314562958
Test: manual - on App Info Settings
Test: unit test
Change-Id: Ifdff714da99e31f9c5f237a0c3342de7a0797ec4
2023-12-04 01:43:11 +00:00
SongFerng Wang
0a32ca2bbc Allow l10n to translate it for the fr-CA
Bug: 280221906
Change-Id: I087403a5b305771ddbc96f66c5879f30366e54f4
Test: build pass
2023-12-03 02:51:03 +00:00
Wa Gao
7954bb5ba7 Merge "Add dialog for top switch on fully managed devices." into main 2023-12-02 02:03:55 +00:00
Wa Gao
b14867f6ac Add dialog for top switch on fully managed devices.
Bug: 311233745
Change-Id: Id4043675041d1cf9c0ed307f3a0c2dc65768641b
2023-12-02 00:42:33 +00:00
Manish Singh
9ee5f6edc9 Make the order of tabs same as profile creation
Currently the order is hardcoded to be Primary, Work, Private.
But SettingsLib in frameworks uses the order returned by UserManager's
getProfiles API. This causes inconsistency across various Settings
pages.

Changing the order to be the one returned by UserManager.

Bug: 304366476
Test: manual
Test: atest ProfileSelectFragmentTest
Change-Id: I9953f211bfbeab129aa6b7c7ec0fe294e91dda26
2023-12-01 22:37:37 +00:00
Jakob Schneider
b423e6b5b5 Fix opening the Settings page from the launcher.
Bug: 309107861
Test: Tested the bugfix manually
Change-Id: I40e05d0b6fc22a432895490bc51531a0eb3190ac
2023-12-01 11:48:45 +00:00
Chaohui Wang
a898cc0c20 Merge "Only show DeveloperOptionsController for admin" into main 2023-12-01 09:34:30 +00:00
Yiyi Shen
fa4a0cacff Merge "[Audiosharing] Add feature gates as utils." into main 2023-12-01 08:24:42 +00:00
Jacky Wang
8fc2b3429e Merge "Re-enable nullaway plugin" into main 2023-12-01 08:22:21 +00:00
Chaohui Wang
8295743fe1 Only show DeveloperOptionsController for admin
Bug: 311604902
Test: manual - on System page
Test: unit test
Change-Id: Idbf40be4e0074f5d381724538c226a336c2c3b27
2023-12-01 15:30:27 +08:00
Treehugger Robot
dbaf12441f Merge "Make the peak refresh rate with rounding" into main 2023-12-01 03:35:25 +00:00
Chaohui Wang
6e1d9fb00a Merge "Add back HIGHLIGHT_MENU_KEY for DevelopmentSettings" into main 2023-12-01 03:18:05 +00:00
Vlad Popa
f782872cfd Disable the Bt categorization list when audio type is known
The audio framework can deduce the type with the help of the
BluetoothDevice metadata API. In case this is known we will grey out the
list with the manual selection of the audio device type.

Test: adb shell device_config put media_audio android.media.audio.automatic_bt_device_type true
Test: atest BluetoothDetailsAudioDeviceTypeControllerTest
Bug: 302323921
Change-Id: Ia2cab27f2dce5493aa4326333699b5908d8a09ee
2023-11-30 18:08:01 -08:00
Anna Zhuravleva
4ec18698b0 Merge "Log events during PS setup flow." into main 2023-11-30 21:47:34 +00:00
Manish Singh
71e27963f7 Merge "Check purely for the presence of a managed profile" into main 2023-11-30 20:51:06 +00:00
Roshan Pius
8962b00ac4 [automerger skipped] Merge "settings: Remove @hide NFC API usage" into main am: 75a49e0abb am: e234fe3281 -s ours am: c5d1832610 -s ours
am skip reason: Merged-In I6f87ad7ae03c67aaa2ddb0ac2529debc53278ba8 with SHA-1 0d11f492f7 is already in history

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

Change-Id: Ia6a89ae2ce3c26529c32c90630b86159384fd4b5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-30 19:20:58 +00:00
Roshan Pius
cc19e96523 [automerger skipped] Merge "settings: Remove @hide NFC API usage" into main am: 75a49e0abb am: da05498175 am: ac2f252ec8 -s ours
am skip reason: Merged-In I6f87ad7ae03c67aaa2ddb0ac2529debc53278ba8 with SHA-1 f04ee0dfab is already in history

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

Change-Id: Iec269774eb4abc7c3595e2a9aa3417399cbedf4f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-30 19:20:26 +00:00
Bill Yi
2f4ff23d05 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 5c3d71154e -s ours am: a9007d74d2 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ifc4e26323f212117824150b82d86bd2a6bd5cc50
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-30 19:16:06 +00:00
Roshan Pius
c5d1832610 [automerger skipped] Merge "settings: Remove @hide NFC API usage" into main am: 75a49e0abb am: e234fe3281 -s ours
am skip reason: Merged-In I6f87ad7ae03c67aaa2ddb0ac2529debc53278ba8 with SHA-1 0d11f492f7 is already in history

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

Change-Id: I5b74c83ddceb3367f619c761734ccf7a576be9b8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-30 19:02:06 +00:00
Roshan Pius
ac2f252ec8 Merge "settings: Remove @hide NFC API usage" into main am: 75a49e0abb am: da05498175
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2851159

Change-Id: Iadfb1f67802dbec8ff68271d7199ca83edd3b9bb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-30 19:00:17 +00:00
Bill Yi
a9007d74d2 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 5c3d71154e -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ib3fd125d577e54a26b1486a19517d5522250e960
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-30 18:45:03 +00:00
Bill Yi
9b28d7f3b6 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: a9f7c582b2 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I3fb55f25937613244cdd3b5090b1eb517ddb4c7c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-30 18:43:22 +00:00
Roshan Pius
e234fe3281 Merge "settings: Remove @hide NFC API usage" into main am: 75a49e0abb
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2851159

Change-Id: I8d1c96e7232958e40885dfcf7ff58ce38340e410
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-30 18:31:30 +00:00
Roshan Pius
da05498175 Merge "settings: Remove @hide NFC API usage" into main am: 75a49e0abb
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2851159

Change-Id: Ic089b941505ff82eca32e9d82f9648909b30c267
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-30 18:31:27 +00:00
Bill Yi
dc4d9f62c7 Merge "Import translations. DO NOT MERGE ANYWHERE" into main 2023-11-30 17:46:32 +00:00
Bill Yi
4d3d2f5592 Merge "Import translations. DO NOT MERGE ANYWHERE" into main 2023-11-30 17:46:32 +00:00
Roshan Pius
75a49e0abb Merge "settings: Remove @hide NFC API usage" into main 2023-11-30 17:29:37 +00:00
Chris Antol
ae9e09eae3 Merge "MainlineModuleVersionPreferenceControllerTest to access intent directly" into main 2023-11-30 17:11:07 +00:00
Jacky Wang
b4598567fc Re-enable nullaway plugin
Bug: 307330031
Test: make Settings RUN_ERROR_PRONE=true
Change-Id: I6445b588f11bc01e6d885f73ffa35329b5db2ab2
2023-11-30 21:36:24 +08:00
Peter Lin
f59044d827 Make the peak refresh rate with rounding
To ensure accurate comparison of peak refresh rates, it is essential
to consider the peak refresh rate after rounding. This eliminates the
risk of unexpected triggers that could activate the Smooth Display
settings UI.

Bug: 312121651
Test: check the settings with Smooth Display
Change-Id: I4cd68efbcf4fdb9d4664c96332901661a23f4f09
2023-11-30 13:16:08 +00:00
Chaohui Wang
d5d53c1c05 Add back HIGHLIGHT_MENU_KEY for DevelopmentSettings
Use to highlight the "System" of the left activity on the tablet.

Can be tested with,
adb shell am start -a android.settings.APPLICATION_DEVELOPMENT_SETTINGS

Bug: 311604902
Test: manual - tested with adb
Change-Id: If9eea47f3bd6d2ab7bbce0a10c56d1cd14784140
2023-11-30 20:45:12 +08:00