PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
122,148 Commits 1 Branch 0 Tags
897224a971bc6af18ca68d728fa508e832f9fd86
Commit Graph

122148 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Chaohui Wang
897224a971 Merge "Fix padding issue on Scan QR code screen" into udc-dev am: 68995792c2 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23484426

Change-Id: I424e313a17cc177eb04f48ff9b031542b553978c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-02 06:36:44 +00:00
Chaohui Wang
68995792c2 Merge "Fix padding issue on Scan QR code screen" into udc-dev 2023-06-02 05:52:16 +00:00
Treehugger Robot
3880a3847d Merge "Skip Wi-Fi hotspot in Settings Widgets" into udc-dev am: 47d3cfe635 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23517077

Change-Id: I91343feaac1bb8310337b95b27e60bd5805070cd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-02 04:24:53 +00:00
Yanli Wan
5201313232 Merge "Update the string of Settings preference for device lock" into udc-dev am: 7cc3625678 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23522457

Change-Id: I06777c5ec588dd478264e53d07aebfdc06d423f9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-02 04:24:36 +00:00
Treehugger Robot
47d3cfe635 Merge "Skip Wi-Fi hotspot in Settings Widgets" into udc-dev 2023-06-02 04:19:22 +00:00
Yanli Wan
7cc3625678 Merge "Update the string of Settings preference for device lock" into udc-dev 2023-06-02 03:52:00 +00:00
TreeHugger Robot
7516343eee Merge "Set textDirection=locale and layoutDirection=locale for alert dialog" into udc-dev am: 641d07244e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23518324

Change-Id: If967a88923ba0ef7daec320ea10bd8fb645e018b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-02 01:23:36 +00:00
YK Hung
e246dbe11a Merge "Update incompatible charger checking rule" into udc-dev am: bfc4637d09 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23484351

Change-Id: I2511c6086d8dbfac27ef60bb38184b450d4d53ea
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-02 01:22:06 +00:00
TreeHugger Robot
641d07244e Merge "Set textDirection=locale and layoutDirection=locale for alert dialog" into udc-dev 2023-06-02 01:15:00 +00:00
Chun-Ku Lin
7a8602dce9 Set textDirection=locale and layoutDirection=locale for alert dialog 
It's strongly recommended by internationalization team to set
android:textDirection="locale" and android:layoutDirection="locale" to
tackle a text that consists of RTL and LTR characters.

Bug: 279491415
Bug: 283608580
Bug: 283608637
Test: manual

Merged-In: I0dfa0da22e70d267d8d8ed8e9c5be3d6db107841
Change-Id: I0dfa0da22e70d267d8d8ed8e9c5be3d6db107841
(cherry picked from commit 219d4e6ca1)
 2023-06-02 01:07:11 +00:00
YK Hung
bfc4637d09 Merge "Update incompatible charger checking rule" into udc-dev 2023-06-02 00:50:17 +00:00
Yanli Wan
23560717c4 Update the string of Settings preference for device lock 
Bug: 282040794
Test: build & test locally
Change-Id: Ic9139c061b8cbea08bf74d0462420bf3157c4477
 2023-06-01 22:57:48 +00:00
Weng Su
ef81179538 Skip Wi-Fi hotspot in Settings Widgets 
- Do not show Wi-Fi hotspots in Settings Widgets if the config is not set to show

Bug: 275268676
Test: Manual test
atest -c CreateShortcutPreferenceControllerTest

Change-Id: I5d86a78c9d48c9b63faff50d46f1254dbefd94cf
 2023-06-02 04:54:59 +08:00
Pavel Grafov
43d5beba8a Merge "Avoid double quiet mode requests" into udc-dev am: 8e13abebc0 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23489320

Change-Id: I3c30bdfca3392b58d206b6153317b43a210857be
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-01 16:38:01 +00:00
Pavel Grafov
8e13abebc0 Merge "Avoid double quiet mode requests" into udc-dev 2023-06-01 15:31:13 +00:00
TreeHugger Robot
4e033ea941 Merge "Fix TetherSettings crash issue" into udc-dev am: f65da39f37 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23485222

Change-Id: Icea8020ceae8a96ecfb262ed6caf21025649aaab
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-01 05:02:51 +00:00
ykhung
e2f19b7de9 Update incompatible charger checking rule 
Bug: 278316711
Test: make test RunSettingsRoboTests ROBOTEST_FILTER=com.android.settings.fuelgauge
Change-Id: I8f720bcdf7c0efabc8278913ccf1c0427c857fac
 2023-06-01 12:50:47 +08:00
TreeHugger Robot
f65da39f37 Merge "Fix TetherSettings crash issue" into udc-dev 2023-06-01 03:11:20 +00:00
TreeHugger Robot
b0a1914a61 Merge "Add more search terms for WPP" into udc-dev am: 2484fa72d6 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23436100

