Jean Chen
9a2e9c966b
Merge "Set the shortcut size to large when user enabled Magnification" into main
2023-07-11 07:43:01 +00:00
Treehugger Robot
70c66ab121
Merge "Add a mechanism to log battery usage periodic job events" into udc-qpr-dev am: 4ac05f8cac am: 5c046f1d4e
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23971085
Change-Id: I36e646b84ae373672328a6f145803ef5743a33b9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-11 07:07:38 +00:00
Treehugger Robot
5c046f1d4e
Merge "Add a mechanism to log battery usage periodic job events" into udc-qpr-dev am: 4ac05f8cac
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23971085
Change-Id: I32334ef24562e212e8817df7792b386a61f822f1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-11 06:52:26 +00:00
SongFerng Wang
b42d46fed5
Merge "To fix waiting too long issue when psim -> esim" into udc-d1-dev am: 717ce2b91f am: 96c2da1340 am: 723c5e8754
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23913080
Change-Id: I85cddc2f530b8d7308dcb742736e8b4210d7bb99
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-11 06:44:49 +00:00
Treehugger Robot
4ac05f8cac
Merge "Add a mechanism to log battery usage periodic job events" into udc-qpr-dev
2023-07-11 06:09:54 +00:00
SongFerng Wang
723c5e8754
Merge "To fix waiting too long issue when psim -> esim" into udc-d1-dev am: 717ce2b91f am: 96c2da1340
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23913080
Change-Id: I2f10b967b2b98903e7bba9a9e0a74ab02ce1a8e6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-11 06:02:24 +00:00
SongFerng Wang
d3f8caa506
Merge "To fix waiting too long issue when psim -> esim" into udc-d1-dev am: 717ce2b91f
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23913080
Change-Id: Ifd57844fa7d17836a8c681b16b8b7e1830aabfec
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-11 05:26:45 +00:00
SongFerng Wang
96c2da1340
Merge "To fix waiting too long issue when psim -> esim" into udc-d1-dev am: 717ce2b91f
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23913080
Change-Id: Iabad339cd438114562b16a495f2e9c15249c38b9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-11 05:22:21 +00:00
SongFerng Wang
717ce2b91f
Merge "To fix waiting too long issue when psim -> esim" into udc-d1-dev
2023-07-11 04:55:18 +00:00
Jean
137cc9af68
Set the shortcut size to large when user enabled Magnification
...
Set the settings shortcut size to large when the Magnification shortcut it enabled. Provide users with the large size as the default, which is easy to see.
Bug: 283844702
Test: manually - attach videos in the bug
Test: atest ToggleScreenMagnificationPreferenceFragmentTest
Test: make RunSettingsRoboTests ROBOTEST_FILTER=ToggleScreenMagnificationPreferenceFragmentTest
Change-Id: I8fac5780b8388b1b4f124cffbdd305235f035e72
2023-07-11 02:21:09 +00:00
Joshua Mccloskey
1c7a298038
Merge "Moving FingerprintSettings to Kotlin" into udc-qpr-dev-plus-aosp
2023-07-10 19:02:01 +00:00
Treehugger Robot
3365eb3e7a
Merge "Improve volume slider" into main
2023-07-10 10:27:21 +00:00
Chaohui Wang
dc3fc1dff0
Fix crash when call getMobileTemplate am: 9132535e5e am: f3d6684e14
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24002328
Change-Id: Ifbeab53d402207c0cd63ab225f30af6bdc4da824
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-10 08:56:59 +00:00
Chaohui Wang
1578772d63
Fix crash when call getMobileTemplate am: 9132535e5e
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24002328
Change-Id: I01c40793839a7d5fbd0b7834c67184c228356c0f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-10 08:16:04 +00:00
Chaohui Wang
f3d6684e14
Fix crash when call getMobileTemplate am: 9132535e5e
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24002328
Change-Id: Ia4b74067049da536c8f98230e588b579379fdad6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-10 08:12:07 +00:00
Chaohui Wang
9132535e5e
Fix crash when call getMobileTemplate
...
There are 2 versions of getMobileTemplate.
The previous Change I7865823d6af2c812afa35d047bd79b60ae4b0fb7 change
from the correct version to the wrong version.
Change back to fix the issue.
Fix: 290381395
Test: manual - on Mobile Settings page
Test: unit test
Change-Id: Icb3147558176d53dc77e7bd39ab54a5dad13c12b
Merged-In: I6227f973ec38e5b0520f54a41ac2ede2929a1bcc
2023-07-10 14:20:07 +08:00
Jason Chang
c805b2e163
Merge "Fix the “screen lock option” and password restriction view are in the wrong position on PIN/Password/Pattern in the landscape mode." into udc-qpr-dev am: 5a0d4d1cc3 am: 17d1e70930
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23712165
Change-Id: Ic73f5be63e2d9de3ede40fcfdb63357cab867634
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-10 04:19:00 +00:00
Jason Chang
17d1e70930
Merge "Fix the “screen lock option” and password restriction view are in the wrong position on PIN/Password/Pattern in the landscape mode." into udc-qpr-dev am: 5a0d4d1cc3
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23712165
Change-Id: I8c58292e2b93f0e827d059c44046002d72eb772b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-10 03:41:17 +00:00
Jason Chang
5a0d4d1cc3
Merge "Fix the “screen lock option” and password restriction view are in the wrong position on PIN/Password/Pattern in the landscape mode." into udc-qpr-dev
2023-07-10 03:06:07 +00:00
Treehugger Robot
3943e14eff
Merge "Fix do not disturb bypass user restriction" into main
2023-07-10 02:44:53 +00:00
Treehugger Robot
6a12444366
Merge "Restrict ApnEditor settings" into main
2023-07-07 13:50:42 +00:00
Mill Chen
c69899ccef
Improve volume slider
...
In the Settings, the Preference#onBindViewHolder will be invoked
3 times when a preference is getting highlighted. This caused that a
disabled volume slider becomes enabled after getting highlighted.
This change is to optimize the init method of VolumeSeekbarPreference
to speed up the initial process and fix the unexpected behavior.
Bug: 275352565
Test: manual test and robotest pass
Change-Id: I77f28386f6d6e4a45297f1ca7bcbaf16ed6136a4
2023-07-07 20:52:13 +08:00
Mill Chen
45d9e390b2
Fix do not disturb bypass user restriction
...
Do not disturb search result can still switch on/off when users are
restricted by DISALLOW_ADJUST_VOLUME. The DND search result is presented
by slice and there was no user restriction check when creating DND
slice, which caused DND search result can access. To prevent DND from
being access if user restriction is enabled, adding user restriction
check during creating the DND slice.
Bug: 242846154
Test: robotest pass and manual test
Change-Id: I897a99e9dda2f9f84365d96841a4c4f4cf975331
2023-07-07 20:25:18 +08:00
Weng Su
4e18e7414c
Restrict ApnEditor settings
...
- Finish ApnEditor settings if user is not an admin
- Finish ApnEditor settings if user has DISALLOW_CONFIG_MOBILE_NETWORKS restriction
Bug: 279902472
Test: manual test
atest -c ApnEditorTest
Change-Id: Iecdbbff7e21dfb11e3ba385858747a220cfd3e04
2023-07-07 20:01:04 +08:00
SongFerngWang
d94ac12190
To fix waiting too long issue when psim -> esim
...
if the user swithes slot from psim to esim, then the settings
need to wait the simSlotMapping completed and it has a timer to avoid
UI stay here too long.
Since the framework did not sned the carrier config changed with vaild
subId in MEP + psim->esim case, it cause the settings does not know the
simSlotMapping completed and it stay here until timeout.
For MEP case, changing this condition as SimSlotStatusChanged
Bug: 273813956
Test: atest UiccSlotUtilTest
Change-Id: Ic09dbcb3629fe13770f3ad301c0a396d6745969f
2023-07-07 10:22:49 +00:00
Chris Göllner
7477fccd0a
Add foldable related controllers to exempt_slice_controller_not_in_xml
...
These controllers cannot be added in XML, as we don't know at compile
time how many there will be.
Fixes: 289967395
Test: N/A
Change-Id: I5b0f6e38937aa6c7d96ac88b6d4cd46c39323ce2
2023-07-07 10:13:15 +00:00
ykhung
ef66549e64
Add a mechanism to log battery usage periodic job events
...
Example history log:
Jul 07, 2023, 15:28:51 SCHEDULE_JOB triggerTime=Jul 07, 2023, 16:00:00
Jul 07, 2023, 15:32:16 FETCH_USAGE_DATA
Jul 07, 2023, 15:32:17 INSERT_USAGE_DATA size=37
Jul 07, 2023, 15:43:45 FETCH_USAGE_DATA
Jul 07, 2023, 15:43:48 INSERT_USAGE_DATA size=47
Jul 07, 2023, 15:43:49 SCHEDULE_JOB triggerTime=Jul 07, 2023, 16:00:00
Bug: 284893240
Test: make test RunSettingsRoboTests ROBOTEST_FILTER=com.android.settings.fuelgauge
Change-Id: I45a1ce0ce9b70f095702727e53d7b7ce8824abdb
2023-07-07 17:47:19 +08:00
Chun-Ku Lin
79ffa2a45f
Merge "use L10n-friendly runtime number formatting based on locale" into main
2023-07-06 17:09:25 +00:00
Tetiana Meronyk
de9efe778b
Merge "Fix "Allow guest to use telephony" toggle not updating its value" into udc-qpr-dev am: 8141b10269 am: 70bdc38d4a
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23899169
Change-Id: Ifccee75d893bba0de3814a18b68eb0f32d6d0da6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-06 14:41:45 +00:00
Tetiana Meronyk
70bdc38d4a
Merge "Fix "Allow guest to use telephony" toggle not updating its value" into udc-qpr-dev am: 8141b10269
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23899169
Change-Id: I44ca0e373d432ab38e8a3fe8a19a4676ca31a771
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-06 14:01:26 +00:00
Tetiana Meronyk
8141b10269
Merge "Fix "Allow guest to use telephony" toggle not updating its value" into udc-qpr-dev
2023-07-06 13:17:36 +00:00
Treehugger Robot
b3b27451a3
Merge "Make wifi calling slice consistent" into main
2023-07-06 05:45:18 +00:00
Treehugger Robot
e761690e08
Merge "Clean up assist gesture from Settings" into main
2023-07-06 05:42:20 +00:00
Quang Luong
42f6baa67a
Merge "Use speed string from WifiEntry" into udc-qpr-dev am: 062c4b634d am: e90bb0aedc
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23783053
Change-Id: Ia136e2a699a32d55a7566bc8143ed7396e848326
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-06 03:08:39 +00:00
Mill Chen
fbe8e9f571
Make wifi calling slice consistent
...
The wifi calling search result is grayed out if it is not using
carrier WFC. In order to ensure the search result is aligned with the
corresponding settings, the checker of wifi calling slice will be the
same with wifi calling preference.
Bug: 285594611
Test: manual test
Change-Id: I22d794332a0cc2ecbcb8b5e8836364e926400cbf
2023-07-06 02:41:02 +00:00
Quang Luong
e90bb0aedc
Merge "Use speed string from WifiEntry" into udc-qpr-dev am: 062c4b634d
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23783053
Change-Id: Ica238c0140af95a1fc3a42a6ded4838bd03d7412
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-06 02:28:36 +00:00
Quang Luong
062c4b634d
Merge "Use speed string from WifiEntry" into udc-qpr-dev
2023-07-06 01:49:56 +00:00
Michael Mikhail
1db4bc3676
Merge changes I4bd65bdb,Ibe80b4b1 into udc-dev am: 83c13d6563 am: 7c53d299a2
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23830044
Change-Id: I95fc65d5a3fd0ef2962742769927deacfd92620d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-05 16:29:52 +00:00
Michael Mikhail
7c53d299a2
Merge changes I4bd65bdb,Ibe80b4b1 into udc-dev am: 83c13d6563
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23830044
Change-Id: I978498d9acbb734534bf2ad1dad7e5cfb2434237
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-05 15:51:23 +00:00
Chaohui Wang
8c37af5ed1
Merge "Use DataUsageLib in DataUsagePreferenceController"
2023-07-05 15:24:45 +00:00
Michael Mikhail
83c13d6563
Merge changes I4bd65bdb,Ibe80b4b1 into udc-dev
...
* changes:
Trigger talkback for notification volume change
Add content description to volume title in settings.
2023-07-05 15:11:09 +00:00
Treehugger Robot
bc47f1aac5
Merge "Fix test case failure." into udc-qpr-dev am: b2f436f310 am: 721efc0ed5
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23902483
Change-Id: I504ea6842af716ef73468b7e7789c983f5e3a540
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-05 10:17:37 +00:00
Treehugger Robot
721efc0ed5
Merge "Fix test case failure." into udc-qpr-dev am: b2f436f310
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23902483
Change-Id: I7e3bcef9a4dc00d76c934ce2c55759089179f99a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-05 09:35:31 +00:00
Treehugger Robot
b2f436f310
Merge "Fix test case failure." into udc-qpr-dev
2023-07-05 08:44:06 +00:00
Yi-Ling Chuang
434a04b32c
Fix test case failure.
...
Fix the test failure of BatterySettingsFeatureProviderImplTest. The
actual method call can't be passed with an argument matcher. Use the
real object instead.
Fixes: 289737082
Test: robotests
Change-Id: Ia48e7b67ba94a8bb67ac1d26c502894a664c2b70
2023-07-05 15:43:34 +08:00
Jason Chiu
8ecbe486f8
Merge "Do not finish activity when the input account doesn't exist"
2023-07-05 07:15:22 +00:00
Chaohui Wang
225af2b43f
Merge "Remove context from getSupportFeatureProvider"
2023-07-05 03:37:55 +00:00
Tetiana Meronyk
b88bad678d
Fix "Allow guest to use telephony" toggle not updating its value
...
Bug: 283004333
Test: atest GuestTelephonyPreferenceControllerTest
Change-Id: I2f13a989bbe6a925c0e88350dbc215f6f188fe17
2023-07-04 15:32:14 +00:00
Chaohui Wang
77fd6aa117
Use DataUsageLib in DataUsagePreferenceController
...
DataUsagePreferenceController use DataUsageLib before, and DataUsageLib
and com.android.settingslib.net.DataUsageUtils has same functionality.
com.android.settingslib.net.DataUsageUtils will be clean up, so use
DataUsageLib again.
Bug: 286082055
Test: m Settings
Change-Id: I6227f973ec38e5b0520f54a41ac2ede2929a1bcc
2023-07-04 19:08:46 +08:00
Chaohui Wang
47ff48b831
Fix DataUsagePreferenceController ANR am: d42cc8e5e2 am: eb8948e309 am: e76ff6ffa5
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23896225
Change-Id: I2b24b59f1d0bcd2b02359128d474f36a74eb367e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-04 10:28:19 +00:00