Commit Graph

10549 Commits

Author SHA1 Message Date
TreeHugger Robot
542d772b1b Merge "Warnings at top of per-app settings page" into tm-dev am: 52ea95aa55 am: 2571882ab4
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17518134

Change-Id: I5e6bce9dd2f4a2d18fd3916636293b8173f7da54
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-01 18:12:07 +00:00
TreeHugger Robot
52ea95aa55 Merge "Warnings at top of per-app settings page" into tm-dev 2022-04-01 17:40:09 +00:00
PETER LIANG
05da36b217 Merge "Update the preview of the conversation message in the "Display size and text" page." into tm-dev am: 93d4886297 am: e9d9fe62ad
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17400625

Change-Id: Ia7656b566a7930fc132a49d06d0d2f47289c53f6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-01 16:44:01 +00:00
PETER LIANG
93d4886297 Merge "Update the preview of the conversation message in the "Display size and text" page." into tm-dev 2022-04-01 16:03:10 +00:00
danielwbhuang
baa59815d8 Warnings at top of per-app settings page
1. Check getInstallPackageName() and isSystemApp()
2. Link to play store

Bug: 221164159
Test: local
Change-Id: I5727a4b99d945ae5c1b517020026654796a34d98
2022-04-01 23:41:56 +08:00
Peter_Liang
454f21cb21 Update the preview of the conversation message in the "Display size and text" page.
Bug: 227076211
Test: manual test
Change-Id: Ie83f95ba223a42f596c2a4ef68f33f4152a2cc07
2022-04-01 18:09:28 +08:00
tom hsu
40a6de1ec4 [Panlingual] Add error message on per-app language page.
Bug: 226032712
Test: local
Change-Id: I12aae66116cc8c00fa7c6b0ba256d4726620ea4c
(cherry picked from commit a9184f43c5)
2022-04-01 09:28:01 +00:00
Tom Hsu
aaac7dd777 Merge "[Panlingual] Add error message on per-app language page." 2022-04-01 09:20:10 +00:00
Menghan Li
0b5e543f9d Merge "Remove dependency of SudGlifTheme from SettingsTheme" into tm-dev am: 1031406227 am: b08cb9b548
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17465488

Change-Id: Idfa32f4657f414bc61a39d7407ab941ed8fb4c18
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-01 06:24:01 +00:00
Menghan Li
1031406227 Merge "Remove dependency of SudGlifTheme from SettingsTheme" into tm-dev 2022-04-01 05:56:13 +00:00
menghanli
18ddc6525b Remove dependency of SudGlifTheme from SettingsTheme
Root cause: Inherit from the glif themes in setupdesign library
Solution: Not inherit from the glif themes and set Setting theme before
applying the dynamic color

Bug: 225800660
Test: Manual testing
Change-Id: Ic4d71bf7a754888c1ed1590c0483360d65f5da44
2022-04-01 11:00:45 +08:00
tom hsu
213b3ce4af [Panlingual] Improve and refactor revamped UI
- Remove useless file
 - Make Icon be able to scroll up and down

Bug: 226350483
Test: local test
Change-Id: I4564f432143e7e31ba5beff1dd32d7bc7764f9bf
(cherry picked from commit ded10f8e24)
Merged-In: I4564f432143e7e31ba5beff1dd32d7bc7764f9bf
2022-04-01 10:33:22 +08:00
Joshua Mccloskey
305b991353 Merge "Updated UDFPS strings." into tm-dev am: ca7f2dbe4a
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17454058

Change-Id: Ic6b54aa03f70e15c4d4cdcedeb0b644daae0bf3f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-03-31 18:52:45 +00:00
Joshua Mccloskey
ca7f2dbe4a Merge "Updated UDFPS strings." into tm-dev 2022-03-31 18:47:51 +00:00
tom hsu
a9184f43c5 [Panlingual] Add error message on per-app language page.
Bug: 226032712
Test: local
Change-Id: I12aae66116cc8c00fa7c6b0ba256d4726620ea4c
2022-03-31 14:45:07 +08:00
TreeHugger Robot
04ae0b26fa Merge "Update strings of clear app data dialog" into tm-dev am: f6eb111b91
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17491666

