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
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
727583b75f
Merge "Fix Wi-Fi hotspot switch UI issue" into tm-dev
2022-03-25 08:40:57 +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
71197d2b84
Merge "Update category title for unused apps" into tm-dev
2022-03-25 02:08:04 +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
d84516dd28
Merge "Update restricted setting dialog, unlock toast, and menu strings" into tm-dev
2022-03-24 23:51:31 +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
4ccde95a1a
Merge "Enable Encryption & Creds UI for Secondary users" into tm-dev
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
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
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
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
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
ffae5712b4
Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev
2022-03-24 15:23: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
e6b4297cc3
Merge "Update enable toggle processing." into tm-dev
2022-03-24 13:20:57 +00:00
Weng Su
b844a7a920
Fix Wi-Fi hotspot switch UI issue
...
- The Wi-Fi hotspot switch only handles the click event from the UI.
- Use the onSwitchChanged callback to handle click and swipe events.
Bug: 218891956
Test: manual test
make RunSettingsRoboTests \
ROBOTEST_FILTER=WifiTetherSwitchBarControllerTest
Change-Id: Ie4136443845489be295a8ee0f3058f493a3b5829
2022-03-24 20:09:29 +08:00
Yasin Kilicdere
b724929454
Merge "Singularization of duplicated multi user strings." into tm-dev
2022-03-24 12:03:29 +00:00
TreeHugger Robot
d1c349c572
Merge "Update data_usage_bytes_editor spinner background" into tm-dev
2022-03-24 10:28:17 +00:00
TreeHugger Robot
73d2d07d1e
Merge "Enhance Settings deep link transition" into tm-dev
2022-03-24 10:16:46 +00:00
Philip Junker
bf4878c877
Merge "Add special app access for turning on the screen." into tm-dev
2022-03-24 10:02:49 +00:00
Betty Chang
0ef919db7e
Merge "Move the QrCodeGenerator from Settings to SettingsLib for Wifi and BT" into tm-dev
2022-03-24 08:21:16 +00:00
Alan Huang
2f2b648693
Fix group cast volume slider not disabled after switching to group
...
devices.
Test: manual build and verify
Bug: 222443976
Change-Id: Ie9f126bb2f4cbc3c6148f41092ada4bfdfa29f99
2022-03-24 08:12:40 +00:00
Yuri Ufimtsev
bdf31dd9dd
Merge "Postpone getting Metrics Category until it is needed" into tm-dev
2022-03-24 07:56:27 +00:00
TreeHugger Robot
5b9c125bb7
Merge "Moves battery saver warning message below Screen Attention setting." into tm-dev
2022-03-24 07:40:32 +00:00
Jason Chang
ea5b55ca53
Merge "Add checking if device should not support One-handed mode shortcut widget" into tm-dev
2022-03-24 06:17:31 +00:00
Jason Hsu
a46d6dcebc
Merge changes from topic "triple-tap" into tm-dev
...
* changes:
Add link functionality in message of magnification triple-tap dialog
Apply new flow to hint user about triple-tap will delay when user select triple-tap shortcut on window-mode.
2022-03-24 05:49:16 +00:00
Jason Chiu
177573c892
Enhance Settings deep link transition
...
Since the deep link mechanism uses a trampoline activity to redirect the
target activity, and the targeting activity is launched in a separate
task, there will be two transitions played, where one is the splash
screen with the trampoline acitvity and another one is the task
transition. This makes the UX weird.
To avoid this, this CL tries to make the targeting activity launch in
the same task as the trampoline acitivity by removing the taskAffinity,
so there won't be a task transition.
Fix: 215275940
Test: Create a settings shortcut on the home screen and launch it.
Change-Id: I7621ab9f1132acbf619495801a3b985c5c3b1b5d
2022-03-24 12:42:01 +08:00
Xinyi Zhou
9badccfc9d
Merge "Update API according to API council feedback" into tm-dev
2022-03-24 04:36:17 +00:00
TreeHugger Robot
e741185e17
Merge "Update multiple users strings" into tm-dev
2022-03-24 04:05:07 +00:00
Yi Jiang
8edf692915
Moves battery saver warning message below Screen Attention setting.
...
Test: make RunSettingsRoboTests -j40
Bug: 220252566
Change-Id: Ib51a0d73c13700c981d1ca789d2ab669e57d814d
Merged-In: Ib51a0d73c13700c981d1ca789d2ab669e57d814d
(cherry picked from commit 70128d9016
)
2022-03-24 00:41:03 +00:00
TreeHugger Robot
d6ca2dadf4
Merge "Ignore PublicVolumeSettingsTest#test_invalidSetupDoesNotCrashSettings" into tm-dev
2022-03-23 23:33:50 +00:00
Lucas Silva
7b9593761a
Merge "Update screen saver overlay toggle description" into tm-dev
2022-03-23 21:56:59 +00:00
TreeHugger Robot
e7f902f21c
Merge "Add summary to "Vibration & haptics" settings" into tm-dev
2022-03-23 19:58:55 +00:00
Yasin Kilicdere
4564bce03c
Singularization of duplicated multi user strings.
...
Many multi-user strings were duplicated between SettingsLib, Settings,
System UI and Car projects. This CL removes those duplicates.
List of singularized strings: "Guest", "Remove guest", "Add user",
"Remove guest?", "Too many incorrect attempts...."
Bug: 191386817
Test: NA
Change-Id: I8d9629a1a9628cab9f049df84f706bd04ee75cc2
2022-03-23 19:20:34 +00:00