PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
101,359 Commits 1 Branch 0 Tags
8306a09319c36667c7c41d59fc9319ff9eca5d2e
Commit Graph

101359 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Peter Wang
8306a09319 [automerger skipped] Add a cancel string for the dialog to handle Tamil translation am: aa042c2d6c -s ours am: 810677e214 -s ours am: 16f75f0c64 -s ours am: 5695d6492e -s ours 
am skip reason: Merged-In I90149c9e4459747d8cd1c35d00c29f81710eb6f4 with SHA-1 9ecda98ada is already in history

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

Change-Id: Ibc7a04b46e28c4a95934099e429dfda1ec89ba1b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-03-25 18:03:40 +00:00
SongFerng Wang
acf62bb5e7 [automerger skipped] Merge "Revert "Add a cancel string for ToggleSubscriptionDialog to handle Tamil"" am: 02db0438a9 -s ours am: 5dea8d562f -s ours am: 83a12cf22c -s ours am: 86ab18c4d8 -s ours 
am skip reason: Merged-In Id7f6042e0f7c70a3a8ca951fb80bb7f30acedcb9 with SHA-1 494c68e3cf is already in history. Merged-In was found from reverted change.

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

Change-Id: Ic7b3375b11c484ac0b3f23255b99d2316d13388b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-03-25 18:02:46 +00:00
SongFerng Wang
79174688ee [automerger skipped] Revert "Add a cancel string for ToggleSubscriptionDialog to handle Tamil" am: 0f77d567b4 -s ours am: 9c1f66d741 -s ours am: 04bd163a85 -s ours am: e3064b5be5 -s ours 
am skip reason: Merged-In Id7f6042e0f7c70a3a8ca951fb80bb7f30acedcb9 with SHA-1 494c68e3cf is already in history. Merged-In was found from reverted change.

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

Change-Id: I81bd6a65601f27582bb0388aa77ea40ede390338
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-03-25 18:02:43 +00:00
Peter Wang
5695d6492e [automerger skipped] Add a cancel string for the dialog to handle Tamil translation am: aa042c2d6c -s ours am: 810677e214 -s ours am: 16f75f0c64 -s ours 
am skip reason: Merged-In I90149c9e4459747d8cd1c35d00c29f81710eb6f4 with SHA-1 9ecda98ada is already in history

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

Change-Id: Ia51eb28953b2423993caf2fa4c0753ef2bb5bd51
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-03-25 17:49:23 +00:00
SongFerng Wang
86ab18c4d8 [automerger skipped] Merge "Revert "Add a cancel string for ToggleSubscriptionDialog to handle Tamil"" am: 02db0438a9 -s ours am: 5dea8d562f -s ours am: 83a12cf22c -s ours 
am skip reason: Merged-In Id7f6042e0f7c70a3a8ca951fb80bb7f30acedcb9 with SHA-1 494c68e3cf is already in history. Merged-In was found from reverted change.

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

Change-Id: Idc449211d34212210751196365efb25b23b514fa
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-03-25 17:49:04 +00:00
SongFerng Wang
e3064b5be5 [automerger skipped] Revert "Add a cancel string for ToggleSubscriptionDialog to handle Tamil" am: 0f77d567b4 -s ours am: 9c1f66d741 -s ours am: 04bd163a85 -s ours 
am skip reason: Merged-In Id7f6042e0f7c70a3a8ca951fb80bb7f30acedcb9 with SHA-1 494c68e3cf is already in history. Merged-In was found from reverted change.

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

Change-Id: I8967ee5828aa186d70de94c4864b11027d823077
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-03-25 17:49:02 +00:00
Peter Wang
16f75f0c64 [automerger skipped] Add a cancel string for the dialog to handle Tamil translation am: aa042c2d6c -s ours am: 810677e214 -s ours 
am skip reason: Merged-In I90149c9e4459747d8cd1c35d00c29f81710eb6f4 with SHA-1 9ecda98ada is already in history

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

Change-Id: Ibd4121e43ccc3277e10815557f4b7ab61fa8245e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-03-25 17:33:53 +00:00
SongFerng Wang
83a12cf22c [automerger skipped] Merge "Revert "Add a cancel string for ToggleSubscriptionDialog to handle Tamil"" am: 02db0438a9 -s ours am: 5dea8d562f -s ours 
am skip reason: Merged-In Id7f6042e0f7c70a3a8ca951fb80bb7f30acedcb9 with SHA-1 494c68e3cf is already in history. Merged-In was found from reverted change.

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

