Commit Graph

108418 Commits

Author SHA1 Message Date
TreeHugger Robot
48224eca28 Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev 2022-08-07 04:54:21 +00:00
András Kurucz
b795e3c0a7 Merge "Fix overlapping text in NotificationHistoryActivity" into tm-qpr-dev am: 9ba2443661
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19457453

Change-Id: Icc7805eeefb09d9a9c40f6b3c840c33c5ca587d3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-05 07:20:45 +00:00
András Kurucz
9ba2443661 Merge "Fix overlapping text in NotificationHistoryActivity" into tm-qpr-dev 2022-08-05 07:00:07 +00:00
Omer Osman
c0209a6e7a Merge "Add support for selection of Opus in Developer Options" into tm-qpr-dev am: cb930bc0ff
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17901372

Change-Id: I5f3658d3d580858c502c8b44ff540723118c2021
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-04 19:00:13 +00:00
Omer Osman
cb930bc0ff Merge "Add support for selection of Opus in Developer Options" into tm-qpr-dev 2022-08-04 17:40:21 +00:00
Edgar Wang
300473cea1 Apply phrase based line breaking on most of preference. am: 7924108893
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19394738

Change-Id: Id9c984d0d79c25e2b0bb87ab59e3b9642d325b66
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-04 09:35:56 +00:00
Bill Yi
81b949bbd0 Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I2dcbbf96274099824349e6469e0d9ff80e2a6a69
2022-08-04 02:12:16 -07:00
Bill Yi
9d03b14bd2 Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I194ebb751ea7fe7b31022360dc4aa138633d1b66
2022-08-04 01:41:33 -07:00
Bill Yi
08ec847877 Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I1a9b32d7d649ef38268cbe5de9db73dc0e5a2de7
2022-08-04 01:36:59 -07:00
Bill Yi
444ead6a2e Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I6da0818ca33daaf08bf8f6d3f508d594d32a519a
2022-08-04 01:32:29 -07:00
Bill Yi
72fe892fc6 Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I6cd9698629063b3c10f043f57a0e5b3df6780a8c
2022-08-04 01:19:33 -07:00
Edgar Wang
7924108893 Apply phrase based line breaking on most of preference.
Bug: 232992171
Test: manual
Change-Id: I5104e9d30f744f892bd921bffa168488e1c1e625
2022-08-03 04:40:23 +00:00
Jason Chang
c1db187646 Merge "(1/n) Fix Face Unlock LottieAnimationView IllustrationViewView ImageView truncate in GlifLayout (face_enroll_education.xml)" into tm-qpr-dev am: 271a57d91b
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19354194

Change-Id: If257f448347eb5caabea551b3180709c86f93942
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-03 03:13:45 +00:00
Jason Chang
271a57d91b Merge "(1/n) Fix Face Unlock LottieAnimationView IllustrationViewView ImageView truncate in GlifLayout (face_enroll_education.xml)" into tm-qpr-dev 2022-08-03 02:56:30 +00:00
Lucas Silva
de1d043b8a Merge "Move "when to dream" settings upwards for greater visibility" into tm-qpr-dev am: 3535dcfdf4
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19484508

Change-Id: Ib01930dd073684fa8cf6e549368a208bf26d29fb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-03 01:09:00 +00:00
Lucas Silva
3535dcfdf4 Merge "Move "when to dream" settings upwards for greater visibility" into tm-qpr-dev 2022-08-03 00:39:32 +00:00
Jason Chang
57435d65e9 (1/n) Fix Face Unlock LottieAnimationView IllustrationViewView
ImageView truncate in GlifLayout (face_enroll_education.xml)

Adjust layout margin and scale type to fulfil different
Display & Font size on device.

Bug: 233835795

Test: manually change different Display & Font size to test UI.
Change-Id: Ia54bc6a2b0cc4522416bda3d051730d3cbd349f5
2022-08-02 21:16:38 +08:00
András Kurucz
e7304b0c31 Fix overlapping text in NotificationHistoryActivity
Align the TextViews to end at the start at the expand button.
Make the label TextView single line and ellipsize it at the end.
Remove the RelativeLayout and flatten the view hierarchy.
Update background to fix the corners of the ripple effect.
Remove unused drawable xml.

Test: manual (a custom app with a long app name sends a notification)

Fixes: 239066636
Change-Id: I07c82c382138309417e3394574811afb7423c1e7
2022-08-02 09:22:07 +00:00
Jason Chang
0e7374b7ef Merge "Fix RTL issue on fingerprint setup screens in landscape mode" into tm-qpr-dev am: 7546b87a17
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19337646

Change-Id: Icd787eea9cc845e7ce7a2a102fce09c8e6491fd0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-02 08:17:53 +00:00
Jason Chang
7546b87a17 Merge "Fix RTL issue on fingerprint setup screens in landscape mode" into tm-qpr-dev 2022-08-02 07:58:08 +00:00
Arc Wang
ee4c9b6a11 Merge "Crash happens if back button is pressed during "Format as Portable"" am: 671fa153e8 am: 6945e70c02 am: c80890c7dd am: 85768c5916
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2147940

