Commit Graph

102122 Commits

Author SHA1 Message Date
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
Kevin Han
f677755e90 Merge changes from topic "presubmit-am-ba501ad77d234268a7facf1faca01368"
* changes:
  [automerge] Update category title for unused apps 2p: 5290a8040c 2p: 7caa3bf25d
  [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
3bfb434764 Merge "Fix that the user has no way of knowing if the reset was successful." into tm-dev am: d2e82f8e6d am: 46e2d89162
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17252808

Change-Id: Ibe3840e6162bcb4698baf78d1966d783352d2555
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-03-25 00:56:33 +00:00
PETER LIANG
d2fcfa1dee 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: Ibd07d6fa1979b1315582a1f8b44d4ab04166956a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-03-25 00:54:37 +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
9fd97d7d9d Merge "Update restricted setting dialog, unlock toast, and menu strings" into tm-dev am: d84516dd28 am: 6567cca4b6
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17352024

Change-Id: I0d328ded10d7db7c263b8f0697a258c30f673306
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-03-25 00:29:47 +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
ce49123205 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: I569924849f4a3bafc95cce6c1325f9f10bae8a7b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-03-25 00:13:20 +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
4ed355d110 [automerge] Update category title for unused apps 2p: 5290a8040c 2p: 7caa3bf25d
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17390713

Bug: 201759939
Change-Id: I58936bcacaca8c8b9f985f549f4441a5dee605e7
2022-03-24 23:03:23 +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
aca65d49ce Merge "Enable Encryption & Creds UI for Secondary users" into tm-dev am: 4ccde95a1a am: 35a47363ae
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17348343

Change-Id: I7b3d71dbc29c58db8a883249bf3304149aeff923
2022-03-24 18:26:52 +00:00
TreeHugger Robot
84d18f5eb1 Merge changes from topic "presubmit-am-e8878964df004ef1a08911a61493aad3" into tm-mainline-prod am: d4b4836ebd
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17348343

Change-Id: Ib108e3671515922ce00b0f11954bd2b9a03df5fc
2022-03-24 18:26:09 +00:00
TreeHugger Robot
9217efa3da 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: I86cde5aa89ca16369224c81cc1b52211a6421a9d
2022-03-24 18:17:02 +00: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
TreeHugger Robot
b9bbd922c0 Merge changes from topic "presubmit-am-e8878964df004ef1a08911a61493aad3"
* changes:
  [automerge] Enable Encryption & Creds UI for Secondary users 2p: f1255b4298 2p: 352f747f82
  [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
Roopa Sattiraju
64f9d41ee3 Changing apk name in the manifest and the corresponding packages.
BUG: 226403247
Test: TH
Change-Id: I49ad1169899ffbb76ad00f7d5d02f815ace295e7
2022-03-24 10:30:03 -07:00
Abel Tesfaye
01d030ccc6 Merge "Use setRotationLock in LockScreenRotationPreferenceController" 2022-03-24 17:25:58 +00:00
Bill Yi
bc5396c211 [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: f0a12bfd87 -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: I9e746db7a824115f330f87ed59b4b2d3f86def1f
2022-03-24 16:45:47 +00:00
Bill Yi
f3daf5bded [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: e2bd7d9886 -s ours am: d96b66598b -s ours am: 9565343202 -s ours am: e05e29b481 -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: Ib6546ced62ae31cbb0e1febe84e0c306a34f1f36
2022-03-24 16:45:46 +00:00
Joshua Mccloskey
9fdbd6501c Only play fp vibration if accessibility is enabled.
Fixes: 222593183
Test: Verified haptic no longer comes unless accessibility is enabled.
Change-Id: Ica04acfe9501bc4ab1afacd77b8ea7cbf725281e
2022-03-24 16:26:30 +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
c0e37b8651 [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: If26bfbd8144e061715ecb07bbf8a20b8607acf69
2022-03-24 16:11:09 +00:00
Bill Yi
7a447ff977 [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: I16fe1785bb8a616cbf67c6c51935fd37b772285b
2022-03-24 16:11:08 +00:00
Bill Yi
2387b19a99 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod am: 4480b8c160 -s ours am: 6141b22325 -s ours am: 9847b1cff8 -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: I8b3e91d6f575ee9604fa75fbf3f636e645e57001
2022-03-24 15:58:25 +00:00
Bill Yi
a7deba23fe [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: c2e03b0a34 -s ours am: 50f176dc7f -s ours am: 9d41b295d7 -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: Ia2d159f1838936dc626b4698a1e2a9d641187194
2022-03-24 15:58:24 +00:00
Bill Yi
1e0542c9ba [automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: a2aacc0aac am: 5a15b32995 -s ours am: c3cba53dfd -s ours am: d76f3f7314 -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: Ib9babdbd7e1508ebec60deb16028f33be428700d
2022-03-24 15:57:25 +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
7d90692f14 [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: If4450d70e46dc80dedf51c4b85f2a2b6ea1e2624
2022-03-24 15:51:23 +00:00
Bill Yi
4577ffcb23 [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: I78da17097392e4607dce50e0001c6ea172c328d7
2022-03-24 15:51:21 +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
db845de6bd [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: I68d3acd7ec977387d05e58d0eea4c74adc4a9698
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
1ccc47aa03 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 8d8253a1a7 -s ours am: 2e25a6312f -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: I7c080f41ce168807d74b64878f8ab6077334a968
2022-03-24 15:50:16 +00:00
Bill Yi
710545e022 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 4f7405f4d8 -s ours am: a5a40dadb5 -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: I62238519501ee8c40bf5d1f2437f6562b6e59864
2022-03-24 15:50:12 +00:00
Bill Yi
ff762cf144 Merge changes from topic "presubmit-am-13220b28dc894f18bfa659ed22407a5c" into tm-dev am: 7702e0efbc am: 22a01ff15e
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17353734

Change-Id: I870525a47f2df3a7e159221182a027a69f3b1a68
2022-03-24 15:50:00 +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
a21eefc040 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: ffae5712b4 -s ours am: 9245907454 -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: Id5f1a48ec76e1771c2754d41a226b783bc5e6acb
2022-03-24 15:49:47 +00:00
Bill Yi
f383439255 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-mainline-prod am: d91297b13a -s ours
am skip reason: subject contains skip directive

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

Change-Id: I514b979a48699d12c946119bb8f8eea5e068e071
2022-03-24 15:49:34 +00:00