Commit Graph

85121 Commits

Author SHA1 Message Date
TreeHugger Robot
377b335b84 Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod 2021-07-05 01:14:32 +00:00
Bill Yi
05728aa3a9 Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I60ed13bac2a0c0dc4aa5ef847ba147994a3adc4d
2021-07-04 22:38:10 +00:00
Bill Yi
cdb5f60c02 Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I852a10fd9a6a5b85f560bfdbf1d7c962994ed60b
2021-07-04 22:25:35 +00:00
Bill Yi
e601abf9c5 Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I41e55cee77fbc3d604b9616f47a66a88e0c3a6e8
2021-07-04 22:18:12 +00:00
Bill Yi
a50ce69307 Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I16a5257336b666f8c11fa7900b37a661a53b1b25
2021-07-04 22:14:39 +00:00
Rajeev Kumar
43b16c4704 Merge "Show device admin warning dialog if force stop is not allowed" into sc-dev am: dc07fe1ad1
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15179293

Change-Id: I39af0d099e45634c19aa8bad49cf980e883d19a9
2021-07-04 20:23:27 +00:00
Rajeev Kumar
dc07fe1ad1 Merge "Show device admin warning dialog if force stop is not allowed" into sc-dev 2021-07-04 19:14:33 +00:00
TreeHugger Robot
2bf090214c [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod am: a69ea45cf7 -s ours am: 010ea5488d -s ours
am skip reason: subject contains skip directive

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

Change-Id: I6d0a894232eaa31a6fda0e36940db92f8eb91448
2021-07-03 04:07:33 +00:00
Bill Yi
11b3faef4a [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: d1c91f40f0 -s ours am: 42ead3c52e -s ours
am skip reason: subject contains skip directive

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

Change-Id: I50455e68b7bf3b4f5ab9547168653746d5fd1d82
2021-07-03 04:07:18 +00:00
TreeHugger Robot
010ea5488d [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod am: a69ea45cf7 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I9178f7fe03da40f82a9d4a76c8e489d579b23dca
2021-07-03 04:00:18 +00:00
Bill Yi
42ead3c52e [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: d1c91f40f0 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ia26fe52f2e7c8c707bc41238a5943b248bc03ee8
2021-07-03 03:49:59 +00:00
TreeHugger Robot
4be3c66e61 Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod 2021-07-03 03:43:16 +00:00
TreeHugger Robot
5a45abf341 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: 3dd0be61d1 -s ours am: b9a9b7c6d2 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Icfa0b5c5128d9b9a4590daee44b44e2405315b8a
2021-07-03 03:43:03 +00:00
Bill Yi
60ee59bfbf [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 6542938cff -s ours am: 5cc1907655 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I68a5f9dcf6c64b5f3a0506ee29b61d805d469f47
2021-07-03 03:42:47 +00:00
TreeHugger Robot
0bfe89f009 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 2c06b8e320 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I54ca75dde0453775b34167c67a369223f816230f
2021-07-03 03:41:42 +00:00
TreeHugger Robot
b660f06960 Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod 2021-07-03 03:37:07 +00:00
TreeHugger Robot
a69ea45cf7 Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod 2021-07-03 03:32:18 +00:00
TreeHugger Robot
b9a9b7c6d2 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: 3dd0be61d1 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ibad4f24564961c34636570fc326270f243325db5
2021-07-03 03:29:26 +00:00
Bill Yi
5cc1907655 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 6542938cff -s ours
am skip reason: subject contains skip directive

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

Change-Id: I84e0049f2174ba96ac88dc1585ab116c44a16dcf
2021-07-03 03:29:20 +00:00
TreeHugger Robot
3dd0be61d1 Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev 2021-07-03 03:22:46 +00:00
TreeHugger Robot
2c06b8e320 Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev 2021-07-03 03:22:36 +00:00
Bill Yi
d5d96e8dbd Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I3323ae4648d62878fa0d297d4cb8615f9b711cd8
2021-07-03 00:41:18 +00:00
Bill Yi
23810f4a9a Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I8204967e1a2b075d8c4deac65a2a359d9e4d14c6
2021-07-03 00:27:54 +00:00
Bill Yi
6542938cff Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: Ibc7150cb257216e2b01accdf7d1883674c1f6dd4
2021-07-03 00:24:30 +00:00
Bill Yi
095f7a994f Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: Ieb2630ff8b80aa1af53abaf06083b769790272c3
2021-07-03 00:20:14 +00:00
Bill Yi
d1c91f40f0 Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I1503e7f3d4e33f27c52e28f9327bc258b3531281
2021-07-03 00:16:19 +00:00
Bill Yi
1eac1f2cc4 Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I8da27cd4fe76af141a57245daf7ce8dbc5f6a25b
2021-07-03 00:13:03 +00:00
Bill Yi
ba970ea415 Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: Id5f86f1661d49b0f77deb46f241c947a7a3de59a
2021-07-03 00:11:33 +00:00
Ahaan Ugale
5025ca7695 Merge "Password settings: use EM DASH as the pwd count placeholder" into sc-dev am: 83e4f3c658
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15177778

Change-Id: I51cc35563c61f289e5b96cc995f087ed549aaa1d
2021-07-03 00:06:10 +00:00
TreeHugger Robot
e81e53e127 Merge "Fix landscape to reverse landscape issue" into sc-dev am: 493db88bf4
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15188505

Change-Id: I1567d09b9c7d3a9c0484495cb45f063549ab8f9b
2021-07-03 00:05:44 +00:00
Ahaan Ugale
83e4f3c658 Merge "Password settings: use EM DASH as the pwd count placeholder" into sc-dev 2021-07-02 23:56:20 +00:00
TreeHugger Robot
493db88bf4 Merge "Fix landscape to reverse landscape issue" into sc-dev 2021-07-02 23:49:36 +00:00
TreeHugger Robot
5f6e15df75 Merge "Ensure settings maintains its Bluetooth device inquiry state" into sc-dev am: 524f4979f5
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15178131

Change-Id: Ia9357f372e8f209493915a2735acd00d9e3f0316
2021-07-02 23:11:03 +00:00
Guojing Yuan
69a9368325 [CDM] Remove CDM companion apps from Connected Devices detail Settings
Remove CDM companion apps from Connected Devices details Settings when
there's a FastPair slice.

BUG: 191992001

Test: Manual

Change-Id: Ic373736ff6e32765f8c9d13e7358455a82cd8333
2021-07-02 23:02:38 +00:00
TreeHugger Robot
524f4979f5 Merge "Ensure settings maintains its Bluetooth device inquiry state" into sc-dev 2021-07-02 23:02:30 +00:00
Mill Chen
7f2496219f Fix landscape to reverse landscape issue
Fingerprint enrollment page needs to display different types of layout
for both landscape mode and reverse landscape mode. However
onConfigurationChanged doesn't get called when landscape mode rotates to
reverse landscape mode directly, that causes it displays a wrong layout
in the both landscape and reverse landscape modes.

Trying to monitor rotation event and checking if the case that directly
turns landscape mode to reverse landscape mode happens, if so, reCreate
method will get called to re-lay out the page. There will be a flicker
problem happening in re-laying out the page but this solution still
works for users to have the correct layout.

Fix: 186372522
Test: manual test
1) Navigate to fingerprint enrollment page
2) Rotate the screen from landscape mode to reverse landscape mode
3) Observe the page and see if it has a correct layout

Change-Id: Ie94f43a6546f453c10ae9f1c3ba83e1178784950
2021-07-03 06:40:25 +08:00
TreeHugger Robot
da940c936d Merge "Only launchHandoffToParent in SUW" into sc-dev am: 59b82fad2f
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15179572

Change-Id: I5a7b3a82a7d088f9147136a75979a3d00f48e953
2021-07-02 20:28:43 +00:00
Rahul Sabnis
0b365c3e69 Ensure settings maintains its Bluetooth device inquiry state
Bug: 187165224
Test: Manual
Merged-In: I4dafb7bf5b410d99cba7e30ee17f966611458db7
Change-Id: I4dafb7bf5b410d99cba7e30ee17f966611458db7
2021-07-02 20:27:17 +00:00
TreeHugger Robot
59b82fad2f Merge "Only launchHandoffToParent in SUW" into sc-dev 2021-07-02 20:14:33 +00:00
TreeHugger Robot
c1a0610bd5 Merge "Fix camera permission warning message not disappearing after permission is re-granted" into sc-dev am: 8f9488eefb
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15084370

Change-Id: I2704176c17a986a630658907c38af2ff0038cfa8
2021-07-02 20:11:30 +00:00
TreeHugger Robot
8f9488eefb Merge "Fix camera permission warning message not disappearing after permission is re-granted" into sc-dev 2021-07-02 19:59:32 +00:00
Ahaan Ugale
30a3e3c3ed Password settings: use EM DASH as the pwd count placeholder
The current blank space in the UI looks like a bug if the password
manager doesn't return a result. (though this should rarely happen)

Fix: 192531856
Test: manual
Change-Id: Ia1765e51f1d4e5080c9a8419c8e81c2771caba7b
2021-07-02 12:35:40 -07:00
Kevin Chyn
c702e1bfba Only launchHandoffToParent in SUW
Settings flow does not need to show this screen

Fixes: 192586840
Test: adb shell am start -a android.settings.BIOMETRIC_ENROLL --ez require_consent true --ez skip_return_to_parent <true/false>
Test: adb shell am start -a android.settings.BIOMETRIC_ENROLL --ez require_consent true
Test: atest com.android.settings.biometrics.ParentalConsentHelperTest

Change-Id: Ic2edbb5ec9693d05c89206d49249f59fd968aa2f
2021-07-02 12:04:06 -07:00
Mill Chen
2e23b3ff08 Merge "Update dynamic height adjusting" into sc-dev am: 81d98b0410
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15187825

Change-Id: I10d435d6dd391a25ce4c8e6f161760d656980c84
2021-07-02 19:02:55 +00:00
Mill Chen
81d98b0410 Merge "Update dynamic height adjusting" into sc-dev 2021-07-02 18:48:49 +00:00
Abel Tesfaye
2000bb8da2 Fix camera permission warning message not disappearing after permission is re-granted
Test: locally

Bug: 191907683
Change-Id: Idb45e99ff9f0569ad43aadcde830f0c69a3be4f3
2021-07-02 18:48:20 +00:00
Yanli Wan
796ce5ee10 Show device admin warning dialog if force stop is not allowed
Test: manual
Test: atest AppButtonsPreferenceControllerTest
Bug: 192082470
Change-Id: I2c0028b4ff4578221a7686a3fe4511c70e1eed7d
2021-07-02 17:52:17 +00:00
TreeHugger Robot
8663c86005 Merge "Tweak work contact search strings" into sc-dev am: d76acbd981
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15178135

Change-Id: Ib50ed55870fb4d86fdb82a8643a0cfc98e7c793d
2021-07-02 17:27:53 +00:00
TreeHugger Robot
d76acbd981 Merge "Tweak work contact search strings" into sc-dev 2021-07-02 17:14:30 +00:00
TreeHugger Robot
abbcd960cc Merge "Align with the visibility logic from Dialer" into sc-dev am: 6d06f9bcad
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15080735

Change-Id: I417e7022751af450a3cf51849ba73d01e778ffb4
2021-07-02 16:29:17 +00:00