TreeHugger Robot
7c1efa29cc
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: a0d84081e2
-s ours am: c1ce13f040
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20872363
Change-Id: Ic69e4ac289cc3df6e1072770ee5f3ad95ae85097
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-01-06 11:39:52 +00:00
Bill Yi
68a8c8d2c3
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 38268df283
-s ours am: d53751548b
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20872363
Change-Id: If72f0f7e9f6eb8f33c839d64d5e8c54f01741ee5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-01-06 11:39:37 +00:00
TreeHugger Robot
024dc88ddc
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: 80404721aa
-s ours am: 5291d0476f
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20872362
Change-Id: I8e664557a9968208aa6c36ff466a0999737f8f45
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-01-06 11:39:22 +00:00
Bill Yi
cec23edebe
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 6480a5ff9c
-s ours am: 53f80eb54a
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20872362
Change-Id: Iab17c32c513b94691cf22b2d06d812f3058b903d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-01-06 11:39:18 +00:00
Grace Cheng
fb77440a6f
Merge "Updates sfps animations for natural orientation" into tm-qpr-dev am: 28d0e72a6d
am: 305fbd98db
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20860930
Change-Id: Ia3ffc6fadcec112adc45265bb6953881a9b02ca0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-01-06 11:36:09 +00:00
Vania Januar
0bcac61001
Merge "Intent to open USI device details page."
2023-01-06 11:30:53 +00:00
Vania Januar
ce93c656aa
Show None default app in stylus preference if no Notes holder.
...
This also fixes the role holder not updating when the
default role holder has changed.
Test: StylusDevicesControllerTest
Bug: 254834764
Change-Id: Iec7ed7698f18279da9a04918dcdf3e20e73609d1
2023-01-06 11:25:35 +00:00
Edgar Wang
f7a6d073f0
Set key for the SwitchPreferences of Connected devices > USB
...
Change-Id: Ib2fce60bf6843c8db2d45ebdd6bd576657aedeb8
Test: manual
2023-01-06 11:25:20 +00:00
Zaiyue Xue
833e47d851
[Battery usage U] [UI] Show total "Screen On Time" in the battery usage page
...
Screen record: https://drive.google.com/open?id=16ZOp1E2YBzWQXbnXl786FaLFPel-S9CF&authuser=0&resourcekey=0-oRqCrdTc9FZjVgsq9orhEw&usp=drive_link
For Arabic: https://drive.google.com/open?id=1zh_4jcUnqLC6CDgwju1qQkWJ0QCtm19c&authuser=0&resourcekey=0-kuKfDdOTWxqOUmD0RfPNLQ&usp=drive_link
Next step: show screen on time for each app
Bug: 258120710
Test: manual
Change-Id: I2085a2a85ebd50b2ac876972f6a8ebbf6f20246c
2023-01-06 19:09:52 +08:00
Ankita Vyas
3672fb4b85
AppClone: Changes in AppInfo page for cloned app.
...
- Hides preferences for cloneable apps under Cloned Apps page
- Displays Create option for cloneable apps under Cloned Apps page.
- Invokes CloneBackend on click of create and refreshes to display newly
cloned app's AppInfo page.
- Appends suffix 'clone' for cloneable/cloned app.
- Displays text 'Delete' instead of 'uninstall'.
Screencast: https://screencast.googleplex.com/cast/NjI3MDEyMjk1MzAxNTI5NnxhOTIxZDhiZC03Zg
Bug: 262375058
Test: make RunSettingsRoboTests -j64
Change-Id: I34018f6cc7420d2667c25fbca59c832b398d723e
2023-01-06 08:31:20 +00:00
Bill Yi
916adf4270
[automerger skipped] Merge "Merge TQ1A.230105.002 to stage-aosp-master - DO NOT MERGE" into stage-aosp-master am: 182c397d37
-s ours
...
am skip reason: Merged-In I77029014d72b8ac9b579357550f031bef20e32cb with SHA-1 8e2f0b970b
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20875054
Change-Id: I083e54e24f3894ef3d798bfafce6aa0b221091b2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-01-06 07:33:21 +00:00
Bill Yi
5f3ffc5ec6
[automerger skipped] Merge TQ1A.230105.002 to stage-aosp-master - DO NOT MERGE am: c286104951
-s ours
...
am skip reason: Merged-In I77029014d72b8ac9b579357550f031bef20e32cb with SHA-1 8e2f0b970b
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20875054
Change-Id: Ia8ed6202af921e0e4e4e175da868c7a7ef03fa10
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-01-06 07:32:54 +00:00
Zaiyue Xue
814eff1c24
Fix the inverted logic to judge whether an app is system app.
...
Bug: 264626206
Fix: 264626206
Test: maunal
Change-Id: I3750e3b11e444add27243c492cf8968373cd57d0
2023-01-06 15:24:44 +08:00
Bill Yi
182c397d37
Merge "Merge TQ1A.230105.002 to stage-aosp-master - DO NOT MERGE" into stage-aosp-master
2023-01-06 07:00:53 +00:00
Chaohui Wang
87e3064b33
Redirect to AppInfoSettings when SPA is on
...
From recently opened apps or when click app icon from some app info
pages.
Bug: 236346018
Test: Manually with Settings
Change-Id: Ia4e1789196875eb0d10fdb6363f0d65cb88cb563
2023-01-06 14:46:27 +08:00
Jason Hsu
ed2728073f
Merge "Fix preferences under Related category can not launch its own page in bluetooth device details page"
2023-01-06 06:27:03 +00:00
TreeHugger Robot
2462e490ab
Merge "Refine TetherSettings with ViewModel"
2023-01-06 03:38:49 +00:00
Chaohui Wang
7d7bcaf46f
Reload package info for each time enter App Info
...
So disable button and app settings preference status can be updated.
Bug: 236346018
Test: Manually with Settings
Change-Id: I4409cb25f9d959404653de665b55f65b3293c56b
2023-01-06 11:31:00 +08:00
Bill Yi
2681d8cc05
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: Ic8d9f286c53e321a933d98f9c05bbc6bb8bf98f0
2023-01-05 18:07:21 -08:00
menghanli
3676d1b617
Exported A11y features blocked by IT admin can be bypassed using a11y shortcuts
...
Root cause: The IT admin dialog cannot be launched by framework features.
Solution: Allow framework features can launch the IT admin dialog to align the setting preference experience.
Bug: 254223085
Test: atest AccessibilityShortcutChooserActivityTest
Change-Id: I1c0ce8244d874049cc2799c580b2f79ece85d32d
2023-01-05 23:48:56 +00:00
TreeHugger Robot
c1ce13f040
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: a0d84081e2
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20872363
Change-Id: I3d784788884f9b80733786dc73d9bb62ffef817b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-01-05 20:37:46 +00:00
Bill Yi
d53751548b
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 38268df283
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20872363
Change-Id: I9cb72e3462a02722d9f8403bd44d9e19917b5e4e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-01-05 20:37:29 +00:00
TreeHugger Robot
5291d0476f
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: 80404721aa
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20872362
Change-Id: Ia554a744e24581000e42e6db0c57a0510b86fbf4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-01-05 20:37:16 +00:00
Bill Yi
53f80eb54a
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 6480a5ff9c
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20872362
Change-Id: I145c5cf356be12dcdec6bf677f7f8195cea9b3d2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-01-05 20:37:00 +00:00
Grace Cheng
305fbd98db
Merge "Updates sfps animations for natural orientation" into tm-qpr-dev am: 28d0e72a6d
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20860930
Change-Id: Id161cb7489bc786288adf6fb578c0ed525264202
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-01-05 20:32:17 +00:00
TreeHugger Robot
a0d84081e2
Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev
2023-01-05 20:13:42 +00:00
TreeHugger Robot
80404721aa
Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev
2023-01-05 20:13:42 +00:00
TreeHugger Robot
d54c9cab7d
Merge "Import translations. DO NOT MERGE ANYWHERE"
2023-01-05 20:06:08 +00:00
TreeHugger Robot
2ff2a828f2
Merge "Import translations. DO NOT MERGE ANYWHERE"
2023-01-05 20:06:08 +00:00
TreeHugger Robot
2d35260ed4
Merge "Import translations. DO NOT MERGE ANYWHERE"
2023-01-05 20:06:08 +00:00
Grace Cheng
28d0e72a6d
Merge "Updates sfps animations for natural orientation" into tm-qpr-dev
2023-01-05 19:57:19 +00:00
Becca Hughes
f31920a613
Merge "Fix bug in credential manager settings (dialogs)"
2023-01-05 18:20:55 +00:00
Bill Yi
fc6fc6cc49
Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-mainline-prod
2023-01-05 17:40:08 +00:00
Vania Januar
c3f6c0d593
Merge "Replace placeholder ROLE_ASSISTANT with ROLE_NOTES."
2023-01-05 14:49:31 +00:00
Tetiana Meronyk
c0e31b3be1
Merge "Allow creating admin users when 'config_enableMultipleAdmins' property is enabled"
2023-01-05 14:30:34 +00:00
Chaohui Wang
4525cfb462
Merge "Remove EXTRA_USER_HANDLE from startSpaActivityForApp"
2023-01-05 11:06:08 +00:00
Chaohui Wang
875cbba0af
Merge "Add spinner options to "All apps""
2023-01-05 11:05:23 +00:00
jasonwshsu
829a671265
Fix preferences under Related category can not launch its own page in bluetooth device details page
...
Root Cause: KeyboardSettingsPreferenceController override
handlePreferenceTreeClick() without checking the preference key, it will lead to handle all preferences' click action.
Solution: Check the preference is the expected preference key
Bug: 264017256
Test: make RunSettingsRoboTests ROBOTEST_FILTER=KeyboardSettingsPreferenceControllerTest
Change-Id: Idcdadc323df5b758b4b21329227e2bb721b1c394
2023-01-05 10:48:55 +00:00
Yilin Cai
181119f0b5
Merge "Add mapping to the WiFi-control SPA page in Settings app."
2023-01-05 10:15:23 +00:00
Weng Su
a396a4d8b9
Refine TetherSettings with ViewModel
...
- Use ViewModel to handle the TetheringManager's lifecycle.
- Use LiveData to observe TetheredInterfaces's changes instead of callbacks.
Bug: 246531382
Test: manual test
make RunSettingsRoboTests ROBOTEST_FILTER=TetherSettingsTest
atest -c TetheringManagerModelTest
Change-Id: Ib1a710a19a5340f63401a37b5c2b0bc307ac82f0
2023-01-05 17:13:57 +08:00
Chaohui Wang
c1f7222273
Merge "Move product specific strings to res-product"
2023-01-05 08:55:25 +00:00
William Escande
377d52bfc1
Merge "Fix NPE in BluetoothPairingController when comparing BluetoothClass" am: 9aa06f28e8
am: ce2edfa3d4
am: 1da99510b1
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2373748
Change-Id: Ib68558e8896e5bd282eacd34f2bc2044bed5f54c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-01-05 07:37:29 +00:00
William Escande
1da99510b1
Merge "Fix NPE in BluetoothPairingController when comparing BluetoothClass" am: 9aa06f28e8
am: ce2edfa3d4
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2373748
Change-Id: I3346dba2aa9751bc77c17287dfe5d31759c05607
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-01-05 07:02:43 +00:00
Automerger Merge Worker
0b3f453482
Merge changes from topic "am-91f40f2244d9481a9ec129c7853b46c4"
...
* changes:
[automerger skipped] Merge "Revert "Use Mockito 4.6.1 API"" into tm-qpr-dev am: d6a9cba834
-s ours am: 98e202f98f
-s ours
[automerger skipped] Revert "Use Mockito 4.6.1 API" am: 869fd2f33e
-s ours am: d5504ea567
-s ours
2023-01-05 06:34:16 +00:00
Zaiyue Xue
f1fd444c6d
Merge "[Battery usage U] Add an item "Others" in the app list to group small usage apps. This will make the total percetage 100%, which is easy to understand for users."
2023-01-05 06:34:02 +00:00
Karen Lu
06e92c91a7
[automerger skipped] Merge "Revert "Use Mockito 4.6.1 API"" into tm-qpr-dev am: d6a9cba834
-s ours am: 98e202f98f
-s ours
...
am skip reason: Merged-In I2cfda684059520f6ddd1e72c55f1ab1ec9c99e8b with SHA-1 e2b0873f9c
is already in history. Merged-In was found from reverted change.
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20878385
Change-Id: I4d506c77c0cae15ef1ff28f4441b47688896b35f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-01-05 06:32:58 +00:00
Karen Lu
d4904264fb
[automerger skipped] Revert "Use Mockito 4.6.1 API" am: 869fd2f33e
-s ours am: d5504ea567
-s ours
...
am skip reason: Merged-In I2cfda684059520f6ddd1e72c55f1ab1ec9c99e8b with SHA-1 e2b0873f9c
is already in history. Merged-In was found from reverted change.
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20878385
Change-Id: If4036793e7c74e759e4ba9b738e9dbdbc9dc36e0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-01-05 06:32:42 +00:00
William Escande
ce2edfa3d4
Merge "Fix NPE in BluetoothPairingController when comparing BluetoothClass" am: 9aa06f28e8
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2373748
Change-Id: I11c236f3901c9faaeb6c702678d330dde8f07f38
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-01-05 06:31:44 +00:00
Chaohui Wang
01c31d77e0
Move product specific strings to res-product
...
Product specific strings need to be put in res-product.
Bug: 250807976
Test: Make Settings
Change-Id: I59fe9f54759a518468395ae6e1448c97d952e22d
2023-01-05 14:18:30 +08:00
Yilin Cai
772f3b370b
Add mapping to the WiFi-control SPA page in Settings app.
...
Test: local device + logcat
Bug: 262206181
Change-Id: Iafa2851a5a7c8770fc1b15cdfefaf37a17d55750
2023-01-05 14:18:25 +08:00