Commit Graph

102107 Commits

Author SHA1 Message Date
Quang Luong
01e66ca398 Merge "Increase WifiEntryPreference summary max lines for verbose logging" into tm-dev am: 8a5e6be37a am: e031563cf8
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17390718

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

Change-Id: I178a9010a18691813e1b75ad04f39f6f59f284c0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-03-25 17:01:54 +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
199c83b9fc 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: I2d340008e2f75efd9b4c5f3398e133569139b70f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-03-25 16:53:02 +00:00
Baligh Uddin
92c77f547f Merge "Changing apk name in the manifest and the corresponding packages." into tm-dev am: 1d788a0ada am: 024bb0db4e
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17383907

Change-Id: I8fec5442cb9c6cb36176dc6813c6a0b35688354d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-03-25 16:52:05 +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
Quang Luong
8a5e6be37a Merge "Increase WifiEntryPreference summary max lines for verbose logging" into tm-dev 2022-03-25 15:50:04 +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
Baligh Uddin
cf5300d19b 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: I14d11698280f310ec6b2fdf768d4114a81118ee6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-03-25 13:50:15 +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
5cc09fbd7f [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: b8fc78d642 -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: I49451e72609f347230365a51d169d5525a31c57e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-03-25 11:00:05 +00:00
Peter Wang
c538b49d64 [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: 25a88e5a57 -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: Ie75076efbfed9c50d2826f5cc6b23679b747e987
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-03-25 11:00:03 +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
7b2a8e786f [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: I47223f988533256c836975c3188f5d0a96a5c6b0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-03-25 10:46:11 +00:00
Peter Wang
1a4f76cfd0 [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: Iaf45900fdb203aed8865cb0d45c1ce55ba60fa74
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-03-25 10:46:10 +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
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