Change-Id: I2ca9ead163513a72e73d10af44df5112c05b61b6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-02 04:30:17 +00:00
Arc Wang
85768c5916 Merge "Crash happens if back button is pressed during "Format as Portable"" am: 671fa153e8 am: 6945e70c02 am: c80890c7dd
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2147940

Change-Id: I615d41ee10fd988b6e91685b7ac3f32a9ddf5f5f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-02 04:04:26 +00:00
Arc Wang
c80890c7dd Merge "Crash happens if back button is pressed during "Format as Portable"" am: 671fa153e8 am: 6945e70c02
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2147940

Change-Id: Ib4fcff818a81a38c08f31d552706fc567ec00daa
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-02 03:45:28 +00:00
Arc Wang
6945e70c02 Merge "Crash happens if back button is pressed during "Format as Portable"" am: 671fa153e8
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2147940

Change-Id: I70b0ae924d8a4410cc29e7f494e85a9b8a7d3abc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-02 03:26:39 +00:00
Arc Wang
671fa153e8 Merge "Crash happens if back button is pressed during "Format as Portable"" 2022-08-02 03:11:13 +00:00
Himanshu Rawat
47f97471a2 [automerger skipped] Merge "Don't cancel passkey entry pairing autonomously" into tm-d1-dev am: 221c09d8df -s ours am: 27ce614bf2 -s ours
am skip reason: Merged-In Ifdb98c16084dd811eed68469e7df5d1913c6ace8 with SHA-1 aa1950fd80 is already in history

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

Change-Id: I06b25f57987d0fe989e685058728574e9146f3d3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-02 02:18:24 +00:00
Himanshu Rawat
225958b5b9 [automerger skipped] Don't cancel passkey entry pairing autonomously am: c2b402bd50 -s ours am: 6076d3acc2 -s ours
am skip reason: Merged-In Ifdb98c16084dd811eed68469e7df5d1913c6ace8 with SHA-1 aa1950fd80 is already in history

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

Change-Id: I6667d097a83ba4572f34786225fe6e6f4cbd1a4e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-02 02:18:11 +00:00
Himanshu Rawat
67f88122a1 [automerger skipped] Merge "Don't cancel passkey entry pairing autonomously" into tm-d1-dev am: 221c09d8df -s ours am: c6d15199d7 -s ours
am skip reason: Merged-In Ifdb98c16084dd811eed68469e7df5d1913c6ace8 with SHA-1 dc7aa0e87f is already in history

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

Change-Id: I61f476145079fc1c972b5b9dbf3ba95dbfdf3bf6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-02 02:17:54 +00:00
Himanshu Rawat
f56b361567 [automerger skipped] Don't cancel passkey entry pairing autonomously am: c2b402bd50 -s ours am: 5dd2f5e3ee -s ours
am skip reason: Merged-In Ifdb98c16084dd811eed68469e7df5d1913c6ace8 with SHA-1 dc7aa0e87f is already in history

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

Change-Id: I3e258177d5ffd9802279dc74032992fb7981f479
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-02 02:17:51 +00:00
Himanshu Rawat
27ce614bf2 [automerger skipped] Merge "Don't cancel passkey entry pairing autonomously" into tm-d1-dev am: 221c09d8df -s ours
am skip reason: Merged-In Ifdb98c16084dd811eed68469e7df5d1913c6ace8 with SHA-1 aa1950fd80 is already in history

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

Change-Id: I0ea9b45a24b621b6d2496bc394dd5036309fa6b4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-02 02:01:17 +00:00
Himanshu Rawat
6076d3acc2 [automerger skipped] Don't cancel passkey entry pairing autonomously am: c2b402bd50 -s ours
am skip reason: Merged-In Ifdb98c16084dd811eed68469e7df5d1913c6ace8 with SHA-1 aa1950fd80 is already in history

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

Change-Id: I8c5189fccea87548e4395ae69f6fdb325377e5a0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-02 02:01:16 +00:00
Himanshu Rawat
c6d15199d7 [automerger skipped] Merge "Don't cancel passkey entry pairing autonomously" into tm-d1-dev am: 221c09d8df -s ours
am skip reason: Merged-In Ifdb98c16084dd811eed68469e7df5d1913c6ace8 with SHA-1 dc7aa0e87f is already in history

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

Change-Id: Ibf7d266960a44c030e707282b04b693627c21197
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-02 02:01:14 +00:00
Himanshu Rawat
5dd2f5e3ee [automerger skipped] Don't cancel passkey entry pairing autonomously am: c2b402bd50 -s ours
am skip reason: Merged-In Ifdb98c16084dd811eed68469e7df5d1913c6ace8 with SHA-1 dc7aa0e87f is already in history

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