Change-Id: I2f85174fe753165f835e2c7ea54c8af81ac10259
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-03-25 17:33:35 +00:00
SongFerng Wang
04bd163a85 [automerger skipped] Revert "Add a cancel string for ToggleSubscriptionDialog to handle Tamil" am: 0f77d567b4 -s ours am: 9c1f66d741 -s ours 
am skip reason: Merged-In Id7f6042e0f7c70a3a8ca951fb80bb7f30acedcb9 with SHA-1 494c68e3cf is already in history. Merged-In was found from reverted change.

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

Change-Id: I86d331986ee63559ac9746c2c5394b11b67c178d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-03-25 17:33:33 +00:00
Joshua Mccloskey
5d9aeb5b18 Merge "Only play fp vibration if accessibility is enabled." into tm-dev am: 566b8e5ab2 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17315311

Change-Id: I9a3384c42daaa822b27756d4f4fe226a51e1ce15
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-03-25 17:17:04 +00:00
Peter Wang
810677e214 [automerger skipped] Add a cancel string for the dialog to handle Tamil translation am: aa042c2d6c -s ours 
am skip reason: Merged-In I90149c9e4459747d8cd1c35d00c29f81710eb6f4 with SHA-1 9ecda98ada is already in history

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

Change-Id: I3ed72e07a176e34346d59459f0099f165389e34b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-03-25 17:05:45 +00:00
SongFerng Wang
5dea8d562f [automerger skipped] Merge "Revert "Add a cancel string for ToggleSubscriptionDialog to handle Tamil"" am: 02db0438a9 -s ours 
am skip reason: Merged-In Id7f6042e0f7c70a3a8ca951fb80bb7f30acedcb9 with SHA-1 494c68e3cf is already in history. Merged-In was found from reverted change.

Reverted change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2043030

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

Change-Id: I04b09953f289daa0f1c523577baecfa186753329
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-03-25 17:04:53 +00:00
SongFerng Wang
9c1f66d741 [automerger skipped] Revert "Add a cancel string for ToggleSubscriptionDialog to handle Tamil" am: 0f77d567b4 -s ours 
am skip reason: Merged-In Id7f6042e0f7c70a3a8ca951fb80bb7f30acedcb9 with SHA-1 494c68e3cf is already in history. Merged-In was found from reverted change.

Reverted change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2043030

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

Change-Id: I646ffb450b7d74774ce1d2c322006521efd80593
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-03-25 17:04:50 +00:00
Joshua Mccloskey
566b8e5ab2 Merge "Only play fp vibration if accessibility is enabled." into tm-dev 2022-03-25 17:03:20 +00:00
Quang Luong
e031563cf8 Merge "Increase WifiEntryPreference summary max lines for verbose logging" into tm-dev am: 8a5e6be37a 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17390718

Change-Id: I15917a1ef80dbc0f8811b0ae2b471e857341d0a1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-03-25 17:01:15 +00:00
PETER LIANG
0d58b83c03 Merge "Fix that holding volume buttons to activate Extra dim feature doesn't do anything." into tm-dev am: d4cd689c8f 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17166624

Change-Id: I4d00defbb21dc43092ab8ad209abffa9c764b44a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-03-25 16:51:56 +00:00
Peter Wang
aa042c2d6c Add a cancel string for the dialog to handle Tamil translation 
Bug: 185553806
Test: Build
Merged-In: I90149c9e4459747d8cd1c35d00c29f81710eb6f4
Change-Id: Ie8e9d150bf7868b462176c5cb5ed65beb187cc0e
 2022-03-25 23:54:22 +08:00
Quang Luong
8a5e6be37a Merge "Increase WifiEntryPreference summary max lines for verbose logging" into tm-dev 2022-03-25 15:50:04 +00:00
SongFerng Wang
02db0438a9 Merge "Revert "Add a cancel string for ToggleSubscriptionDialog to handle Tamil"" 2022-03-25 15:34:32 +00:00
PETER LIANG
d4cd689c8f Merge "Fix that holding volume buttons to activate Extra dim feature doesn't do anything." into tm-dev 2022-03-25 14:06:00 +00:00
SongFerng Wang
0f77d567b4 Revert "Add a cancel string for ToggleSubscriptionDialog to handle Tamil" 
This reverts commit 9ecda98ada.

Reason for revert: It should not add"Merged-In: Id7f6042e0f7c70a3a8ca951fb80bb7f30acedcb9", so do revert and CP it again.

Change-Id: I6c62e2a02e62f16c45771daee5040753ab14a4b8
 2022-03-25 14:03:29 +00:00
Baligh Uddin
024bb0db4e Merge "Changing apk name in the manifest and the corresponding packages." into tm-dev am: 1d788a0ada 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17383907

