PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
123,397 Commits 1 Branch 0 Tags
6da36b9a3ce6c82d1f463d2abd15b51cb3e871b2
Commit Graph

123397 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Bill Yi
6da36b9a3c [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 54bb26194d -s ours am: 6783da78de -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: I33a4904f028430d5379ad1b748d6bd6762c468c5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-13 18:19:29 +00:00
Bill Yi
31524bfa5d [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 10284d973a -s ours am: 154e826ae6 -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: I191fa43141453f3b97849cec8866042f7238b6f1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-13 18:19:27 +00:00
Bill Yi
0fe80ba5df [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 38819c3840 -s ours am: 23cddc9689 -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: I8e6189a38cc6abb6e787c74012189fa76bf949f0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-13 18:19:25 +00:00
Bill Yi
179a70774e [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 43599d0404 -s ours am: f6e56e7ad3 -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: Iae2f571dbe7e670909401af72a6d2000fdd1af9e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-13 18:19:23 +00:00
Bill Yi
d6df69fbad [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 12fc7f8479 -s ours am: a60ca8c201 -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: I9a33c149147154f85a8a36dc240569ec6341ceae
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-13 18:17:36 +00:00
Bill Yi
6783da78de [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: Iefc6632a3603279a0bcef3af6409d58ee9972f5d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-13 18:09:11 +00:00
Bill Yi
154e826ae6 [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: I9f7a39e56745b0e1bb6ca44dad6ff56067772355
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-13 18:09:08 +00:00
Bill Yi
23cddc9689 [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: Ibf8617bcada40ca4924dd6f6b7cc19f3d647703c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-13 18:08:52 +00:00
Bill Yi
f6e56e7ad3 [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: I4ff77937dabcca782b6c8a54138a0c742f868f21
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-13 18:08:34 +00:00
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
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
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
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
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
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
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
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
Elliot Sisteron
c39dbc6f2b Merge "Redirect to the right combined biometrics in work profile." into udc-dev am: 37dad2b3d4 am: ea8f9dd7ac 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22576586

Change-Id: I0e32d1ff3a9982f9828361f1a99658d5764423ed
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-13 08:56:32 +00:00
Treehugger Robot
a50f75532a Merge "Add Wi-Fi hotspot > Security Settings page" into udc-dev am: be76ebdc5b am: 758b0317ad 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22552288

Change-Id: Ic5be47e2240a4ece4853a2e772142c0bdeea7f3a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-13 08:56:32 +00:00
Elliot Sisteron
47aaf4827b Merge "Redirect to the right combined biometrics in work profile." into udc-dev am: 37dad2b3d4 am: 93ec329d71 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22576586

Change-Id: I03a34d6376da35ba447e052dc714e18ccd6f04f5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-13 08:56:23 +00:00
Automerger Merge Worker
858d2715d3 Merge "[automerger skipped] Merge "Add a feature flag for SPA metrics" into udc-dev am: 7c1f28d0e1 am: 2e6d161f99 -s ours" 2023-04-13 08:56:19 +00:00