PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
129,184 Commits 1 Branch 0 Tags
f1810ad7def0e79cb1566900aaafe1acbd671c33
Commit Graph

129184 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
TreeHugger Robot
b41b11ddd3 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev am: 6bbc4c9532 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ie0bcc8a5fabe612a520d09b75180f9dd0808dc79
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-31 17:51:06 +00:00
Bill Yi
76c29b520e [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 241da8be39 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I29301926593e934d6cd14c4d8a5d2cd387b2c8bd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-31 17:51:05 +00:00
TreeHugger Robot
a51413c799 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev am: 2d464152ad -s ours 
am skip reason: subject contains skip directive

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

Change-Id: If2bf134aef6a203e08769825a32ab791779b4649
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-31 17:51:01 +00:00
Bill Yi
3cabb3e153 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 7f09268e95 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Iaff26a500a6a5e198c61f29d60bb421eb7a3c98f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-31 17:50:35 +00:00
TreeHugger Robot
82a95ec955 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev am: 53b782e43b -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ibed584f4b796cedf3c1594e83ea8eb80b3cbed36
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-31 17:50:14 +00:00
Bill Yi
f3dcf615af [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 317c0985d1 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I83c1394716b5e9f01ae679ce388c9741f6edb27c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-31 17:49:50 +00:00
Treehugger Robot
f38ea12f37 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-mainline-prod am: 5445cfaca3 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ifb39100fa5edcbb14a24d376f6fdfc481e57ddec
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-31 17:47:25 +00:00
Bill Yi
92dd79f217 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 9b9b56de09 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I0979bb25860e61f77a0e34e10dd1cbb228ab224f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-31 17:47:18 +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
12f8414700 Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-mainline-prod 2023-05-31 16:53:38 +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
TreeHugger Robot
6bbc4c9532 Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev 2023-05-31 16:51:39 +00:00
TreeHugger Robot
2d464152ad Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev 2023-05-31 16:51:39 +00:00
TreeHugger Robot
53b782e43b Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev 2023-05-31 16:51:39 +00:00
Treehugger Robot
5445cfaca3 Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-mainline-prod 2023-05-31 16:48:50 +00:00
Treehugger Robot
013aed012a Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-qpr-dev 2023-05-31 16:47:54 +00:00
Treehugger Robot
fe6c1e7437 Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-qpr-dev 2023-05-31 16:47:54 +00:00
Treehugger Robot
e564ae2e4c Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-qpr-dev 2023-05-31 16:47:54 +00: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
73672ac280 Merge "Modify the MetricsCategory as VPN_APP_MANAGEMENT" into udc-dev am: bbf55cafb9 am: 623fd259f7 am: cb4888680c am: c77b227cd0 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23442439

Change-Id: I1213841c18c476f89c489f1fefd71fdbf2af101c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-31 10:32:44 +00:00
Matías Hernández
01c30221ce Merge "Fix RTL-flipped phone number in Conversations" into udc-qpr-dev am: 8238bfd731 am: e2afcd0d8b 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23451080

Change-Id: I5d67fe79ce3dcc309256da8d05f8cc8461aa6f27
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-31 10:32:18 +00:00
SongFerng Wang
51654e9c74 Merge "Modify the MetricsCategory as VPN_APP_MANAGEMENT" into udc-dev am: bbf55cafb9 am: 2d2f90fa38 am: a5a435e222 am: ccc43d7258 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23442439

Change-Id: Ic1fc2b1dcd204c611a175e434fb9ca6031ade32e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-31 10:31:58 +00:00
SongFerng Wang
0333517e9b Merge "Modify the MetricsCategory as VPN_APP_MANAGEMENT" into udc-dev am: bbf55cafb9 am: 623fd259f7 am: 15935328bd am: 827f732795 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23442439

Change-Id: Iff33594e37ac733c0dd1e20b8cee3fb4fe0194aa
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-31 10:31:36 +00:00
SongFerng Wang
c77b227cd0 Merge "Modify the MetricsCategory as VPN_APP_MANAGEMENT" into udc-dev am: bbf55cafb9 am: 623fd259f7 am: cb4888680c 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23442439

Change-Id: If5264e86e0d6815d855f9f3af7506130477fd69d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-31 09:50:43 +00:00
Matías Hernández
e2afcd0d8b Merge "Fix RTL-flipped phone number in Conversations" into udc-qpr-dev am: 8238bfd731 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23451080

Change-Id: I8aa1e5b94cf06e14a18dcdc3f246b6f30990a3c8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-31 09:50:35 +00:00
SongFerng Wang
ccc43d7258 Merge "Modify the MetricsCategory as VPN_APP_MANAGEMENT" into udc-dev am: bbf55cafb9 am: 2d2f90fa38 am: a5a435e222 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23442439

Change-Id: Ia5eb0abb311c11967b0f89a7be69f1fe483424fc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-31 09:48:18 +00:00
SongFerng Wang
827f732795 Merge "Modify the MetricsCategory as VPN_APP_MANAGEMENT" into udc-dev am: bbf55cafb9 am: 623fd259f7 am: 15935328bd 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23442439

Change-Id: Id5a4c80a034afaed12ef738caeb87f2095527f2d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-31 09:47:59 +00:00
SongFerng Wang
a5a435e222 Merge "Modify the MetricsCategory as VPN_APP_MANAGEMENT" into udc-dev am: bbf55cafb9 am: 2d2f90fa38 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23442439

Change-Id: Ifadd1d82b31d5c4295cb3443f7d3adf8c82f18f2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-31 08:44:08 +00:00
SongFerng Wang
cb4888680c Merge "Modify the MetricsCategory as VPN_APP_MANAGEMENT" into udc-dev am: bbf55cafb9 am: 623fd259f7 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23442439

Change-Id: If755aeb7884febe1c5a54aee654aaa114212e131
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-31 08:43:29 +00:00
SongFerng Wang
15935328bd Merge "Modify the MetricsCategory as VPN_APP_MANAGEMENT" into udc-dev am: bbf55cafb9 am: 623fd259f7 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23442439

Change-Id: Ide603aabe80f369d705903ffa29c14200d04404d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-31 08:39:29 +00:00
SongFerng Wang
945600b878 Merge "Modify the MetricsCategory as VPN_APP_MANAGEMENT" into udc-dev am: bbf55cafb9 am: e4807eb9b8 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23442439

Change-Id: Ia4c58c0bf0ef30646ee01434a71fb584e1c14638
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-31 08:39:19 +00:00
Matías Hernández
8238bfd731 Merge "Fix RTL-flipped phone number in Conversations" into udc-qpr-dev 2023-05-31 08:34:17 +00:00
Edgar Wang
47991c7267 Merge "Move UpdatableListPreferenceDialogFragment to Settings" 2023-05-31 08:16:11 +00:00
SongFerng Wang
2d2f90fa38 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: I569db5421a70731f2f0666e9ef187422cff712e9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-31 07:57:05 +00:00
SongFerng Wang
623fd259f7 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: I5e3335db194374187c3d3ad575e0db04795e2f02
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-31 07:56:29 +00:00
SongFerng Wang
e4807eb9b8 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: I4a3b5be0db3d818c413476ab8a26492b99e172bb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-31 07:56:27 +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
4a4e89da97 Update comment for Settings_srcs build target 
Otherwise no op.

Bug: 284799832
Test: m Settings
Change-Id: Ie2f72cf5d13c8f58d89e24fcf2acabd4844fe11d
 2023-05-31 14:02:01 +08:00
TreeHugger Robot
663dfcd618 Merge "Protect App pinning" into udc-qpr-dev am: 7127e7606d am: 14a3bbbbea 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23467969

Change-Id: I5d38e7f40f481a5fde77da5fd62faf97e62c366f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-31 04:59:59 +00:00
TreeHugger Robot
14a3bbbbea Merge "Protect App pinning" into udc-qpr-dev am: 7127e7606d 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23467969

Change-Id: Id45f32a96ac63bcb6075daed2e23f8ad4ab5aba7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-31 04:15:08 +00:00
TreeHugger Robot
7127e7606d Merge "Protect App pinning" into udc-qpr-dev 2023-05-31 03:08:13 +00:00
Edgar Wang
2b9a16876e Move UpdatableListPreferenceDialogFragment to Settings 
Fixes: 283233688
Test: robotest
Change-Id: Ia2b460f8804d4a84c730f7e8d39449999e3d00cd
 2023-05-31 02:59:00 +00:00
Julia Reynolds
b64f28fd7b Merge "Update string to be phone/tablet agnostic" into udc-dev am: a171a9d426 am: d8cfa9ad5f am: be451ceb73 am: 83e087523a 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23451841

Change-Id: If41257db35961670da25c5935b616ab5f98c75d3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-30 20:04:05 +00:00
Julia Reynolds
ffdfd83d19 Merge "Update string to be phone/tablet agnostic" into udc-dev am: a171a9d426 am: f842b7754b am: 75e3741b27 am: efb2cb11c6 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23451841

Change-Id: I06269a44bf47e05103e9f079d90a1522344c7e46
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-30 20:03:38 +00:00
Julia Reynolds
d2af0d2e6d Merge "Update string to be phone/tablet agnostic" into udc-dev am: a171a9d426 am: d8cfa9ad5f am: 1346017c04 am: e915cb5296 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23451841

Change-Id: I9684662a7704fdab10ad43ce1b2a94393eb4c174
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-30 20:00:23 +00:00
Julia Reynolds
83e087523a Merge "Update string to be phone/tablet agnostic" into udc-dev am: a171a9d426 am: d8cfa9ad5f am: be451ceb73 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23451841

Change-Id: Ib4e331e3d2ea6a93c4025b98b9d000eaccdcf61a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-30 19:05:21 +00:00
Julia Reynolds
efb2cb11c6 Merge "Update string to be phone/tablet agnostic" into udc-dev am: a171a9d426 am: f842b7754b am: 75e3741b27 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23451841

Change-Id: I1fcf39f6243b78905f1fc62e165fcc285d81916a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-30 19:03:32 +00:00