Rajeev Kumar
69bd5a4fc5
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: Ia3fa8931d4278b870ff595d5fa613f58bca38261
2021-07-04 19:48:23 +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
6bd9edeb4e
[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: Iba2fe1ca73e90e83827338b187d7b909a8881928
2021-07-03 04:08:18 +00:00
Bill Yi
e22dc6d4e7
[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: I6fa9087d71ab724571cb1066c2d2d323534d30a7
2021-07-03 04:08:14 +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
08666ce16b
[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: I1347fe42c74ce3b16d7e37fa612276be05353b12
2021-07-03 03:43:22 +00:00
Bill Yi
92c50044ca
[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: I96de81114d43009ef92ebf62046c2350fda2e045
2021-07-03 03:43:18 +00:00
TreeHugger Robot
73474781ed
[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: I0637cac8154332e97c3ba5fe525e7117d5d7fb6d
2021-07-03 03:42:49 +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
TreeHugger Robot
e90f19d70e
Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev
2021-07-03 03:18:05 +00:00
TreeHugger Robot
980f716fd2
Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev
2021-07-03 03:06:55 +00:00
Bill Yi
6c238242bb
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I992e32310e036d2bdbcc8b150b0e18b40f080756
2021-07-03 00:45:15 +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
61d5ed22f5
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: Ib3e218d964c8deaaac2515fb68eafacc1772a0df
2021-07-03 00:33:52 +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
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
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
1f5c69a227
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: Ida6d57fdf2ff447e0f18cf3c78851fe5f9541105
2021-07-03 00:08:14 +00:00
TreeHugger Robot
e827728b86
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: Icc643fbb3cd2ef30f19d21e04b66b986a1be2aec
2021-07-03 00:08:09 +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
20fdbff55a
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: I12026f596a32a98f8e529bd0475f02e35ed66d1a
2021-07-02 23:11:35 +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
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
47cd5370f3
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: Ied5043d3eac50524d7ac3e674f2a87a54d8208d7
2021-07-02 20:16:14 +00:00
TreeHugger Robot
59b82fad2f
Merge "Only launchHandoffToParent in SUW" into sc-dev
2021-07-02 20:14:33 +00:00
TreeHugger Robot
6e647c7142
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: I2e6eea01803aa137b1a3e37892fe1ca1ce566a3b
2021-07-02 20:12:25 +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
Mill Chen
fc71a868e6
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: I417bb71d4dc2f855fb56be7b2cadcf49cf1664f3
2021-07-02 19:04:31 +00: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
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
0bdf82747c
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: I7a5355e95f9d1798fb48a8b3b0c632c43112fd05
2021-07-02 17:28:39 +00:00
TreeHugger Robot
d76acbd981
Merge "Tweak work contact search strings" into sc-dev
2021-07-02 17:14:30 +00:00
TreeHugger Robot
98afff23b8
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: Id3f3587fdb991fb76060994d740d9950d90b31fd
2021-07-02 16:30:19 +00:00
TreeHugger Robot
6d06f9bcad
Merge "Align with the visibility logic from Dialer" into sc-dev
2021-07-02 16:17:09 +00:00
TreeHugger Robot
8b946a48c6
Merge "Switch back to sync IInputMethodManager" into sc-dev am: d5f9f65390
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15177777
Change-Id: I4c568bce7611c18da3460e13e182f8d49158ceb7
2021-07-02 15:37:19 +00:00
TreeHugger Robot
d5f9f65390
Merge "Switch back to sync IInputMethodManager" into sc-dev
2021-07-02 15:22:21 +00:00
Weng Su
71e728e934
Add permission checking to WifiDialogActivity
...
- Use getCallingPackage() to get calling package.
- Check if the calling package has ACCESS_COARSE_LOCATION or
ACCESS_COARSE_LOCATION permission.
- Only set result data to permission granted callers
Bug: 185126813
Test: manual test
make RunSettingsRoboTests ROBOTEST_FILTER=WifiDialogActivityTest
Change-Id: If7ca069c842ed2bd1aed23f9d4041473c68a4dad
2021-07-02 23:10:11 +08:00
Stanley Wang
ed113a13a6
Merge "Update Adaptive brightness page." into sc-dev am: 88e914e74e
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15153302
Change-Id: I937accc49da79a856614b892a4e7447e2ebd35c7
2021-07-02 14:36:30 +00:00