Commit Graph

123114 Commits

Author SHA1 Message Date
Bill Yi
008c248017 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: d2e8c8077b -s ours am: 0ff2acd74e -s ours
am skip reason: subject contains skip directive

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

Change-Id: If2a046fb5f6b6e91d69f4733d58b761dc8e48fdb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-23 23:56:18 +00:00
Bill Yi
59470b027c [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 67553d6348 -s ours am: 851cd09273 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I3de9a3565410f574f722d625bd7ad649d0740cbd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-23 23:56:14 +00:00
Bill Yi
9abc6dfab9 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 197ad03f9e -s ours am: 90323d459e -s ours
am skip reason: subject contains skip directive

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

Change-Id: I7725b19e869f8aa962f808f422b541ac5cc40a09
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-23 23:55:48 +00:00
Bill Yi
e04ac53021 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: dd664531a5 -s ours am: 6f9dae1c63 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I7d35276a34014a8f7692c6847a29bd4df4e980f0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-23 23:55:26 +00:00
Bill Yi
1eac4d3913 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 81564a8384 -s ours am: c02f810e09 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I6bd7ec47df82c7e97486ecdc8bd02b3f25659863
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-23 23:55:07 +00:00
Bill Yi
0ff2acd74e [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: d2e8c8077b -s ours
am skip reason: subject contains skip directive

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

Change-Id: I89e16e27a437bffab025f596c2867707615d7805
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-23 23:34:36 +00:00
Bill Yi
851cd09273 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 67553d6348 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Iff1f5aa8165a82565818a9e78f2584043a3a5c1a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-23 23:34:31 +00:00
Bill Yi
90323d459e [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 197ad03f9e -s ours
am skip reason: subject contains skip directive

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

Change-Id: Idefdc227aadcda4c4793e04db6a30b9cfd53e689
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-23 23:34:06 +00:00
Bill Yi
6f9dae1c63 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: dd664531a5 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I2640800318de23e73f14caf0a9eb3b9ec9a0d941
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-23 23:33:44 +00:00
Bill Yi
c02f810e09 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 81564a8384 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Iadc3952765dbe96b9be66fdca437c96ecb12be25
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-23 23:33:24 +00:00
Bill Yi
29ffda8638 Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-qpr-dev 2023-05-23 23:08:38 +00:00
Bill Yi
d17812db69 Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-qpr-dev 2023-05-23 23:08:38 +00:00
Bill Yi
0ab89bcac1 Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-qpr-dev 2023-05-23 23:08:38 +00:00
Bill Yi
67553d6348 Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev 2023-05-23 23:05:26 +00:00
Bill Yi
dd664531a5 Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev 2023-05-23 23:05:26 +00:00
Bill Yi
54b1413701 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 0229581abb -s ours am: dbee886a9a -s ours am: 5640cd61f6 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I7c9a61bfbf67805aaecd7ddd2b7b3bcd49898f29
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-23 17:15:55 +00:00
Bill Yi
5640cd61f6 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 0229581abb -s ours am: dbee886a9a -s ours
am skip reason: subject contains skip directive

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

Change-Id: I4beb1bea66860ecc9b7b63ac01228d376ac6f2cc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-23 17:13:09 +00:00
Bill Yi
dbee886a9a [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 0229581abb -s ours
am skip reason: subject contains skip directive

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

Change-Id: I0fe484d0ba8eb4210731201c9f317ae59e1bb6a9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-23 17:10:14 +00:00
Chaohui Wang
3168137798 Merge "Fix the bytes displayed unit" into udc-qpr-dev 2023-05-23 11:03:59 +00:00
Chaohui Wang
a95d62a4a8 Fix the bytes displayed unit
This used to by MByte and GByte, not used in other places in Settings,
and not align with the data summary on the same page.

Unify to MB and GB to align with other places in Settings and the data
summary on the same page.

Fix: 277900792
Test: Visual
Test: Unit test
Change-Id: I9f8ceac470aede135b7921c391c063ba87da661e
2023-05-23 14:21:03 +08:00
Angela Wang
ce5f679db5 Merge "Add new bond entry to HearingAidInfoReported" into udc-dev am: 07563f6269 am: 5821b2c9cc
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23345338

Change-Id: I1ea7a84d3f22ac225db3cb3dbd812f95f072e1ee
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-23 04:14:00 +00:00
Angela Wang
5821b2c9cc Merge "Add new bond entry to HearingAidInfoReported" into udc-dev am: 07563f6269
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23345338

Change-Id: Ic8325571466b6d382a9c7e359ffa8c0d1e6b37b4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-23 03:30:30 +00:00
Angela Wang
07563f6269 Merge "Add new bond entry to HearingAidInfoReported" into udc-dev 2023-05-23 02:30:07 +00:00
Bill Yi
f1ab0d85e5 Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I3271c70b306c0ba317a90a1ec804f5023b462046
2023-05-22 18:47:53 -07:00
Bill Yi
803df51b41 Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I5d61db1c098c36144558a0931248f0fb7ec43dbc
2023-05-22 18:39:26 -07:00
Bill Yi
7e27faf3b1 Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I41e046a7592cee9cd908794c8e8dd12d0ac26552
2023-05-22 18:34:53 -07:00
Bill Yi
197ad03f9e Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I87f8876ce96c7a84d149ecfec08378ce67fb595d
2023-05-22 16:54:54 -07:00
Bill Yi
d2e8c8077b Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I01fb08b35dda455c5bc8e2b7d35173f854babcd4
2023-05-22 16:48:04 -07:00
Bill Yi
0229581abb Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I001817a76ffa02590155c033d1f7fb87c79832cb
2023-05-22 16:46:36 -07:00
Bill Yi
81564a8384 Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I2bd1ccafeb60d4eb8e1a9abcbeee5ad1083d0714
2023-05-22 16:44:40 -07:00
Lucas Silva
2190ead573 Merge "Disable dreams home controls button when disabled on lockscreen." into udc-dev am: 5bce93eb17 am: 2611253691
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23321459

Change-Id: I4ae13573dd8858c2f121bbcc859488601eae7c41
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-22 21:52:02 +00:00
Lucas Silva
2611253691 Merge "Disable dreams home controls button when disabled on lockscreen." into udc-dev am: 5bce93eb17
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23321459

Change-Id: I05815946cd5be092dbba4767bb9e855e81060ccd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-22 21:08:59 +00:00
Lucas Silva
5bce93eb17 Merge "Disable dreams home controls button when disabled on lockscreen." into udc-dev 2023-05-22 20:35:16 +00:00
Aleksandar Kiridžić
f7e3a2ce45 Merge "speech: Remove hard-coded preference key from the controllers" into udc-dev am: bcae90c372 am: 24428d1863
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23353398

Change-Id: I3cc5b8b385eec247439716393f438543b41f48ce
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-22 16:40:14 +00:00
Aleksandar Kiridžić
24428d1863 Merge "speech: Remove hard-coded preference key from the controllers" into udc-dev am: bcae90c372
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23353398

Change-Id: I147940935719c7baa482fa6f9b8a0111d4bdb4ad
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-22 16:12:09 +00:00
Aleksandar Kiridžić
bcae90c372 Merge "speech: Remove hard-coded preference key from the controllers" into udc-dev 2023-05-22 15:40:08 +00:00
Behnam Heydarshahi
2ba634defc Merge "Remove volume_separate_notification flag" into udc-dev am: 7aa8424cc0 am: 66dd57ea6e
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23244447

Change-Id: I7321e1606c81be721525e9d616587b9a026722df
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-22 15:16:05 +00:00
Behnam Heydarshahi
66dd57ea6e Merge "Remove volume_separate_notification flag" into udc-dev am: 7aa8424cc0
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23244447

Change-Id: Ie146780b807211d786039a5d022d3be8246616e3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-22 14:49:15 +00:00
Behnam Heydarshahi
7aa8424cc0 Merge "Remove volume_separate_notification flag" into udc-dev 2023-05-22 14:09:22 +00:00
Lex Huang
ebab5f6e38 Merge "Fix ActivityNotFoundException" into udc-qpr-dev 2023-05-22 06:51:08 +00:00
Treehugger Robot
097cd12494 Merge "Add Battery Information page" into udc-qpr-dev 2023-05-22 01:34:11 +00:00
Himanshu Gupta
40dd0958d6 Merge "Clearing obsolete cloneUserId from CloneBackend." into udc-dev am: 4740720948 am: af793d86f2
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23262239

Change-Id: I6a6b1f0824fefb1ec12cc61dda3c2b550d8fb072
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-19 21:56:28 +00:00
Himanshu Gupta
af793d86f2 Merge "Clearing obsolete cloneUserId from CloneBackend." into udc-dev am: 4740720948
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23262239

Change-Id: I5afbb8497652ad9e61af90617d0f5ed8e35c8a5d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-19 21:12:35 +00:00
Himanshu Gupta
4740720948 Merge "Clearing obsolete cloneUserId from CloneBackend." into udc-dev 2023-05-19 20:28:36 +00:00
Aleksandar Kiridzic
30fd927eba speech: Remove hard-coded preference key from the controllers
OnDeviceRecognitionPreferenceController and TtsPreferenceController
had their preference keys hard-coded which was breaking
AccessibilitySettingsTest. The key is now left to be read
from the super constructor.

Bug: 283449837
Test: Manual, already existing robotests
Change-Id: Ibe11a2134fffea0a081ca9f5e2f9441911574efa
2023-05-19 21:11:19 +01:00
Nicolas Sleiman
122806ad50 Merge "Remove GET_ACTIVITIES in InteractAcrossProfiles in Settings" into udc-dev am: 03e8dbca58 am: 123fa6ae78
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23347979

Change-Id: I617fc20bb9ba0c1f2476e3d81acaf8797fb3a15c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-19 16:17:45 +00:00
Ankita Vyas
01fca127fb Merge "Remove GET_ACTIVITIES flag while fetching installed apps from package manager." into udc-dev am: 96cff64862 am: 8053e9da26
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23343098

Change-Id: I8843d39553a68330c6fa69900892ff5fff539e16
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-19 16:17:39 +00:00
Lex Huang
b9c0368d7a Fix ActivityNotFoundException
Set intent to preference if intent.resolveActivity is non-null
Set preference selectable to false if no intent set to preference

Fix: 283107867
Test: manual, atest BlockingPrefWithSliceControllerTest
Change-Id: Ib5e8705debb5eb5224d8566215cb65f36613d8f9
2023-05-19 15:57:18 +00:00
Lucas Silva
9872f4322b Disable dreams home controls button when disabled on lockscreen.
When home controls are disable on lockscreen, we should also disable
them on dreams.

Bug: 282680621
Test: flashed device, disabled/enabled home controls on lockscreen and
verified that dreams home controls button was hidden/shown correctly
Test: make -j64 RunSettingsRoboTests ROBOTEST_FILTER="com.android.settings.dream.DreamHomeControlsPreferenceControllerTest"

Change-Id: I535b079cabc2838e77f3afc74bb8f8730b850653
2023-05-19 11:46:39 -04:00
Nicolas Sleiman
123fa6ae78 Merge "Remove GET_ACTIVITIES in InteractAcrossProfiles in Settings" into udc-dev am: 03e8dbca58
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23347979

Change-Id: I47dddd7f1cda8c069584460ecfbf2d94fcfb0684
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-19 15:38:01 +00:00