Change-Id: I67a112eb6b3c7b152a4bd700666d92e0b462c5f4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-03-25 13:50:02 +00:00
Baligh Uddin
1d788a0ada Merge "Changing apk name in the manifest and the corresponding packages." into tm-dev 2022-03-25 13:12:10 +00:00
SongFerng Wang
b8fc78d642 [automerger skipped] Merge "Add a cancel string for ToggleSubscriptionDialog to handle Tamil translation" am: d71406f8ee -s ours am: dece925261 -s ours am: 4228fc731e -s ours am: eb6431dcf0 -s ours 
am skip reason: Merged-In I90149c9e4459747d8cd1c35d00c29f81710eb6f4 with SHA-1 eba8857094 is already in history

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

Change-Id: I055639283708319764961dd99271bb6fd97e7cba
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-03-25 10:46:17 +00:00
Peter Wang
25a88e5a57 [automerger skipped] Add a cancel string for ToggleSubscriptionDialog to handle Tamil am: 9ecda98ada -s ours am: 5ee56fb6f8 -s ours am: 35099dc4a5 -s ours am: 84351f8360 -s ours 
am skip reason: Merged-In I90149c9e4459747d8cd1c35d00c29f81710eb6f4 with SHA-1 eba8857094 is already in history

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

Change-Id: I4576934ead35473820ae69db66c1455a98d6e386
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-03-25 10:46:16 +00:00
SongFerng Wang
eb6431dcf0 [automerger skipped] Merge "Add a cancel string for ToggleSubscriptionDialog to handle Tamil translation" am: d71406f8ee -s ours am: dece925261 -s ours am: 4228fc731e -s ours 
am skip reason: Merged-In I90149c9e4459747d8cd1c35d00c29f81710eb6f4 with SHA-1 eba8857094 is already in history

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

Change-Id: Ibe680738291d0519eef07f5e0f980ed380dd9f6c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-03-25 10:25:51 +00:00
Peter Wang
84351f8360 [automerger skipped] Add a cancel string for ToggleSubscriptionDialog to handle Tamil am: 9ecda98ada -s ours am: 5ee56fb6f8 -s ours am: 35099dc4a5 -s ours 
am skip reason: Merged-In I90149c9e4459747d8cd1c35d00c29f81710eb6f4 with SHA-1 eba8857094 is already in history

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

Change-Id: I8bff405170c5349d9479a7d9e503b586752b7114
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-03-25 10:25:48 +00:00
SongFerng Wang
4228fc731e [automerger skipped] Merge "Add a cancel string for ToggleSubscriptionDialog to handle Tamil translation" am: d71406f8ee -s ours am: dece925261 -s ours 
am skip reason: Merged-In I90149c9e4459747d8cd1c35d00c29f81710eb6f4 with SHA-1 eba8857094 is already in history

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

Change-Id: I04578279fe1e9262b9000e2652265771d88bee92
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-03-25 10:11:58 +00:00
Peter Wang
35099dc4a5 [automerger skipped] Add a cancel string for ToggleSubscriptionDialog to handle Tamil am: 9ecda98ada -s ours am: 5ee56fb6f8 -s ours 
am skip reason: Merged-In I90149c9e4459747d8cd1c35d00c29f81710eb6f4 with SHA-1 eba8857094 is already in history

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

Change-Id: Ie2574129cd6603bf90d7ffdd32e302b3c8abf79f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-03-25 10:11:56 +00:00
SongFerng Wang
dece925261 [automerger skipped] Merge "Add a cancel string for ToggleSubscriptionDialog to handle Tamil translation" am: d71406f8ee -s ours 
am skip reason: Merged-In I90149c9e4459747d8cd1c35d00c29f81710eb6f4 with SHA-1 eba8857094 is already in history

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

Change-Id: I9484599eba7ddacad002343cd22a9476afecff3e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-03-25 09:47:29 +00:00
Peter Wang
5ee56fb6f8 [automerger skipped] Add a cancel string for ToggleSubscriptionDialog to handle Tamil am: 9ecda98ada -s ours 
am skip reason: Merged-In I90149c9e4459747d8cd1c35d00c29f81710eb6f4 with SHA-1 eba8857094 is already in history

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

Change-Id: I160a5eeac58e392bb9eaabc9831354c79fca21e0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-03-25 09:47:28 +00:00
SongFerng Wang
d71406f8ee Merge "Add a cancel string for ToggleSubscriptionDialog to handle Tamil translation" 2022-03-25 09:28:56 +00:00
TreeHugger Robot
ffd61f5cf1 Merge "Fix Wi-Fi hotspot switch UI issue" into tm-dev am: 727583b75f 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17374493