Change-Id: Iff4543ae9f8dcd9e7944c7cdf50f913a2e6754e6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-03-31 05:28:38 +00:00
TreeHugger Robot
f6eb111b91 Merge "Update strings of clear app data dialog" into tm-dev 2022-03-31 05:11:20 +00:00
Aaron Liu
3d3957830e Merge "Home Controls: Add conditional copy for setting." into tm-dev am: 126e629c7d
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17476399

Change-Id: I07568b33ba507c78fe9ad3fe2f058687533893d8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-03-30 15:20:25 +00:00
Aaron Liu
126e629c7d Merge "Home Controls: Add conditional copy for setting." into tm-dev 2022-03-30 15:05:05 +00:00
Yanting Yang
f14248310f Update strings of clear app data dialog
Update body and positive button strings.

Bug: 219932186
Test: visual
Change-Id: I34f4be091d1e5a076de8ee7a2221a3b5c90747a4
2022-03-30 18:31:52 +08:00
Jason Chiu
e60dd45156 Merge "Refine layouts for large screen" into tm-dev am: 51316c13a1 am: 187b39edc2
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17374489

Change-Id: I525dbf313c7865746f33425a85052dc73a51f41e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-03-30 08:22:22 +00:00
Jason Chiu
680fce3acd Refine layouts for large screen
- Support dynamic paddings depending on app's screen width
- Add round corners to homepage ripple effect to improve the transition
  of being highlighted
- Add an interface to support dynamic split layout for suggestion cards

Bug: 223300824
Test: robotest, manual
Change-Id: Iaca6b4fd3f7369179416ef084a800d7eb2ee4640
2022-03-30 04:54:30 +00:00
Kevin Han
959e5796b3 [automerge] Update hibernation toggle title to have "if unused" 2p: 3cfc87cc05 am: 03a87f460b
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17450694

Change-Id: Iae410252fc9f1fb809bbbaf1d0b516fffbff1439
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-03-29 19:17:51 +00:00
Aaron Liu
c138118d48 Home Controls: Add conditional copy for setting.
Add conditional copy for when allow trivial devices setting is disabled.
Add guidance on how to enable it.

Bug: 227344249
Test: Manual and unit test
Change-Id: I0f2f6dc933804ee6ba15dc180dc717d2a5b729a5
2022-03-29 17:27:17 +00:00
Joshua Mccloskey
ec589193c3 Updated UDFPS strings.
Test: Manual.
Fixes: 226490774
Change-Id: I6aeed72ab87e9b8b937f1acda12499c9af87462c
2022-03-29 04:50:58 +00:00
Tom Hsu
9541f70a80 Merge "[Panlingual] Improve and refactor revamped UI" 2022-03-29 03:34:31 +00:00
Kevin Han
3cfc87cc05 Update hibernation toggle title to have "if unused"
As per UX request, update the toggle title to say "Pause app activity if
unused" and remove "if unused" from the summary.

Bug: 227235454
Test: manual
Change-Id: I9c80f801fcd9bc29660705a7ea4dee0086739c81
2022-03-28 14:47:29 -07:00
Ronish Kalia
bb75ff2158 Merge "Update settings strings as per UXR" 2022-03-28 15:49:52 +00:00
ronish
9a91a86aba Update settings strings as per UXR
Change-Id: Iccac0c658b4a7552e4f4a6ff78693bcdd344c318
2022-03-28 11:58:14 +00:00
tom hsu
ded10f8e24 [Panlingual] Improve and refactor revamped UI
- Remove useless file
 - Make Icon be able to scroll up and down