Change-Id: I25d47b81dbf33b9b796a70694017b0c5c676058c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-31 22:34:54 +00:00
TreeHugger Robot
2484fa72d6 Merge "Add more search terms for WPP" into udc-dev 2023-05-31 22:02:49 +00:00
TreeHugger Robot
3287804cff [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-mainline-prod am: 672ba73070 -s ours am: d26db6ce5a -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I7eb205b9d33bc2ec3b948c8859b5f182f7bdb82d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-31 18:50:58 +00:00
Bill Yi
2f4295175e [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: cd3e51654c -s ours am: 16f5f3cf3d -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I07c1f1a1745eb91a159a532ba3014f463ec8a05b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-31 18:50:52 +00:00
Bill Yi
15a8260049 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: e9d26cfdce -s ours am: 58162acd2e -s ours 
am skip reason: subject contains skip directive

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

Change-Id: If7b0bc82224b9e6d467d95d618da1ba0008c9e2e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-31 18:50:25 +00:00
TreeHugger Robot
d26db6ce5a [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-mainline-prod am: 672ba73070 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ic4012aae2ed5a39fa30a765714bfcc3fa5f3dbf8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-31 18:30:10 +00:00
Bill Yi
16f5f3cf3d [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: cd3e51654c -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ie5bbdf284bed5731ff348b7b86bdd008e09b6d76
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-31 18:29:59 +00:00
Bill Yi
58162acd2e [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: e9d26cfdce -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I382bc02d9c504043841a8e67e304ca35fb893b18
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-31 18:29:09 +00:00
TreeHugger Robot
62b096f9c8 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: 34ee142399 -s ours am: 53a315463c -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I2c5943cbad46f5309c32ebb7974fd616ef475a9d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-31 18:16:18 +00:00
Bill Yi
1544c1904d [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 3f97401447 -s ours am: 5b8058c497 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I91213dccb7103b42bbf57c056659e0bfc56d09c5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-31 18:16:17 +00:00
TreeHugger Robot
53a315463c [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: 34ee142399 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I7a579cd60448e331cbdbdf709df9d851862ffe05
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-31 18:16:00 +00:00
Bill Yi
5b8058c497 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 3f97401447 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I13e43682afabb06f4b6b2db967b6b3ab485f0ec4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-31 18:15:53 +00:00
Bill Yi
67c8d90a01 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: adefb73221 -s ours am: 3365a09592 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I954b7c021429522999ce8c7c8fab764e1a62bcc8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-31 18:15:26 +00:00
TreeHugger Robot
0780dfa949 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 6834cfffe4 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: If22bae6468acc1667c340e17124f1dc1f9ee12a4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-31 18:13:51 +00:00
Bill Yi
55d50df359 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: b57ebe9c3b -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I28f24c3e9672465bd82d61bfb01987503febbb20
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-31 18:13:50 +00:00
TreeHugger Robot
81821b6bb1 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: c2a92b394e -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ic996bf27b4ff7f79f7e2d557603daac1e635de9b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-31 18:13:48 +00:00
Bill Yi
f100547011 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 2bcb8c25fd -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I6edd46c48b3972661917c4f1b5c4386c22c9c29f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-31 18:13:25 +00:00
Bill Yi
3365a09592 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: adefb73221 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ida66b7c7e1e05bbab33e21143f9af1f812136dcd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-31 18:13:06 +00:00
TreeHugger Robot
7f378bea3a [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: fef0572018 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I86768f5dd46324b16ed475611d628045a3885ad9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-31 18:13:06 +00:00
Bill Yi
599b4acb22 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: e841794da4 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ib1e299bd383a989842c9ea61ef6dca50c7357573
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-31 18:12:46 +00:00
TreeHugger Robot
672ba73070 Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-mainline-prod 2023-05-31 16:55:16 +00:00
TreeHugger Robot
34ee142399 Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev 2023-05-31 16:55:11 +00:00
TreeHugger Robot
6834cfffe4 Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev 2023-05-31 16:52:26 +00:00
TreeHugger Robot
c2a92b394e Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev 2023-05-31 16:52:26 +00:00
TreeHugger Robot
fef0572018 Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev 2023-05-31 16:52:26 +00:00
Pavel Grafov
8112fb3828 Avoid double quiet mode requests 
Currently when "Work apps" the toggle is tapped in Settings it leads to
UM.requestQuietMode() being called twice via different routes.

Bug: 284915370
Test: atest WorkModePreferenceControllerTest
Change-Id: I5eeb7ecdb10245a32d947ae2430a865bd7a5a60a
 2023-05-31 13:56:42 +01:00
Weng Su
086d062cb2 Fix TetherSettings crash issue 
- When the user is a guest user, the UI will remove all preferences to restrict setting changes. If the ViewModel updates the UI in this situation, it will cause Settings to crash.
  - Avoid to setup ViewModel when UI is restricted

Bug: 284435378
Test: Manual test
atest -c TetherSettingsTest

Change-Id: I52d4ea717c34eacc9cc2321e3950dc89408049f8
 2023-05-31 20:38:36 +08:00
SongFerng Wang
02fda559ba Merge "Modify the MetricsCategory as VPN_APP_MANAGEMENT" into udc-dev am: bbf55cafb9 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23442439

Change-Id: I5b9f1cef60cc1838cbbbcc665f6881e5c9326e3c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-31 07:56:23 +00:00
SongFerng Wang
bbf55cafb9 Merge "Modify the MetricsCategory as VPN_APP_MANAGEMENT" into udc-dev 2023-05-31 07:24:36 +00:00
Chaohui Wang
f0dc0933c3 Fix padding issue on Scan QR code screen 
Fix: 284826809
Test: Manually when set Font and Display size to maximum
Change-Id: I3c67b5603d27cefdb4776a43d72264051f40246f
 2023-05-31 06:41:34 +00:00
Julia Reynolds
0322388618 Merge "Update string to be phone/tablet agnostic" into udc-dev am: a171a9d426 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23451841

Change-Id: Iecf1840e3f2c977c72312e0934ed05aa57784372
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-30 17:31:09 +00:00
Julia Reynolds
a171a9d426 Merge "Update string to be phone/tablet agnostic" into udc-dev 2023-05-30 16:48:52 +00:00