Change-Id: Icd75fc8def2e27698b2ee0d2f9b622d5cb7c3f14
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-02 02:01:11 +00:00
Himanshu Rawat
221c09d8df Merge "Don't cancel passkey entry pairing autonomously" into tm-d1-dev 2022-08-02 01:41:58 +00:00
Lucas Silva
254f62cb71 Move "when to dream" settings upwards for greater visibility
Fixes: 240752634
Test: locally on device
Change-Id: Ie705ada02cee0c839f9c9e5ed1cffd448580fb00
2022-08-01 16:06:23 -04:00
Automerger Merge Worker
e5b6d1e219 Merge "[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 4a547374df -s ours am: 015915736f -s ours" into tm-qpr-dev-plus-aosp 2022-08-01 17:23:39 +00:00
Bill Yi
2e312fd609 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 4a547374df -s ours am: 015915736f -s ours
am skip reason: subject contains skip directive

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

Change-Id: I7fa2d47c1267092dac9642b0febe9e1cdf58ed45
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-01 17:22:30 +00:00
Bill Yi
93082d95fd [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 4a547374df -s ours am: 62fe245c46 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I6d1a7698ced5c35d4aacf68bf9bc117491621bc5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-01 17:20:55 +00:00
Bill Yi
015915736f [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 4a547374df -s ours
am skip reason: subject contains skip directive

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

Change-Id: I59274c79e4f571eebd99498d9bafcf6588142c58
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-01 16:59:35 +00:00
Bill Yi
62fe245c46 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 4a547374df -s ours
am skip reason: subject contains skip directive

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

Change-Id: I0e3092590b7dc1d052a5d6bb4a695dcb7b661cda
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-01 16:58:13 +00:00
Jason Chang
88c49e3257 Fix RTL issue on fingerprint setup screens in landscape mode
1. Add an RTL layout dimension for enrolling page.
2. Handling device rotation landscape 270/90 degrees with
layout dimension in LTR or RTL language.

Bug: 237104754

Test: manually verified on Settings > Security > Face & Fingerprint
Unlock > Fingerprint Unlock > Touch & Hold fingerprint sensor page

Test: make RunSettingsRoboTests ROBOTEST_FILTER=
"com.android.settings.biometrics.fingerprint
.FingerprintEnrollEnrollingTest"

Change-Id: If4770d885d97c6bf4cfebefdf9cfa0b4ee0b995b
2022-08-01 19:02:50 +08:00
Bill Yi
4a547374df Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: Ic8c471db2d76a88f53565f86acf582afa5fa302f
2022-07-29 15:21:32 -07:00
Bonian Chen
1e744b4e66 resolve merge conflicts of 81d1cd0871 to stage-aosp-master am: 4ec8323bad am: 244f21d9d7 am: 8097546f46
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19465627

Change-Id: I0ed7b6a1178d1827079723b7d3283cbb91981b2e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-29 10:43:54 +00:00
Bonian Chen
8097546f46 resolve merge conflicts of 81d1cd0871 to stage-aosp-master am: 4ec8323bad am: 244f21d9d7
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19465627

Change-Id: Ifabb14e5aadcbaf55095c5fccea5adabc0da5b40
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-29 10:27:37 +00:00
Bonian Chen
244f21d9d7 resolve merge conflicts of 81d1cd0871 to stage-aosp-master am: 4ec8323bad
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19465627

Change-Id: I1c79864417df3c542538634621cb0458a892d926
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-29 10:11:11 +00:00
Bonian Chen
4ec8323bad resolve merge conflicts of 81d1cd0871 to stage-aosp-master
Test: Build pass this conflict resolution.
Bug: None
Change-Id: Iaacaeaa579025deee52b29b4b1245fc7c0fa0346
2022-07-29 07:34:35 +00:00
Treehugger Robot
81d1cd0871 Merge "Settings: Make NetworkScanHelper max search time customizable" 2022-07-29 05:37:46 +00:00
Omer Osman
b61e129f35 Add support for selection of Opus in Developer Options
Stub implementation for LC3 is added due to the interfaces being
present. The BT stack does not currently implement LC3 over A2DP.

Bug: 226441860
Test: BluetoothCodecDialogPreferenceControllerTest

Change-Id: I40546c97370872b37c0258d10e67a3871f9d9af5
2022-07-29 05:23:55 +00:00
Himanshu Rawat
47f53bd833 [automerger skipped] Merge "Don't cancel passkey entry pairing autonomously" into tm-qpr-dev am: b0a9ebae0a -s ours
am skip reason: Merged-In Ifdb98c16084dd811eed68469e7df5d1913c6ace8 with SHA-1 aa1950fd80 is already in history

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

Change-Id: Ife2e91dc36b658e806fbb8ad93bc59e627350fb9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-29 00:54:09 +00:00
Himanshu Rawat
63b0e4d7c9 [automerger skipped] Don't cancel passkey entry pairing autonomously am: dc7aa0e87f -s ours
am skip reason: Merged-In Ifdb98c16084dd811eed68469e7df5d1913c6ace8 with SHA-1 aa1950fd80 is already in history

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

Change-Id: I24e358517dfa629de3e2c936410ae6d254bc5e86
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-29 00:54:04 +00:00