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
Weng Su
876f691377
Restrict secondary users to share Wi-Fi network
...
- Remove "Share" and "Forget" options from the long press menu
- Rollback the Wi-Fi details restriction for admin user only
- Add SafetyNet Logging for security report
Bug: 206986392
Test: manual test
make RunSettingsRoboTests \
ROBOTEST_FILTER=NetworkProviderSettingsTest
make RunSettingsRoboTests \
ROBOTEST_FILTER=WifiNetworkDetailsFragmentTest
Change-Id: Ic434f0583cba557228c72508a501347ffa3141e1
2022-03-25 13:49:43 +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
Giulio Fiscella
b5446ce437
[automerge] Use migrated severity levels 2p: 2a775c69fc
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17384684
Bug: 225388845
Change-Id: I9aae5c32f87f2b225547e3d36dac94f5d2646ca5
2022-03-24 19:10:17 +00:00
Giulio Fiscella
2a775c69fc
Use migrated severity levels
...
Bug: 225388845
Test: atest SettingsUnitTests
Change-Id: I8e7f06dc8fa7c96c14de738e19dee11ec967bb0c
2022-03-24 18:57:21 +00: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
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
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
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
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