Commit Graph

102187 Commits

Author SHA1 Message Date
TreeHugger Robot
ab3683fffa Merge "Fix Wi-Fi hotspot switch UI issue" into tm-dev am: 727583b75f am: ffd61f5cf1
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17374493

Change-Id: Ic19585c80ae604f0f3b1e4116166b1ddcaf6fc70
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-03-25 09:20:27 +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
24302ff926 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: Ibb0829e36d7404724927ce0c04b9632d550cea4b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-03-25 09:04:17 +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
137f9a19cb Merge "Fix group cast volume slider not disabled after switching to group devices." into tm-dev am: e94f159054 am: 33853bd88f
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17351353

Change-Id: Ica85b55069a78180ff61f5bf4b3fe728579a284d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-03-25 02:41:28 +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
f7b69b7c58 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: Ib4e0b46797038922274c503d10bc60fb7daa4916
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-03-25 02:32:19 +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
19f1110554 Merge "Update category title for unused apps" into tm-dev am: 71197d2b84 am: dc740a885d
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17390713

Change-Id: I56661c3344e2a6b460ebb640d87c1f1c2277809b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-03-25 02:26:42 +00:00
Kevin Han
5bcfb709b8 Merge changes from topic "presubmit-am-ba501ad77d234268a7facf1faca01368" into tm-mainline-prod am: 9f79c62f48
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17390713

Change-Id: I1522a3b7528144025028cbd4159ccdb1e7cdfa5c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-03-25 02:26:04 +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
6aba541f78 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: I808ffca6493692713899c964d15f3c775816e682
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-03-25 02:25:14 +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
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
Joe Bolinger
200707c7cd [automerge] Set exported flag to false. 2p: 34704f4108
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17386185

Bug: 222684510
Change-Id: Ieb28cc08edd9027734c4ed40e0fe083b50360964
2022-03-24 18:31:09 +00:00
Joe Bolinger
34704f4108 Set exported flag to false.
It was set to true when the attribute became required in I878adb9108c95f06ddd059b23a542b61210edfa4

Bug: 222684510
Test: manual (see bug)
Change-Id: I8f67a5c3ac92f4813dc503cada8888833d7dbfbf
2022-03-24 18:31:01 +00: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