Bug: 226350483
Test: local test
Change-Id: I4564f432143e7e31ba5beff1dd32d7bc7764f9bf
2022-03-28 17:13:04 +08:00
TreeHugger Robot
32ac672ea5 Merge "Rename the wording for "Wallpaper" under About" into tm-dev 2022-03-28 08:07:03 +00:00
Tsung-Mao Fang
6de0d49560 [automerge] Rename the wording for "Wallpaper" under About 2p: 4b27f24ab2 2p: 0427d13d07
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17233884

Change-Id: Ic02af877f65a79d9527803c824c0360b28fc7af3
2022-03-28 02:51:50 +00:00
Tsung-Mao Fang
0427d13d07 [automerge] Rename the wording for "Wallpaper" under About 2p: 4b27f24ab2
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17233884

Change-Id: Ia41ecd508fe1ec6bfb3cc0fa215664e94b2477fc
2022-03-28 02:51:43 +00:00
Tsung-Mao Fang
4b27f24ab2 Rename the wording for "Wallpaper" under About
In order to improve the order in the search result
between "Wallpapers attributions" and "Wallpaper & style",
We should rename the wording here, and I think "Wallpaper"
is confused under About page.

Test: See the order in the search result list.
Fix: 201359802
Change-Id: I2b50703a7e4bbffd0649a60f7bc2c463f6877fba
2022-03-28 02:51:33 +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
Kedar Chitnis
993371d476 Merge "Revert "Guest mode UX flow updates to user settings"" 2022-03-24 13:25:21 +00:00
Kedar Chitnis
ed45e8c56a Revert "Guest mode UX flow updates to user settings"
Revert submission 16545010-kedarc-ephemeral-guest

Reason for revert: A conflicting CL got merged after presubmits were triggerred, will rebase and push again
Reverted Changes:
I86a5a1571:Guest mode updates to resolve privacy concerns in ...
I7cf205883:Guest mode UX flow updates to user settings

Change-Id: Ia09ab082bb7088831d81e10fd555cecfc8b239f3
2022-03-24 12:45:25 +00:00
Yasin Kilicdere
b724929454 Merge "Singularization of duplicated multi user strings." into tm-dev 2022-03-24 12:03:29 +00:00
Yasin Kilicdere
442f94b1a6 Merge changes from topic "[settings] duplicated-multiuser-strings"
* changes:
  [conflict] Singularization of duplicated multi user strings. 2p: 4564bce03c 2p: 39ef1579ef
  [automerge] Singularization of duplicated multi user strings. 2p: 4564bce03c
  Singularization of duplicated multi user strings.
2022-03-24 12:03:29 +00:00
Kedar Chitnis
c33384d653 Merge "Guest mode UX flow updates to user settings" 2022-03-24 11:55:17 +00:00
TreeHugger Robot
420a446be9 Merge "Update data_usage_bytes_editor spinner background" into tm-dev am: d1c349c572
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17312731

Change-Id: I03e7c7ba4ea33e133bddfb08eb762d75a732a3ab
2022-03-24 10:38:34 +00:00
TreeHugger Robot
2ddb627c77 Merge "Enhance Settings deep link transition" into tm-dev am: 73d2d07d1e
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17290004

Change-Id: Ie78032f2edb7a3e0081b79cb95886f0c375d0a02
2022-03-24 10:37:14 +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
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
TreeHugger Robot
e741185e17 Merge "Update multiple users strings" into tm-dev 2022-03-24 04:05:07 +00:00
TreeHugger Robot
e9cbde201b Merge changes from topic "presubmit-am-79923e45dbeb447a849c3ed6d03e96f1"
* changes:
  [automerge] Update multiple users strings 2p: 296b904bf1 2p: 6a966b0aff
  [automerge] Update multiple users strings 2p: 296b904bf1
  Update multiple users strings
2022-03-24 04:05:07 +00:00
Presubmit Automerger Backend
7a76ba8558 [conflict] Singularization of duplicated multi user strings. 2p: 4564bce03c 2p: 39ef1579ef
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17246083

Bug: 191386817
Change-Id: I0217ef2321f836ddb066ffac7214522483c9687f
2022-03-23 19:31:07 +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