Change-Id: Ic20cf95238dee9b842283c2362ec912685786b67
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-03-25 09:04:35 +00:00
TreeHugger Robot
727583b75f Merge "Fix Wi-Fi hotspot switch UI issue" into tm-dev 2022-03-25 08:40:57 +00:00
Jenhou (Alan) Huang
33853bd88f Merge "Fix group cast volume slider not disabled after switching to group devices." into tm-dev am: e94f159054 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17351353

Change-Id: I6bd64e363b0e24fe2a81859cc00669c16846c26a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-03-25 02:32:27 +00:00
Jenhou (Alan) Huang
e94f159054 Merge "Fix group cast volume slider not disabled after switching to group devices." into tm-dev 2022-03-25 02:26:54 +00:00
Kevin Han
dc740a885d Merge "Update category title for unused apps" into tm-dev am: 71197d2b84 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17390713

Change-Id: Ic447948ba749efda06a8435460b77e764e879158
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-03-25 02:25:21 +00:00
Kevin Han
71197d2b84 Merge "Update category title for unused apps" into tm-dev 2022-03-25 02:08:04 +00:00
Kevin Han
9f79c62f48 Merge changes from topic "presubmit-am-ba501ad77d234268a7facf1faca01368" into tm-mainline-prod 
* changes:
  [automerge] Update category title for unused apps 2p: 5290a8040c
  Update category title for unused apps
 2022-03-25 02:08:04 +00:00
PETER LIANG
46e2d89162 Merge "Fix that the user has no way of knowing if the reset was successful." into tm-dev am: d2e82f8e6d 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17252808

Change-Id: I4fe9238e7f69260c348c13e1e64c8a43efbc224d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-03-25 00:54:29 +00:00
Peter Wang
9ecda98ada Add a cancel string for ToggleSubscriptionDialog to handle Tamil 
translation

Bug: 185553806
Test: Build
Change-Id: I90149c9e4459747d8cd1c35d00c29f81710eb6f4
Merged-In: I90149c9e4459747d8cd1c35d00c29f81710eb6f4
Merged-In: Id7f6042e0f7c70a3a8ca951fb80bb7f30acedcb9
 2022-03-25 00:41:05 +00:00
PETER LIANG
d2e82f8e6d Merge "Fix that the user has no way of knowing if the reset was successful." into tm-dev 2022-03-25 00:30:55 +00:00
TreeHugger Robot
6567cca4b6 Merge "Update restricted setting dialog, unlock toast, and menu strings" into tm-dev am: d84516dd28 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17352024

Change-Id: I73e283157c8e56d6e35464e67bb8250d7caf5e31
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-03-25 00:13:31 +00:00
TreeHugger Robot
d84516dd28 Merge "Update restricted setting dialog, unlock toast, and menu strings" into tm-dev 2022-03-24 23:51:31 +00:00
Quang Luong
8cf82f41d5 Increase WifiEntryPreference summary max lines for verbose logging 
If Wifi verbose logging is on, increase the max lines for
WifiEntryPreference's summary to 100 in order to fit the extra verbose
logging information.

Bug: 222337006
Test: manually build and verify verbose summary fits
Change-Id: I919ae1bcfb26ea8c2548ebdcd3387c90e1d17ea9
 2022-03-24 16:17:23 -07:00
Kevin Han
7caa3bf25d [automerge] Update category title for unused apps 2p: 5290a8040c 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17390713

Bug: 201759939
Change-Id: Ia665744e58130bf5e647940d7a4c81abc76f205f
 2022-03-24 23:03:15 +00:00
Kevin Han
5290a8040c Update category title for unused apps 
Forgot to update "Unused apps" category title to "Unused app settings"
in previous CL so do that here.

Bug: 201759939
Test: manual
Change-Id: I67b9668f8b9caae9f144afce0e3e6d201d9b8f41
 2022-03-24 13:52:28 -07:00
TreeHugger Robot
35a47363ae Merge "Enable Encryption & Creds UI for Secondary users" into tm-dev am: 4ccde95a1a 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17348343

Change-Id: I61332e05e7f89af9c68caefacb27cf13ad344307
 2022-03-24 18:16:34 +00:00
TreeHugger Robot
4ccde95a1a Merge "Enable Encryption & Creds UI for Secondary users" into tm-dev 2022-03-24 17:55:23 +00:00
TreeHugger Robot
d4b4836ebd Merge changes from topic "presubmit-am-e8878964df004ef1a08911a61493aad3" into tm-mainline-prod 
* changes:
  [automerge] Enable Encryption & Creds UI for Secondary users 2p: f1255b4298
  Enable Encryption & Creds UI for Secondary users
 2022-03-24 17:55:23 +00:00