Bill Yi
a60ca8c201
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 12fc7f8479
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22567293
Change-Id: Ifa75a86c9366e359911775d92df45a1c8b75832e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-13 18:08:13 +00:00
Bill Yi
7c238ffd29
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: bfb5780a19
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22567636
Change-Id: I9a9687a44ad201177c7a8c417b6633184a1feb1c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-13 17:54:10 +00:00
Bill Yi
93c4a0ac79
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 54bb26194d
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22567636
Change-Id: Iec8c9647f0d155ea0852c69fa41f53edbdd440c9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-13 17:53:56 +00:00
Bill Yi
febd455984
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 10284d973a
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22567294
Change-Id: Id684625868f207b26025f16125454d641d7c8e5c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-13 17:53:45 +00:00
Bill Yi
ec96f6abcd
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 38819c3840
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22567294
Change-Id: Ib2660e00fae9cd35e6c5a9f84a4cc8efc9d33f91
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-13 17:53:27 +00:00
Bill Yi
f5782293d1
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 43599d0404
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22567293
Change-Id: I8e2e8305a86e9f5c59062b6d7f39e169e5548d6a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-13 17:53:04 +00:00
Bill Yi
ea747f6325
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 12fc7f8479
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22567293
Change-Id: If7c8d182ec0ecb39ffc9b725d91c98ed157cbc47
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-13 17:52:41 +00:00
Automerger Merge Worker
0ac6ec2601
Merge "Merge "Align multiple admin related strings with UX design" into udc-dev am: d280e9e110
am: 672cb31782"
2023-04-13 17:32:52 +00:00
Tetiana Meronyk
80be0dc53d
Merge "Align multiple admin related strings with UX design" into udc-dev am: d280e9e110
am: 6b07394a8d
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22617660
Change-Id: I821505074afa6fdbc74867870782a5cfb8808774
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-13 17:31:43 +00:00
Tetiana Meronyk
5815ceeb77
Merge "Align multiple admin related strings with UX design" into udc-dev am: d280e9e110
am: 672cb31782
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22617660
Change-Id: I21281217ae83b5b9cabe05744befe260081832a4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-13 17:31:06 +00:00
Xiaozhen Lin
7a89f15fed
Destroy activity in onStop()
...
Pixel Imprint will call onDestroy() whenever its menu is invisible.
(https://source.corp.google.com/tm-dev/packages/apps/Settings/src/com/android/settings/biometrics/fingerprint/FingerprintSettings.java;l=547?sq=package:tm-dev )
However, Screen lock should have the same behavior as Pixel Imprint but
it doesn't.
onDestroy() for Screen lock should be called whenever we exit the menu
or the menu becomes invisible. Otherwise, the password may be leaked to
RAM unexpectedly in some situations.
Bug: 233373529
Test: manual
Change-Id: Idc0c115fc2061d863f9cab2aed99c04340b827f8
2023-04-13 17:29:48 +00:00
Tetiana Meronyk
672cb31782
Merge "Align multiple admin related strings with UX design" into udc-dev am: d280e9e110
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22617660
Change-Id: If186294c620facbc450b3024ceae382a6af1358a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-13 17:19:06 +00:00
Bill Yi
bfb5780a19
Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev
2023-04-13 17:18:38 +00:00
Bill Yi
10284d973a
Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev
2023-04-13 17:18:38 +00:00
Bill Yi
43599d0404
Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev
2023-04-13 17:18:38 +00:00
Tetiana Meronyk
6b07394a8d
Merge "Align multiple admin related strings with UX design" into udc-dev am: d280e9e110
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22617660
Change-Id: Ib57b9a1d2489b702c47d49d0f53dd1533fbf080c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-13 17:17:31 +00:00
Tetiana Meronyk
d280e9e110
Merge "Align multiple admin related strings with UX design" into udc-dev
2023-04-13 17:08:31 +00:00
Fabián Kozynski
68270077e3
Update strings for device controls settings
...
Test: Manual, check Settings
Fixes: 234757968
Change-Id: I5fcb8c2a5826271fc9bf1cfff50006c3f738e46c
2023-04-13 12:58:30 -04:00
Tetiana Meronyk
b4227c18fb
Align multiple admin related strings with UX design
...
Bug: 266558832
Test: manual visual
Change-Id: I69d2d12b24d64f058ed8ed59c6d979c9c37b74cb
2023-04-13 14:47:25 +00:00
lbill
6193554873
Remove onWindowFocusChange solution from FPS enrollment
...
Context:
The legacy architecture UdfpsEnrollView was shown by SysUI
which has higher z-order that encounter lots of overlap issue.
Besides, IPC impact the latency of show/hide enroll view in
legacy architecture.
We used to upload ag/19699461 to cancel enrollment due to
above limitation.
With the new architecture ag/20582186 the UdfpsEnrollView
migrate to Settings and controlled by Settings process.
And ag/21149538 config SETTINGS_SHOW_UDFPS_ENROLL_IN_SETTINGS flag
to ture by default.
It's the time to improve the enroll UX by removing cancel
signle when onWindowFocusChanged() invoked.
Bug: 262680438
Test: m RunSettingsRoboTests -j30 ROBOTEST_FILTER=FingerprintEnrollEnrollingTest
Test: manual Security Settings > Enroll fingerprint > enroll
Swipe Notify Shade , Heads-up, Power menu interrupt should
not stop the enroll flow.
Change-Id: I60d88d5edd80e6eed70e2fbf288357e949abcae3
2023-04-13 12:58:49 +00:00
Automerger Merge Worker
cb94f33723
Merge "Merge "Populate ipsecSecret field in VpnProfile" am: 4c5334809d
am: 4770d017dc
am: cd33a0fa88
am: e428b25ea0
am: 02210d5752"
2023-04-13 11:26:10 +00:00
Chiachang Wang
8395ab9f34
Merge "Populate ipsecSecret field in VpnProfile" am: 4c5334809d
am: 4770d017dc
am: cd33a0fa88
am: e428b25ea0
am: 02210d5752
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2530499
Change-Id: I0fd07ddbca3fc7d35d5a8118de281e9f2b853aa9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-13 11:24:58 +00:00
Chiachang Wang
ffda4e6a0d
Merge "Populate ipsecSecret field in VpnProfile" am: 4c5334809d
am: 4770d017dc
am: cd33a0fa88
am: e428b25ea0
am: c702ecb6ad
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2530499
Change-Id: I7088c510a7f804e3b46d71ff72dea670d1c5e12b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-13 11:24:56 +00:00
Chiachang Wang
c702ecb6ad
Merge "Populate ipsecSecret field in VpnProfile" am: 4c5334809d
am: 4770d017dc
am: cd33a0fa88
am: e428b25ea0
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2530499
Change-Id: I581c148c5ee67a7a7b5ec1d064a6e6958a664c23
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-13 10:57:11 +00:00
Chiachang Wang
02210d5752
Merge "Populate ipsecSecret field in VpnProfile" am: 4c5334809d
am: 4770d017dc
am: cd33a0fa88
am: e428b25ea0
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2530499
Change-Id: Ib1a3ac04d9463896322b6cd716024f9f95402fe3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-13 10:57:07 +00:00
Chiachang Wang
e428b25ea0
Merge "Populate ipsecSecret field in VpnProfile" am: 4c5334809d
am: 4770d017dc
am: cd33a0fa88
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2530499
Change-Id: I24723fadb4e89560ddb96da8149dc6dfa4e6ce6b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-13 10:25:09 +00:00
Weng Su
e23b9deccb
String updates for hotspot speed & compatibility settings
...
Bug: 270561425
Test: manual test
atest -c WifiTetherSettingsTest \
WifiHotspotSpeedSettingsTest
atest -c WifiTetherViewModelTest \
WifiHotspotSpeedViewModelTest
Change-Id: I6e2fa716a4fa0d87e62a1399a0c380e77ea40f10
2023-04-13 10:04:14 +00:00
Vania Januar
32aae36b37
Force enabling Notes role from developer options affects all users.
...
CP from ag/22598718 due to conflicts in downstream branch.
Bug: 276432652
Test: ForceEnableNotesRolePreferenceControllerTest
Change-Id: Ic0fa7f33dcb6509908008774c725eec386d0608b
2023-04-13 09:57:38 +00:00
Chiachang Wang
cd33a0fa88
Merge "Populate ipsecSecret field in VpnProfile" am: 4c5334809d
am: 4770d017dc
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2530499
Change-Id: I7fb125aacace306aec461e64ae7d448dcec10949
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-13 09:54:49 +00:00
Vania Januar
a1b7888c30
[RESTRICT AUTOMERGE] Force enabling Notes role from developer options affects all users.
...
Restricting merge due to conflicts; will manually CP this to master.
Bug: 276432652
Test: ForceEnableNotesRolePreferenceControllerTest
Change-Id: Ic0fa7f33dcb6509908008774c725eec386d0608b
2023-04-13 09:53:20 +00:00
Automerger Merge Worker
9979a02531
Merge "Merge "Support battery usage chart start index label is the detailed last full charge time" into udc-dev am: 4d737d7813
am: 045b856557"
2023-04-13 09:25:54 +00:00
Chiachang Wang
4770d017dc
Merge "Populate ipsecSecret field in VpnProfile" am: 4c5334809d
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2530499
Change-Id: I0094a812955100bf9fae19dfae028ae33167caa6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-13 09:25:49 +00:00
Zaiyue Xue
a3465d563d
Merge "Support battery usage chart start index label is the detailed last full charge time" into udc-dev am: 4d737d7813
am: 045b856557
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22379150
Change-Id: I2e0fb982763b6e1ae17355431ae906c013122f7c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-13 09:25:49 +00:00
Zaiyue Xue
6e606674ec
Merge "Support battery usage chart start index label is the detailed last full charge time" into udc-dev am: 4d737d7813
am: 07f3152ad2
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22379150
Change-Id: Ic4820b148a0375c765f3bd36343c3017fc2b7960
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-13 09:25:44 +00:00
Automerger Merge Worker
b24cca079f
Merge "Pass Timeout back to upper biometric preference am: 52a46d0a85
am: a4c27fac3f"
2023-04-13 09:25:39 +00:00
Milton Wu
9930d325ee
Pass Timeout back to upper biometric preference am: 52a46d0a85
am: fa091d4a38
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22379152
Change-Id: I0371fa58c1d412538bf499ada83c73146eb0af70
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-13 09:24:59 +00:00
Milton Wu
cccc654e39
Pass Timeout back to upper biometric preference am: 52a46d0a85
am: a4c27fac3f
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22379152
Change-Id: I18762da02c530d6867f34bd43cd0a02398ca28f5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-13 09:24:51 +00:00
Zaiyue Xue
045b856557
Merge "Support battery usage chart start index label is the detailed last full charge time" into udc-dev am: 4d737d7813
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22379150
Change-Id: I4ecddfeb0a1a13bff8c84cf755d6209404f33e48
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-13 09:12:25 +00:00
Zaiyue Xue
07f3152ad2
Merge "Support battery usage chart start index label is the detailed last full charge time" into udc-dev am: 4d737d7813
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22379150
Change-Id: Icf683ac2919638a3b49d18b84dee325157397295
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-13 09:12:25 +00:00
Milton Wu
a4c27fac3f
Pass Timeout back to upper biometric preference am: 52a46d0a85
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22379152
Change-Id: I19bc33b58f8b036f7b52b2820e7154d3e8955379
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-13 09:12:13 +00:00
Milton Wu
fa091d4a38
Pass Timeout back to upper biometric preference am: 52a46d0a85
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22379152
Change-Id: Iea8dd6641ae9eaded125e398c586aa107f81f229
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-13 09:12:09 +00:00
Automerger Merge Worker
1e75fe7852
Merge "Merge "Fix settings crashed" into udc-dev am: 2c427629d8
am: af7eb73061"
2023-04-13 09:11:59 +00:00
Treehugger Robot
83bba83bd5
Merge "Fix settings crashed" into udc-dev am: 2c427629d8
am: af7eb73061
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22613581
Change-Id: I6d92ef3d0f26fbdf97032d80042c97891e506ec6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-13 09:11:22 +00:00
Treehugger Robot
f9d2ca2322
Merge "Fix settings crashed" into udc-dev am: 2c427629d8
am: 973a08ebbb
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22613581
Change-Id: I7ba3054f858dca3166030faacf97aa502370a55d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-13 09:11:16 +00:00
Zaiyue Xue
4d737d7813
Merge "Support battery usage chart start index label is the detailed last full charge time" into udc-dev
2023-04-13 09:06:22 +00:00
Milton Wu
52a46d0a85
Pass Timeout back to upper biometric preference
...
When FaceSettings or FingerprintSettings are closed because of onStop(),
this information can't been passed back to previous Preference screen,
CombinedBiometricSettings, because handlePreferenceTreeClick() from
AbstractPreferenceController class only can launchActivity() throguh
preference's Context.
In order to recevice the activity result code from FaceSettings or
FingerprintSettings, add handleBiometricPreferenceTreeClick() method in
BiometricStatusPreferenceController. Then CombinedBiometricSettings uses
this method to show FaceSettings or FingerprintSettings through
launchActivityForResult().
Bug: 263057093
Test: atest BiometricNavigationUtilsTest
Test: Manually open camera through double-click power key on different
pages inside "Face & Fingerprint Unlock"
Change-Id: I99167739766ad5ea5f204b0f0543ba6ad18fac31
2023-04-13 09:02:18 +00:00
Treehugger Robot
af7eb73061
Merge "Fix settings crashed" into udc-dev am: 2c427629d8
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22613581
Change-Id: Ib1deb2bcbe20b2ff53382a5b22675b06ec70d84e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-13 08:57:30 +00:00
Treehugger Robot
973a08ebbb
Merge "Fix settings crashed" into udc-dev am: 2c427629d8
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22613581
Change-Id: I8bebb153af17308777bce99dcfb0abd0ea5327a5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-13 08:57:28 +00:00
Treehugger Robot
b7212a3b1e
Merge "Add Wi-Fi hotspot > Security Settings page" into udc-dev am: be76ebdc5b
am: c28e629e66
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22552288
Change-Id: I544f379de97bad56fd0818bee7d1ff42b1232695
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-13 08:56:42 +00:00
Automerger Merge Worker
e293d5adb1
Merge "Merge "Add Wi-Fi hotspot > Security Settings page" into udc-dev am: be76ebdc5b
am: 758b0317ad"
2023-04-13 08:56:38 +00:00