Jason Hsu
abd4fd54b1
Merge "Set title to the hearing aid pair instruction dialog" into tm-dev
2022-03-30 06:03:00 +00:00
Jason Chiu
680fce3acd
Refine layouts for large screen
...
- Support dynamic paddings depending on app's screen width
- Add round corners to homepage ripple effect to improve the transition
of being highlighted
- Add an interface to support dynamic split layout for suggestion cards
Bug: 223300824
Test: robotest, manual
Change-Id: Iaca6b4fd3f7369179416ef084a800d7eb2ee4640
2022-03-30 04:54:30 +00:00
Kevin Han
1f21417702
Merge "Update hibernation toggle title to have "if unused"" into tm-dev am: c4c923d1eb
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17450694
Change-Id: Ic478dc38f408b02762afbac4539d9b7e5ee61e51
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-03-29 19:30:03 +00:00
Kevin Han
c4c923d1eb
Merge "Update hibernation toggle title to have "if unused"" into tm-dev
2022-03-29 18:55:35 +00:00
Kevin Han
03a87f460b
[automerge] Update hibernation toggle title to have "if unused" 2p: 3cfc87cc05
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17450694
Bug: 227235454
Change-Id: I61350d752c0324b3672193dcbbf364f4696ec786
2022-03-29 18:38:18 +00:00
TreeHugger Robot
8c6668cd03
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 1f881c6e86
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17463092
Change-Id: I7e50a31578e4289e72d932fc9df3edb4e8297150
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-03-29 18:17:31 +00:00
Bill Yi
346d3a8459
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ac9baaee08
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17463092
Change-Id: I27cc7eb93246429765820f51c926f12a72a4adfe
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-03-29 18:17:30 +00:00
TreeHugger Robot
1f881c6e86
Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev
2022-03-29 17:54:31 +00:00
TreeHugger Robot
3c7d6ac0e5
Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-mainline-prod
2022-03-29 17:51:45 +00:00
Aaron Liu
c138118d48
Home Controls: Add conditional copy for setting.
...
Add conditional copy for when allow trivial devices setting is disabled.
Add guidance on how to enable it.
Bug: 227344249
Test: Manual and unit test
Change-Id: I0f2f6dc933804ee6ba15dc180dc717d2a5b729a5
2022-03-29 17:27:17 +00:00
Treehugger Robot
8c98f0296d
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: d35c876857
-s ours am: 178ba3e57d
-s ours am: 0818a1c62b
-s ours am: 997bdcf8f8
-s ours
...
am skip reason: subject contains skip directive
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2045918
Change-Id: I92eb6b101e2c4dbdf1c04579e0641cdd8380b91f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-03-29 16:09:38 +00:00
Bill Yi
98fd319aba
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 38de1eab21
-s ours am: 5f55cb2ed8
-s ours am: 2b1435d300
-s ours am: cbb3ac7c9e
-s ours
...
am skip reason: subject contains skip directive
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2045918
Change-Id: I4720ac13081819a9c47c7c3e7e9eac1c7c626e00
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-03-29 16:09:37 +00:00
Treehugger Robot
243e18d857
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 65c7ff0276
-s ours am: 3ad321509f
-s ours am: c5142845f8
-s ours am: cb0150bde0
-s ours
...
am skip reason: subject contains skip directive
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2045919
Change-Id: I80cc502b305fe4ba1936fc2d8d0d459475f25752
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-03-29 16:09:29 +00:00
Bill Yi
0166aae999
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 62dc714628
-s ours am: b28c27e68e
-s ours am: e68d843167
-s ours am: 5729190b77
-s ours
...
am skip reason: subject contains skip directive
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2045919
Change-Id: I9788d84a57eefdd8794e1af790cdc78821a40b7f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-03-29 16:09:28 +00:00
TreeHugger Robot
d8ef930b69
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master am: 97539de67e
-s ours am: 0e536d93b5
-s ours am: 2e4f458627
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17422289
Change-Id: I2bfabd4b816f1ea2891992e3aa08efc3a09b66fd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-03-29 16:09:20 +00:00
Bill Yi
f3b2661db4
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: e4b50ee2d6
-s ours am: cc3a93e23b
-s ours am: f0886d920c
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17422289
Change-Id: I14c3dec853939107738e8e6cb8f1ff2687c04026
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-03-29 16:09:19 +00:00
TreeHugger Robot
c28707b38e
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master am: 4d9878828e
-s ours am: 2703c29227
-s ours am: e5091256f4
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17422152
Change-Id: I72f30a7906c9145b8b3632ad1a00c25d8e191c40
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-03-29 16:09:13 +00:00
Bill Yi
fd71e4b975
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 9e58dde841
-s ours am: 620782b9d4
-s ours am: 78bfe2c604
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17422152
Change-Id: If6852a1ac855e2f46c002e902f2f4cdc4b4e8c6d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-03-29 16:09:11 +00:00
Peter Wang
c7e49878b8
[automerger skipped] Add a cancel string for ToggleSubscriptionDialog to handle Tamil am: 0ab2226dff
-s ours am: 4f5dbc4db4
-s ours am: 886b22a7a6
-s ours
...
am skip reason: Merged-In I90149c9e4459747d8cd1c35d00c29f81710eb6f4 with SHA-1 6879183335
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17400637
Change-Id: I43a678f4b949e1c864a2b5f8e3a85e71d36e6e9c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-03-29 16:08:54 +00:00
Treehugger Robot
997bdcf8f8
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: d35c876857
-s ours am: 178ba3e57d
-s ours am: 0818a1c62b
-s ours
...
am skip reason: subject contains skip directive
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2045918
Change-Id: If33b9f681a6b7b9fd3380ff95df68dda0a80513c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-03-29 15:48:01 +00:00
Bill Yi
cbb3ac7c9e
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 38de1eab21
-s ours am: 5f55cb2ed8
-s ours am: 2b1435d300
-s ours
...
am skip reason: subject contains skip directive
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2045918
Change-Id: I080bbfcbed46db28ef9b31a72ce4236a9a625a6b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-03-29 15:47:59 +00:00
Treehugger Robot
cb0150bde0
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 65c7ff0276
-s ours am: 3ad321509f
-s ours am: c5142845f8
-s ours
...
am skip reason: subject contains skip directive
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2045919
Change-Id: I13faeea594a89e382f067a237440adf9183bd33a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-03-29 15:46:11 +00:00
Bill Yi
5729190b77
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 62dc714628
-s ours am: b28c27e68e
-s ours am: e68d843167
-s ours
...
am skip reason: subject contains skip directive
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2045919
Change-Id: I1d32837fd68effe1470001964dd08c8a4463dfd9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-03-29 15:46:07 +00:00
TreeHugger Robot
2e4f458627
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master am: 97539de67e
-s ours am: 0e536d93b5
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17422289
Change-Id: I137bd8e32d90c1bb3691d53633fe9e86cf2562a0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-03-29 15:38:58 +00:00
Bill Yi
f0886d920c
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: e4b50ee2d6
-s ours am: cc3a93e23b
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17422289
Change-Id: I84bf0cdc0c3d2fef27883a04efc2944be2e6044e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-03-29 15:38:56 +00:00
TreeHugger Robot
e5091256f4
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master am: 4d9878828e
-s ours am: 2703c29227
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17422152
Change-Id: I64ca7d3f6fc6d9e3668f0a08d3fd1f58f9a79d86
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-03-29 15:38:30 +00:00
Bill Yi
78bfe2c604
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 9e58dde841
-s ours am: 620782b9d4
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17422152
Change-Id: I2bae1da3c62063d6ae7544cb863a8d34952252fe
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-03-29 15:38:28 +00:00
Yuri Ufimtsev
183c3f965b
Fix typo in Preference definition for Security Advanced Settings
...
Test: manual
Bug: 191735388
Change-Id: I9156a5d670e12a1249504cc9eb27ed1c2ef59bfc
2022-03-29 15:09:33 +00:00
Peter Wang
886b22a7a6
[automerger skipped] Add a cancel string for ToggleSubscriptionDialog to handle Tamil am: 0ab2226dff
-s ours am: 4f5dbc4db4
-s ours
...
am skip reason: Merged-In I90149c9e4459747d8cd1c35d00c29f81710eb6f4 with SHA-1 6879183335
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17400637
Change-Id: I3555813a6c257b9a084febc50b50ebd0936df3e8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-03-29 15:09:30 +00:00
Sarah Chin
a0ddaeb7c3
[automerger skipped] Merge "[MEP] Use switchToSub API with pending intent" am: 1abef7542a
am: 9b9c5f2f93
am: 61ec9b6d70
-s ours am: a8312161c7
-s ours
...
am skip reason: Merged-In I800b26c0eed8243a5f1c5ae8b7c42d1f9cfdb205 with SHA-1 e28eaa725d
is already in history
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2043029
Change-Id: I861481b35d5bfba7c6052b83901a1620e3b12a98
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-03-29 14:41:09 +00:00
Sarah Chin
a8312161c7
[automerger skipped] Merge "[MEP] Use switchToSub API with pending intent" am: 1abef7542a
am: 9b9c5f2f93
am: 61ec9b6d70
-s ours
...
am skip reason: Merged-In I800b26c0eed8243a5f1c5ae8b7c42d1f9cfdb205 with SHA-1 e28eaa725d
is already in history
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2043029
Change-Id: Ic6ca95a4fb388ef93b63135e7064932406eec83a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-03-29 14:22:52 +00:00
Chaohui Wang
19e3f06952
Merge "Fix "Automatically sync app data" button state not changed" into tm-dev am: b94c0ab44e
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17397182
Change-Id: I70f5a1bf1039685b7602c8378d60bc3d6570e0fc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-03-29 10:53:03 +00:00
Chaohui Wang
b94c0ab44e
Merge "Fix "Automatically sync app data" button state not changed" into tm-dev
2022-03-29 10:36:31 +00:00
TreeHugger Robot
70155c7ebc
Merge "[LeAudio] Remove the QrCamera and decorateView in Settings" into tm-dev am: 670016a2ee
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17379163
Change-Id: I7d9a450f5047ce720dad26dad84fba25113da720
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-03-29 07:03:57 +00:00
Chaohui Wang
70470586a6
Fix XML preference controller with androidx LifecycleObserver
...
Controller can implements LifecycleObserver to observe the lifecycle.
Before this fix, preference controller which defined in the XML file
must implement com.android.settingslib.core.lifecycle.LifecycleObserver
(which is deprecated, and is a subclass of
androidx.lifecycle.LifecycleObserver).
After this fix, preference controller which defined in the XML file
and implemented androidx.lifecycle.LifecycleObserver will successful
observe the lifecycle.
Fix: 149338098
Test: robotest & manual
Change-Id: If9e48e44267de8e89a5e8f45d256719130936320
2022-03-29 14:43:06 +08:00
TreeHugger Robot
670016a2ee
Merge "[LeAudio] Remove the QrCamera and decorateView in Settings" into tm-dev
2022-03-29 06:33:46 +00:00
Bonian Chen
c676cbcaf3
Merge "[Settings] Code refactor - NetworkModePreference" into tm-dev am: 3df6924591
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17286345
Change-Id: Id614300db4c1c1555bd963c0281b7ebb82b4a153
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-03-29 05:06:22 +00:00
Joshua Mccloskey
ec589193c3
Updated UDFPS strings.
...
Test: Manual.
Fixes: 226490774
Change-Id: I6aeed72ab87e9b8b937f1acda12499c9af87462c
2022-03-29 04:50:58 +00:00
Bonian Chen
3df6924591
Merge "[Settings] Code refactor - NetworkModePreference" into tm-dev
2022-03-29 04:50:20 +00:00
Chaohui Wang
9d8603568d
Fix "Automatically sync app data" button state not changed
...
This issue is caused by mPreference is null.
(Not recovered when the fragment is recreated after configuration change.)
Mimic the PreferenceDialogFragmentCompat.getPreference() in AndroidX to
solve this issue.
https://cs.android.com/androidx/platform/frameworks/support/+/androidx-main:preference/preference/src/main/java/androidx/preference/PreferenceDialogFragmentCompat.java;l=176;drc=ca9feb3b73769089afbfd36b4d4a3d91239f9cd5
Ideally in the long term, we could use PreferenceDialogFragmentCompat
instead.
Fix: 218754949
Test: robotest & manual
Change-Id: I7fc8dd3b771aa45c91f915e25c8cc6c6afdd8d63
2022-03-29 12:32:23 +08:00
Bill Yi
b387657974
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I153402b8f77ce5d15360ede6ce234a994bcf7410
2022-03-29 03:35:53 +00:00
Bill Yi
ac9baaee08
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I8140f108bb0c0d00ba08b1fccab4b6fc9376d4dc
2022-03-29 03:00:30 +00:00
Grace Cheng
a9318375ea
Merge "Hide fingerprint setup animation from talkback users" into tm-dev am: 14ffe2a2ef
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17414126
Change-Id: Ia3f04dd73d8cc96ee51a492a756d020ce0761a86
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-03-29 00:06:24 +00:00
Grace Cheng
14ffe2a2ef
Merge "Hide fingerprint setup animation from talkback users" into tm-dev
2022-03-28 23:47:06 +00:00
Grace Cheng
d17e49853f
Merge changes from topic "presubmit-am-329e8f4e07b8433d90ca6850e1be95f1" into tm-mainline-prod
...
* changes:
[automerge] Hide fingerprint setup animation from talkback users 2p: 404ed2b0b2
Hide fingerprint setup animation from talkback users
2022-03-28 23:47:06 +00:00
Kevin Han
3cfc87cc05
Update hibernation toggle title to have "if unused"
...
As per UX request, update the toggle title to say "Pause app activity if
unused" and remove "if unused" from the summary.
Bug: 227235454
Test: manual
Change-Id: I9c80f801fcd9bc29660705a7ea4dee0086739c81
2022-03-28 14:47:29 -07:00
TreeHugger Robot
4a926629e1
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 09b761700d
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17416178
Change-Id: I72344a0005c60e1eb94b7e9c572d96c1ef0602dd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-03-28 19:32:07 +00:00
TreeHugger Robot
09b761700d
Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev
2022-03-28 19:07:49 +00:00
TreeHugger Robot
8cf398f54c
Merge changes from topic "presubmit-am-00d12da97c5e43b2a01259c930b2cf68" into tm-mainline-prod
...
* changes:
[automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 9d49da2eab
Import translations. DO NOT MERGE ANYWHERE
2022-03-28 19:07:49 +00:00
TreeHugger Robot
daef9fa397
Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-mainline-prod
2022-03-28 18:56:52 +00:00