Automerger Merge Worker
ff59baaa94
Merge "Merge "Don't allow setting channels to bypass DND if the app cannot show notifications" into udc-dev am: 4f4368b7c2
am: f4246207e5"
2023-03-07 18:55:14 +00:00
Matías Hernández
ca3fa4e7ab
Merge "Don't allow setting channels to bypass DND if the app cannot show notifications" into udc-dev am: 4f4368b7c2
am: f4246207e5
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21873239
Change-Id: Ic0ef95835b98b2b4101a8112709c3869b9838c77
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-07 18:54:57 +00:00
Matías Hernández
5eba45b7e8
Merge "Don't allow setting channels to bypass DND if the app cannot show notifications" into udc-dev am: 4f4368b7c2
am: 6994a18c26
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21873239
Change-Id: Iff98163b4765a26f681bb5a14a5125d126eaba03
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-07 18:54:38 +00:00
Dmitry Dementyev
c7e8052b52
Convert argument to intent in AddAccountSettings.
...
Bug: 265798353
Test: manual
Change-Id: I0051e5d5fc9fd3691504cb5fbb959f701e0bce6a
2023-03-07 10:36:41 -08:00
Matías Hernández
f4246207e5
Merge "Don't allow setting channels to bypass DND if the app cannot show notifications" into udc-dev am: 4f4368b7c2
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21873239
Change-Id: Ia323480883767904e0ab753d042cd8a774430431
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-07 18:25:18 +00:00
Matías Hernández
6994a18c26
Merge "Don't allow setting channels to bypass DND if the app cannot show notifications" into udc-dev am: 4f4368b7c2
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21873239
Change-Id: I0425ab55d689001590e664872b738a2acbcd5a74
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-07 18:20:59 +00:00
Matías Hernández
4f4368b7c2
Merge "Don't allow setting channels to bypass DND if the app cannot show notifications" into udc-dev
2023-03-07 18:18:27 +00:00
Becca Hughes
e174f66a71
Move CredentialProviderInfo for test/settings (settings)
...
This is a precusor CL to adding a subtitle for settings
to use so we need to move CPI where it can be used
by settings, atest and CTS.
Test: ondevice & atest & cts
Bug: 253157366
Change-Id: Ief25f562eb5c2ca4438701de8a8e26941a8370a3
(cherry picked from commit on googleplex-android-review.googlesource.com host: 573e844275
)
Merged-In: Ief25f562eb5c2ca4438701de8a8e26941a8370a3
2023-03-07 17:14:09 +00:00
Becca Hughes
6474e01372
Add subtitle to settings (settings)
...
Allows a credential provider to show a
subtitle/summary underneath the title in
the list of providers.
Test: ondevice & atest
Bug: 253157366
Change-Id: I481da16985027a49ee464623b6db166d941cab55
2023-03-07 17:09:42 +00:00
Candice Lo
f19f710b01
Set the settings key when the font size is changed
...
The key ACCESSIBILITY_FONT_SCALING_HAS_BEEN_CHANGED will be always ON
after users modify the font size for the first time.
Bug: 269679768
Test: make RunSettingsRoboTests ROBOTEST_FILTER=FontSizeDataTest
Change-Id: I5967227ce05d5b8bf37dfec9aafa015c5cacbd30
Merged-In: I382e4ecd3c335d7b046f157cedc093fc40c3a77a
2023-03-07 15:56:58 +00:00
Candice Lo
dbaea0f1c2
Set the settings key when the font size is changed
...
The key ACCESSIBILITY_FONT_SCALING_HAS_BEEN_CHANGED will be always ON
after users modify the font size for the first time.
Bug: 269679768
Test: make RunSettingsRoboTests ROBOTEST_FILTER=FontSizeDataTest
Change-Id: I382e4ecd3c335d7b046f157cedc093fc40c3a77a
2023-03-07 15:42:29 +00:00
Matías Hernández
bf1b95e0fe
Don't allow setting channels to bypass DND if the app cannot show notifications
...
The fix makes the flow more consistent with preexisting behavior:
* Apps appear in the "Apps that can interrupt" section only if some channels are set to bypass DND *and* the app is able to show notifications.
* Channels cannot be set to bypass if those individual channels are blocked.
Fixes: 265064188
Test: atest AppChannelsBypassingDndPreferenceControllerTest
Change-Id: If10f086fd60f0f70f53adb8f5cd67f90936bc35f
2023-03-07 16:41:36 +01:00
Automerger Merge Worker
4bbb94c9cf
Merge "Merge "Fix battery saver switch test case" into udc-dev am: e4058d20a7
am: 9069305926"
2023-03-07 14:25:45 +00:00
TreeHugger Robot
a24198ddd4
Merge "Fix battery saver switch test case" into udc-dev am: e4058d20a7
am: f0d12adb00
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21809668
Change-Id: I87761d3e79bee10ba1a6ab13ea4ce95cf9f69348
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-07 14:25:06 +00:00
TreeHugger Robot
0268193cde
Merge "Fix battery saver switch test case" into udc-dev am: e4058d20a7
am: 9069305926
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21809668
Change-Id: I1286a75342f1b78a1ac1443e3b11d7f7b13b6549
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-07 14:25:05 +00:00
TreeHugger Robot
9069305926
Merge "Fix battery saver switch test case" into udc-dev am: e4058d20a7
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21809668
Change-Id: Ie27d402ac7e1972d5143a081c78df95374af7ac2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-07 13:53:45 +00:00
TreeHugger Robot
f0d12adb00
Merge "Fix battery saver switch test case" into udc-dev am: e4058d20a7
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21809668
Change-Id: I8158359950190992acbab484f1d369c4d06ab780
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-07 13:53:23 +00:00
Paul Wang
f1007faeba
Avoid disabling LE Audio when BT is off
...
The `updateState` function gets called when the Developer Options menua
is rendered (opened). Originally when BT is off at this point, LE Audio
is disabled, and the user needs to reboot the device again to enable LE
Audio. This CL fixes this and marks the option as disabled when BT is
off.
Bug: 263684630
Test: Manual
Change-Id: I243e2c57fc12bfefd4ab83f63336fb41639f05a0
2023-03-07 13:30:37 +00:00
TreeHugger Robot
e4058d20a7
Merge "Fix battery saver switch test case" into udc-dev
2023-03-07 13:13:19 +00:00
Wesley Wang
5d18287b3b
Fix battery saver switch test case
...
- Fix the test fail which cause by ag/21784766, and also mentioned at
ag/21644522
Bug: 260380584
Test: make SettingsRoboTests
Change-Id: I72a7a24f57a7eeeacefeb40eef3025398329379b
2023-03-07 11:44:55 +00:00
Automerger Merge Worker
fc19678102
Merge "Merge "Add the SPA page enter/leave logging metrcis." into udc-dev am: cb24cb29db
am: ea5b2854af"
2023-03-07 10:40:30 +00:00
Sunny Shao
cc7eeb6f55
Merge "Add the SPA page enter/leave logging metrcis." into udc-dev am: cb24cb29db
am: f336246896
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21787864
Change-Id: I6b1d8d7d542891f55aa42224682d473ca086cf0a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-07 10:40:00 +00:00
Sunny Shao
5a2cf2e096
Merge "Add the SPA page enter/leave logging metrcis." into udc-dev am: cb24cb29db
am: ea5b2854af
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21787864
Change-Id: I4cc393f330b6d9c684ea2cc0724b2c02f31e23d2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-07 10:40:00 +00:00
Automerger Merge Worker
a498eaf481
Merge "Merge "Update KeyboardLayoutPickerControllerTest" into udc-dev am: a2375807ec
am: fb03625f42"
2023-03-07 10:39:54 +00:00
Daniel Huang
416a13846d
Merge "Update KeyboardLayoutPickerControllerTest" into udc-dev am: a2375807ec
am: fb03625f42
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21809665
Change-Id: I464a915916a19d00aac13bccf6e7580b60f87093
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-07 10:39:51 +00:00
Daniel Huang
ce1a944c95
Merge "Update KeyboardLayoutPickerControllerTest" into udc-dev am: a2375807ec
am: bb54f76325
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21809665
Change-Id: I3b23c7538cf37cde0cda1b105c09bd1e6e16077a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-07 10:39:49 +00:00
Automerger Merge Worker
47d792da47
Merge "Merge "Using upper case country code" into udc-dev am: 524b15c627
am: 79d519346f"
2023-03-07 10:39:39 +00:00
SongFerng Wang
c80f98383a
Merge "Using upper case country code" into udc-dev am: 524b15c627
am: 79d519346f
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21809663
Change-Id: I0db4d66e8e32984c33e5bfef0fc90f814adf5883
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-07 10:39:34 +00:00
SongFerng Wang
6e4b026138
Merge "Using upper case country code" into udc-dev am: 524b15c627
am: c680bd69c3
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21809663
Change-Id: Ic14bcd396809aff2522d9c8f935c7abb04bfe6bf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-07 10:39:33 +00:00
Sunny Shao
ea5b2854af
Merge "Add the SPA page enter/leave logging metrcis." into udc-dev am: cb24cb29db
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21787864
Change-Id: I81f0cfcabbf2480c5a5b5083012597d465d457f2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-07 10:23:23 +00:00
Sunny Shao
f336246896
Merge "Add the SPA page enter/leave logging metrcis." into udc-dev am: cb24cb29db
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21787864
Change-Id: I68678e710d61ca13a8a7f1790a83880e6e26b486
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-07 10:22:58 +00:00
Daniel Huang
fb03625f42
Merge "Update KeyboardLayoutPickerControllerTest" into udc-dev am: a2375807ec
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21809665
Change-Id: Ied198e591c3d003dc6a9f763f8268c3f457ef0d0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-07 10:22:18 +00:00
Daniel Huang
bb54f76325
Merge "Update KeyboardLayoutPickerControllerTest" into udc-dev am: a2375807ec
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21809665
Change-Id: Ibeb356895d1f22653afb70ee50b7e4819167e3ab
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-07 10:22:10 +00:00
Sunny Shao
cb24cb29db
Merge "Add the SPA page enter/leave logging metrcis." into udc-dev
2023-03-07 10:12:55 +00:00
Daniel Huang
a2375807ec
Merge "Update KeyboardLayoutPickerControllerTest" into udc-dev
2023-03-07 10:08:10 +00:00
SongFerng Wang
c680bd69c3
Merge "Using upper case country code" into udc-dev am: 524b15c627
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21809663
Change-Id: Id4b6f60415b6d029df04c60d956b88a8cfb0558b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-07 10:05:05 +00:00
SongFerng Wang
79d519346f
Merge "Using upper case country code" into udc-dev am: 524b15c627
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21809663
Change-Id: Id81fe803e40d276ec2cb53a11f43cef0918864f7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-07 10:05:03 +00:00
SongFerng Wang
524b15c627
Merge "Using upper case country code" into udc-dev
2023-03-07 09:43:30 +00:00
danielwbhuang
cf4be05b64
Update KeyboardLayoutPickerControllerTest
...
The logic is changed, so we need to update the test. (https://screenshot.googleplex.com/AnrJgmGfK2fPxmQ.png )
Bug: 270109384
Test: atest KeyboardLayoutPickerControllerTest
[1/8] com.android.settings.inputmethod.KeyboardLayoutPickerControllerTest#isAlwaysAvailable: PASSED (5.876s)
[2/8] com.android.settings.inputmethod.KeyboardLayoutPickerControllerTest#test_createPreferenceHierarchy_shouldAddTwoPreference: PASSED (192ms)
[3/8] com.android.settings.inputmethod.KeyboardLayoutPickerControllerTest#testOnDeviceRemove_getSameDevice_shouldFinish: PASSED (5.797s)
[4/8] com.android.settings.inputmethod.KeyboardLayoutPickerControllerTest#testLifecycle_onStart_shouldRegisterInputManager: PASSED (1.495s)
[5/8] com.android.settings.inputmethod.KeyboardLayoutPickerControllerTest#test_createPreferenceHierarchy_shouldAddOnePreference: PASSED (75ms)
[6/8] com.android.settings.inputmethod.KeyboardLayoutPickerControllerTest#testOnDeviceRemove_getDifferentDevice_shouldNotFinish: PASSED (366ms)
[7/8] com.android.settings.inputmethod.KeyboardLayoutPickerControllerTest#testLifecycle_onStop_shouldCancelRegisterInputManager: PASSED (65ms)
[8/8] com.android.settings.inputmethod.KeyboardLayoutPickerControllerTest#testLifecycle_onStart_NoInputDevice_shouldReturn: PASSED (309ms)
Change-Id: I018873cba9e73c6d684d828858cc1b08d3f2f7f9
2023-03-07 16:31:15 +08:00
SongFerngWang
d1d1ecc9d3
Using upper case country code
...
According to the ISO 3166-1, the two letters country code is upper case.
Bug: 271753491
Test: build pass and local test
Change-Id: Ia71cb6de45682407e4d988522c50d83659fe0017
2023-03-07 16:27:36 +08:00
Sunny Shao
de797e1198
Add the SPA page enter/leave logging metrcis.
...
- Add the SpaLogProvider and SpaLogData for logging writing.
- Write the SPA page enter/leave logging.
Fixes: 271793388
Bug: 253979024
Test: atest SpaActivityTest SpaLogDataTest MetricsDataModelTest
Change-Id: I0ad5af39ba207ac00d58f6392496effa3adc42f4
2023-03-07 16:10:56 +08:00
Angela Wang
0e81d7b2fc
Merge "Updates to use flash notification settings keys in settings provider" into udc-dev am: ccb009c34f
am: 8ec2b4b113
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21507358
Change-Id: Ib2b1d2cd7c707f4c856ad1af6fae7a474e8e794b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-07 07:51:21 +00:00
Angela Wang
c325b89877
Merge "Updates to use flash notification settings keys in settings provider" into udc-dev am: ccb009c34f
am: 4efb1f47f9
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21507358
Change-Id: I1d0711035c54f4a80eade62cc1d06c8f31c13d45
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-07 07:50:06 +00:00
Angela Wang
4efb1f47f9
Merge "Updates to use flash notification settings keys in settings provider" into udc-dev am: ccb009c34f
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21507358
Change-Id: Id824e4ebb5c9701db8af67e155d242a89c5160ea
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-07 07:20:04 +00:00
Angela Wang
8ec2b4b113
Merge "Updates to use flash notification settings keys in settings provider" into udc-dev am: ccb009c34f
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21507358
Change-Id: Idf61369b8241d9b6da635e45c6986560a35c3cef
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-07 07:19:20 +00:00
Angela Wang
ccb009c34f
Merge "Updates to use flash notification settings keys in settings provider" into udc-dev
2023-03-07 06:58:53 +00:00
Automerger Merge Worker
97c858065d
Merge "Merge "Add confirmation dialog for system locale change." into udc-dev am: 39129e09d3
am: 1d2a29ace5"
2023-03-07 04:25:35 +00:00
Tom Hsu
6fe484d60a
Merge "Add confirmation dialog for system locale change." into udc-dev am: 39129e09d3
am: 1d2a29ace5
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21740799
Change-Id: Ie3ec976ca05911c203a50e995b1093b3909dd63d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-07 04:23:53 +00:00
Tom Hsu
437434f9bc
Merge "Add confirmation dialog for system locale change." into udc-dev am: 39129e09d3
am: 358c2d9aaa
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21740799
Change-Id: Id6fb6f6b3a7cc3a4a659ff0a8b07e69178917598
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-07 04:23:45 +00:00
Tom Hsu
1d2a29ace5
Merge "Add confirmation dialog for system locale change." into udc-dev am: 39129e09d3
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21740799
Change-Id: Ic22299672f5063265dd6c024fae2e6442c83ae02
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-07 03:50:08 +00:00