PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
101,327 Commits 1 Branch 0 Tags
25a88e5a57a3e966ed4cebbfeeae681ade22cade
Commit Graph

101327 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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
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
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
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
Bill Yi
f0a12bfd87 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: 752d4d5d72 -s ours am: 21377c29a1 -s ours am: c397470a4d -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ie13fe1012535b2fc43218f68cd7afd5d49109244
 2022-03-24 16:11:23 +00:00
Bill Yi
e05e29b481 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: e2bd7d9886 -s ours am: d96b66598b -s ours am: 9565343202 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Iacea19f30cf675f36cd64a25cbaee211d43c8175
 2022-03-24 16:11:22 +00:00
Bill Yi
c397470a4d [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: 752d4d5d72 -s ours am: 21377c29a1 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ic6dd4cf044a29ac4c2270280a8f844c940fc31ac
 2022-03-24 15:56:38 +00:00
Bill Yi
9565343202 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: e2bd7d9886 -s ours am: d96b66598b -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ie545a8efa56ce9e6b0d1939fc4732ef4566f553f
 2022-03-24 15:56:36 +00:00
Bill Yi
9847b1cff8 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod am: 4480b8c160 -s ours am: 6141b22325 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ie0a64d3fb88ba8c32df32c1a1aafc5563e8fbd04
 2022-03-24 15:50:33 +00:00
Bill Yi
9d41b295d7 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: c2e03b0a34 -s ours am: 50f176dc7f -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I0d79de73af2439e5e5fa6c58604b08335ced4047
 2022-03-24 15:50:31 +00:00
Bill Yi
d76f3f7314 [automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: a2aacc0aac am: 5a15b32995 -s ours am: c3cba53dfd -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I00cd77c999c8673de0333d9b8d011b35839e8f4a
 2022-03-24 15:50:25 +00:00
Bill Yi
2e25a6312f [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 8d8253a1a7 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ia3fcb76ab954c7c7ae10f47572ace3173cc9c2e7
 2022-03-24 15:49:54 +00:00
Bill Yi
a5a40dadb5 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 4f7405f4d8 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I524d540764c95b8641e10897e65922f148f0eaad
 2022-03-24 15:49:53 +00:00
Bill Yi
22a01ff15e Merge changes from topic "presubmit-am-13220b28dc894f18bfa659ed22407a5c" into tm-dev am: 7702e0efbc 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17353734

Change-Id: Ib81820c43345ff7287465cf2789739452d48cd21
 2022-03-24 15:49:30 +00:00
Bill Yi
6141b22325 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod am: 4480b8c160 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I60e56f55378c2f2666b33aba1bcaf873b4b3695c
 2022-03-24 15:48:56 +00:00
Bill Yi
50f176dc7f [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: c2e03b0a34 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I214d5d5a583610246a5e14998fa43e7cd3d745e8
 2022-03-24 15:48:52 +00:00
Bill Yi
21377c29a1 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: 752d4d5d72 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I6b29a66c010bf94a5d2aeb1921948231f3283d81
 2022-03-24 15:48:04 +00:00
Bill Yi
d96b66598b [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: e2bd7d9886 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Id0763fa2379eb008db7ff39ba8bd781b0fcc18f2
 2022-03-24 15:47:57 +00:00
Bill Yi
9245907454 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: ffae5712b4 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I7cd65f3567fb967ee2f413c41d718ed534d97bdd
 2022-03-24 15:47:57 +00:00
Bill Yi
c3cba53dfd [automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: a2aacc0aac am: 5a15b32995 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: If0c08275a0d9d45646cfd7b5d035bf66824aff6e
 2022-03-24 15:47:44 +00:00
Bill Yi
4480b8c160 Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod 2022-03-24 15:34:45 +00:00
Bill Yi
752d4d5d72 Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev 2022-03-24 15:30:38 +00:00
Bill Yi
d91297b13a Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-mainline-prod 2022-03-24 15:26:09 +00:00
Bill Yi
f2b3e82be3 Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-mainline-prod 2022-03-24 15:25:55 +00:00
Bill Yi
8d8253a1a7 Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev 2022-03-24 15:24:20 +00:00
Bill Yi
7702e0efbc Merge changes from topic "presubmit-am-13220b28dc894f18bfa659ed22407a5c" into tm-dev 
* changes:
  [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: ff73238f91
  Import translations. DO NOT MERGE ANYWHERE
 2022-03-24 15:23:51 +00:00
Bill Yi
de5db762b9 Merge changes from topic "presubmit-am-13220b28dc894f18bfa659ed22407a5c" into tm-mainline-prod 
* changes:
  [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: ff73238f91 2p: d8a0564189
  [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: ff73238f91
  Import translations. DO NOT MERGE ANYWHERE
 2022-03-24 15:23:51 +00:00
Bill Yi
ffae5712b4 Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev 2022-03-24 15:23:29 +00:00
Bill Yi
79cc005ee3 Merge changes from topic "presubmit-am-506ed0de8ea142bfad638ac768dad4cd" into tm-mainline-prod 
* changes:
  [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 70d210b974
  Import translations. DO NOT MERGE ANYWHERE
 2022-03-24 15:23:29 +00:00
PETER LIANG
796ecbc7bb Merge "Fix that strings have the similar color as the background in preview section." into tm-dev am: 03ecb4f4a6 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17341687

Change-Id: Ife1aaa337d4c9ac47a424256c32eb7548d6f6d3d
 2022-03-24 13:44:29 +00:00
PETER LIANG
03ecb4f4a6 Merge "Fix that strings have the similar color as the background in preview section." into tm-dev 2022-03-24 13:41:05 +00:00
TreeHugger Robot
4e5dd0de9e Merge "Update enable toggle processing." into tm-dev am: e6b4297cc3 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17262737

Change-Id: Ie38f09b199b8a833432cf02a386139c2c6cc7cdd
 2022-03-24 13:38:00 +00:00
TreeHugger Robot
e6b4297cc3 Merge "Update enable toggle processing." into tm-dev 2022-03-24 13:20:57 +00:00