Edgar Wang
b5774a8e2e
Disable developer options when development_settings_enabled is disabled
...
Bug: 270966670
Test: manual
Change-Id: If4296c564ee64804b35a3357f40f8d1d49cd284a
2023-04-11 13:44:02 +08:00
Angela Wang
11648c709e
Merge "Fixes Flash Notification preview button alignment issue in RTL layout" into udc-dev
2023-04-11 04:25:36 +00:00
Chaohui Wang
4c1e924442
Merge "Display App installed in other user in All Apps" into udc-dev
2023-04-11 04:02:39 +00:00
Treehugger Robot
ecfd9d1cb4
Merge "[Regional Pref] Fix the line break in the temperature" into udc-dev
2023-04-11 03:16:21 +00:00
Chris Antol
a9a10fcb2c
Merge "Update Settings owners list" am: 8bf186bcf8
am: 4e2050a17d
am: 626dff2398
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2528132
Change-Id: I9004b6f0cd1cac6d242906378737072e76e6bac2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-11 01:53:33 +00:00
Treehugger Robot
c46dce4705
Merge "Fix broken settings intent CTS test" into udc-dev
2023-04-11 01:44:55 +00:00
Chris Antol
626dff2398
Merge "Update Settings owners list" am: 8bf186bcf8
am: 4e2050a17d
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2528132
Change-Id: I67b9db14578c047f5a73e8c5fd975e0e8e955eb9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-11 01:21:15 +00:00
Chris Antol
4e2050a17d
Merge "Update Settings owners list" am: 8bf186bcf8
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2528132
Change-Id: Ia2be910bc9aa3bf6d693f6012eeae94a51e27d64
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-11 00:50:30 +00:00
Chris Antol
8bf186bcf8
Merge "Update Settings owners list"
2023-04-11 00:03:40 +00:00
Chris Antol
b5237e60d8
Update Settings owners list
...
Change-Id: If950f63c65ecc6313f7096c94c3a5a9bb48be529
2023-04-10 22:57:24 +00:00
Randy Pfohl
00d12bbe22
Merge "adding new animation to be used when gesture tutorial package is available" into udc-dev
2023-04-10 19:47:27 +00:00
Kweku Adams
d6409c4ee1
Hide TARE page when disabled.
...
Hide the TARE page option when TARE is disabled or the page is
explicitly flagged to be shown.
Bug: 270498386
Bug: 270964794
Test: manually modify flags and check if TARE option shows
Change-Id: Icc23a34ff1b9af5f1ddb649c4aefbea22a123498
2023-04-10 19:44:59 +00:00
Hao Dong
22c608be4d
Merge "Show a dialog preventing face enrollment in split mode." into udc-dev
2023-04-10 18:58:27 +00:00
Becca Hughes
20cb8478d4
Fix broken settings intent CTS test
...
We originally added this data field to the SYNC_SETTINGS intent as a backup but since we have our own and this is breaking CTS. This reverts that change.
Test: make & CTS
Bug: 275385380
Change-Id: I0da949e4adea9c3c8dfdb61017afe6908e72147c
2023-04-10 16:03:27 +00:00
Zoey Chen
795d2574fc
[Regional Pref] Fix the line break in the temperature
...
Bug: 276023859
Test: local test
Change-Id: Ib2c454cbf301295ef4baf423d2aae618742a0438
2023-04-10 14:53:16 +00:00
YK Hung
c429ca3e2f
Merge "Add manual enabled battery saver reason (2/4)" into udc-dev
2023-04-10 14:03:33 +00:00
Angela Wang
0eeae4f8d0
Fixes Flash Notification preview button alignment issue in RTL layout
...
The preview button text is left-aligned in right to left language. Makes
it to be right-aligned with adding layout_gravity=start on the view.
Bug: 276608857
Test: checks the UI manually
Change-Id: I1322c1fcc433670863603c2d0b5438f39ecef998
2023-04-10 08:48:03 +00:00
Daniel Huang
3f16621b86
Merge "Touchpad settings' icons update" into udc-dev
2023-04-10 06:49:06 +00:00
Treehugger Robot
35f9d486a5
Merge "Ignore ActivityNotFoundException from app launch" into udc-dev
2023-04-10 06:48:17 +00:00
danielwbhuang
eaa6a03d65
Touchpad settings' icons update
...
Two icons need to be updated:
1. The touchpad speed setting inside of the touchpad settings
2. The bottom right tap setting inside of the touchpad settings
https://screenshot.googleplex.com/5QKLTwX8qNrnRsj.png
https://screenshot.googleplex.com/7iHNKwzwAZm5h8N.png
Bug: 269100659
Test: manual
Change-Id: I776e94325b1f54475f406a2fe11c4db4a0205f40
2023-04-10 06:35:24 +00:00
Chaohui Wang
9661f163c3
Fix App languages for work profile
...
Use the correct work profile context to fix.
Fix: 277536202
Test: Manually with App languages when work profile is installed
Change-Id: Ibc3bb47127228c8dc6ebf073cd7881727321d5c8
2023-04-10 13:32:24 +08:00
Tom Hsu
5240d251e1
Merge "Make all sim list by ordering with slot id" into udc-dev
2023-04-10 04:13:55 +00:00
Chaohui Wang
c688f93ed9
Display App installed in other user in All Apps
...
Only for admin user.
Also clean up unused getInstallationStatus().
Fix: 277299765
Test: Manually with All Apps when multiple users is on
Test: Unit test
Change-Id: I4de681c101a605e3517dcd8765bf7a95d1b76417
2023-04-10 03:06:01 +08:00
Elliot Sisteron
bc1ee1264b
Merge "Change the label of CombinedBiometricProfileSettingsActivity." into udc-dev
2023-04-08 21:06:55 +00:00
Hao Dong
64277a23bb
Show a dialog preventing face enrollment in split mode.
...
Test: atest CombinedBiometricProfileSettingsTest
Test: atest FingerprintSettingsFragmentTest
Test: manaul test- go to split screen mode and try to enroll
face
Bug: 276938441
Change-Id: I45e859b453700aa79f7774fb5deda81b1f30e5a5
2023-04-07 21:53:52 +00:00
Hao Dong
8930e6ea87
Merge "Update the limit of split screen dialog strings." into udc-dev
2023-04-07 20:43:39 +00:00
Florian Mayer
f58ea4671e
Merge "Move bootloader_override property" into udc-dev
2023-04-07 20:06:25 +00:00
Varun Shah
4a5e0e5bc7
Update the default wellbeing package config.
...
defaultWellbeingPackage is now deprecated and should not be used.
Instead, point all references to the new systemWellbeing config.
Bug: 233363529
Test: atest AmbientDisplayAlwaysOnPreferenceControllerTest
Test: atest DarkModeCustomBedtimePreferenceControllerTest
Test: atest DarkModeScheduleSelectorControllerTest
Test: atest WhenToDreamPreferenceControllerTest
Change-Id: Ia55ce505c5010e401ec0dc18a2fed41d3a692c7a
2023-04-07 19:55:19 +00:00
Hao Dong
9266101608
Update the limit of split screen dialog strings.
...
Bug: 277359484
Test: N/A
Change-Id: I006fa2bb26a5d2702af4bd9b2914278934ec4b1f
2023-04-07 19:25:11 +00:00
Florian Mayer
1ef1073694
Move bootloader_override property
...
Bug: 274953227
Change-Id: I391329a14a5dda741103bd0097fee65ea97c866a
2023-04-07 18:32:30 +00:00
Pfohl
b094ed8e7d
adding new animation to be used when gesture tutorial package is available
...
test: built and verified animation shows up and is clickable to gesture tutorial menu on handheld devices
bug:248342586
Change-Id: I29a68accf67c4efc6b94058c2702f106edfec0a8
2023-04-07 18:20:15 +00:00
Zoey Chen
8cd0c5816c
Merge "[i18n] Use Framelayout instead of Nest scroll" into udc-dev
2023-04-07 17:57:28 +00:00
Zoey Chen
4800801661
[i18n] Use Framelayout instead of Nest scroll
...
Bug: 274538667
Test: local test
Change-Id: I2a6917a639ac6ba987df425d8974f9d51487a41f
2023-04-07 16:34:47 +00:00
Roshan Pius
7a49bfe6b0
Merge changes I8a6f01ab,I1b8c06a0 into udc-dev
...
* changes:
settings(uwb): Show message when UWB is unavailable due to regulatory
settings(uwb): Refactor UwbPreferenceController
2023-04-07 16:03:48 +00:00
Bill Yi
eff901c18e
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: a568dc677b
-s ours am: efc9c4ab6b
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22522739
Change-Id: I3b1296e694c0cbec9b56fd451eac84106a10e273
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-07 15:51:54 +00:00
tom hsu
ef595a7915
Make all sim list by ordering with slot id
...
Bug: 271975836
Test: Manual test
Change-Id: Ie568145a978548e4aa3ee80e06b2b75524f8853a
2023-04-07 23:37:18 +08:00
Bill Yi
efc9c4ab6b
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: a568dc677b
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22522739
Change-Id: I2039a343cfc2c7ba6ee6409e2649bf0d7aed6f7f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-07 15:21:01 +00:00
Zaiyue Xue
fbe85872b3
Merge "Refactor function to support slot size not must be two." into udc-dev
2023-04-07 13:09:11 +00:00
Zaiyue Xue
06b8092fdb
Refactor function to support slot size not must be two.
...
The function insertHourlyUsageDiffDataPerSlot() only supports the slot
has two-hour data now. This assumption is not neccessary. Refactor this
so in my next cl ag/22379150, the last-full-charge slot and now slot
could have only one-hour data.
Bug: 271214926
Test: manual
Change-Id: I57f7898ce1c92b8849baf9a44314455adf0098f4
2023-04-07 19:49:52 +08:00
Jason Chiu
c239942dee
[automerger skipped] Refine permission check process of 2-pane deep link am: 0f13f70655
-s ours am: 1bd4b6e2ea
-s ours
...
am skip reason: skipped by user chiujason
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22235906
Change-Id: I17774688cd6ca04a30541be3d65aa099dfd5d5b7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-07 06:54:14 +00:00
Jason Chiu
1bd4b6e2ea
[automerger skipped] Refine permission check process of 2-pane deep link am: 0f13f70655
-s ours
...
am skip reason: skipped by user chiujason
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22235906
Change-Id: I5669aefc0320ecdc610c56e0aade5600b5a1c79a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-07 06:26:10 +00:00
Bill Yi
a568dc677b
Import translations. DO NOT MERGE ANYWHERE
...
BUG:271250248
Auto-generated-cl: translation import
Change-Id: I07d10fb2cb1cb267bc78b0be2c930d7dec9d9c76
2023-04-06 20:54:16 -07:00
Jason Chiu
f98cfff495
[automerger skipped] [resolved conflict] Refine permission check process of 2-pane deep link am: 0f13f70655
am: 5d50556ce2
-s ours am: f133736e6c
-s ours am: e5fa405609
-s ours
...
am skip reason: Merged-In Ie69742983fb74ee2316b7aad16461db95ed927c2 with SHA-1 4f7205b2ea
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22505800
Change-Id: I08568549208788f413eeca7cda8214862f986da1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-06 18:59:53 +00:00
Roshan Pius
6fc40046a3
settings(uwb): Show message when UWB is unavailable due to regulatory
...
Bug: 270515435
Test: Manual tests
Test: atest UwbPreferenceControllerTest
Change-Id: I8a6f01aba237234fe88e42ba338a1df02623f7da
2023-04-06 11:34:15 -07:00
Roshan Pius
95892f3394
settings(uwb): Refactor UwbPreferenceController
...
1. Use handler executor to directly handle state changed callbacks in
the same thread as APM handling.
2. Use the same flow to fetch the initial APM mode & UWB state from
onStart()
3. Store the state and reason code (to be used for showing regulatory
message in follow up CL).
4. Refactor the class for better unit testing (use mocks, avoid reaching
into class members being tested by using argument captor).
Bug: 270515435
Test: Manual tests
Test: atest UwbPreferenceControllerTest
Change-Id: I1b8c06a05691d9512de65ca2d61f3963dab230ab
2023-04-06 11:34:08 -07:00
Jason Chiu
e5fa405609
[automerger skipped] [resolved conflict] Refine permission check process of 2-pane deep link am: 0f13f70655
am: 5d50556ce2
-s ours am: f133736e6c
-s ours
...
am skip reason: Merged-In Ie69742983fb74ee2316b7aad16461db95ed927c2 with SHA-1 4f7205b2ea
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22505800
Change-Id: I4bafcdad13776f705b0a80380a06249bd88a424c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-06 18:27:25 +00:00
Jason Chiu
f133736e6c
[automerger skipped] [resolved conflict] Refine permission check process of 2-pane deep link am: 0f13f70655
am: 5d50556ce2
-s ours
...
am skip reason: Merged-In Ie69742983fb74ee2316b7aad16461db95ed927c2 with SHA-1 4f7205b2ea
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22505800
Change-Id: If85b58dac4614b53683b7718ea5e6ed3db2fdd3a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-06 18:00:33 +00:00
Darrell Shi
7242e7bb86
Merge "Hide timeout to user0 pref when switching blocked." into udc-dev
2023-04-06 15:22:25 +00:00
Bill Yi
e0ac8c3aea
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: aca33b33aa
-s ours am: c364a011ec
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22480520
Change-Id: I63ea81451ff0241ace1c2e8954392ad5c4a7b18f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-06 14:26:33 +00:00
Bill Yi
f0a5a877f0
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: a5ef604de7
-s ours am: 10c1798572
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22480520
Change-Id: I609fb4f3846f8bd88d5bf25e6b73d257e0302083
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-06 14:26:26 +00:00