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

122136 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
YK Hung
bfc4637d09 Merge "Update incompatible charger checking rule" into udc-dev 2023-06-02 00:50:17 +00: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
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
SongFerng Wang
e70207dc54 Merge "Try to avoid the timing UI issue" into udc-dev am: c4ed48cbe4 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23467967

Change-Id: I16cd2ec25f86b6e7f5b4b0b19f5acbc72cea209f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-30 12:42:57 +00:00
SongFerng Wang
c4ed48cbe4 Merge "Try to avoid the timing UI issue" into udc-dev 2023-05-30 12:00:39 +00:00
Zoey Chen
687b6292d4 [Panlingual] Remove the large space when searching language am: 1f76872d78 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23442455

Change-Id: Iedf5d056ff8e35cc144daf729de7f58bf1ab8409
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-30 10:29:14 +00:00
SongFerngWang
0f3f6086e9 Try to avoid the timing UI issue 
Tester exit network scan interface and then enter network scan activity
immediately. The previous network scan stop command effect the current
network scan.

Move "stop network scan" to first at onStop.

Bug: 276679520
Test: Build pass.
Change-Id: Ib0125c3745537a82b7574a8580d2a02c4e3644a0
 2023-05-30 15:18:28 +08:00
Zoey Chen
1f76872d78 [Panlingual] Remove the large space when searching language 
Don't expand the tool bar when users search the language because they will see a large space on the top.

Bug: 284480214
Test: local test
Change-Id: Ie8653536117a999bd420ccfce961b17fe9349d35
Merged-In: Ie8653536117a999bd420ccfce961b17fe9349d35
 2023-05-30 05:44:13 +00:00
TreeHugger Robot
f1ab3bd9db Merge "[Settings] Remove redundant sort" into udc-dev am: b98d6644ed 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23442451

Change-Id: I3033fd1cf62ebfe5d231aef29a8d059e4abf1a90
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-30 04:47:11 +00:00
TreeHugger Robot
b98d6644ed Merge "[Settings] Remove redundant sort" into udc-dev 2023-05-30 04:05:22 +00:00
Chaohui Wang
3f754ec128 Update activity name for ManageFullScreenIntent am: 94906cfe3d 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23467206

Change-Id: I54cd68de92aeee215e320870ee414930d5edc7ed
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-30 02:37:12 +00:00
Chaohui Wang
94906cfe3d Update activity name for ManageFullScreenIntent 
Bug: 243421660
Change-Id: I3397d6d59895694185c0d9067da636623c08d3ac
Test: m Settings
Test: adb shell am start -n com.android.settings/.ManageFullScreenIntent
 2023-05-29 17:11:08 +00:00
Bill Yi
b57ebe9c3b Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: If0dd51dfcd926f41da7f563eff00939b54fb2f03
 2023-05-29 01:01:54 -07:00
Bill Yi
adefb73221 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I783506712d5b1c5887f9d955cbd838f44cde34b7
 2023-05-29 00:59:12 -07:00
Bill Yi
2bcb8c25fd Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: Ib310d2df9ad9db0645aeea62d9ee37c758ebe03c
 2023-05-29 00:55:43 -07:00