PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
102,122 Commits 1 Branch 0 Tags
2df3b51dfd6fb232f80b4d6a5c2031012b300015
Commit Graph

25691 Commits

Author SHA1 Message Date
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
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
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
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
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
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
Bill Yi
a3085b407f Merge "Import translations. DO NOT MERGE ANYWHERE" 2022-03-24 15:31:37 +00:00
Bill Yi
952e19e324 Merge "Import translations. DO NOT MERGE ANYWHERE" 2022-03-24 15:31:00 +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
ffae5712b4 Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev 2022-03-24 15:23:29 +00:00
PETER LIANG
9f5b50644e Merge "Fix that strings have the similar color as the background in preview section." into tm-dev am: 03ecb4f4a6 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17341687

Change-Id: Iee50c8fb778fc88803b3f6f373fc138df546b8ea
 2022-03-24 13:44:16 +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
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
Philip Junker
c4648f276b Merge "Add special app access for turning on the screen." into tm-dev am: bf4878c877 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17182673

Change-Id: Ia91f563137a21fe5628ca98564d2cc8669d52807
 2022-03-24 10:07:12 +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
Jason Hsu
8f6c3fa915 Merge changes from topic "triple-tap" into tm-dev am: a46d6dcebc 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17220624

Change-Id: I2f2c3b949d15cfa6d2fb40dba6243760f0fa2c9f
 2022-03-24 06:08:33 +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
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
Presubmit Automerger Backend
39ef1579ef [automerge] Singularization of duplicated multi user strings. 2p: 4564bce03c 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17246083

Bug: 191386817
Change-Id: Iff78a0cf3e065fc8261b67e94603084e863e206e
 2022-03-23 19:21:46 +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
Bill Yi
70d210b974 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I1925648483a881594f948162c6167facdcc3b268
 2022-03-23 18:17:31 +00:00
Bill Yi
abb0f07146 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I568e9468bcef9fb4bfe8a6e5c5d2573fa3c018b3
 2022-03-23 18:13:16 +00:00
Bill Yi
4f7405f4d8 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I33b6f6118cbf42a488e1369b41c7a87ab8e888cf
 2022-03-23 18:07:37 +00:00
Bill Yi
a624ee3140 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: Ifbd5a108750f88997c469b01bbddd357e74070c5
 2022-03-23 18:05:54 +00:00
Matt Pietal
607f402bff [automerge] Update multiple users strings 2p: 296b904bf1 2p: 6a966b0aff 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17352043

Bug: 219078700
Change-Id: I06147b00879436ddbc477061c6dfb40c5e8c12d7
 2022-03-23 17:40:52 +00:00
Matt Pietal
6a966b0aff [automerge] Update multiple users strings 2p: 296b904bf1 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17352043

Bug: 219078700
Change-Id: Ib2e47960b4602cacf727f18d47fe405b850c3ef4
 2022-03-23 17:40:45 +00:00
Matt Pietal
296b904bf1 Update multiple users strings 
To match latest guidance

Bug: 219078700
Test: manual
Change-Id: Ieef884e046e1e1798cc98a553bcd902c1374d069
 2022-03-23 13:39:42 -04:00
Lucas Silva
4bfc3ea2d1 [automerge] Update screen saver overlay toggle description 2p: 0f29d1562d 2p: 072d2beb83 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17352044

Change-Id: Ia1067f8cc23c198c42209ae0f40f4b6ee2a06031
 2022-03-23 17:31:24 +00:00
Lucas Silva
072d2beb83 [automerge] Update screen saver overlay toggle description 2p: 0f29d1562d 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17352044

Change-Id: I3c000b5d042373d8617f6648e4957dd7c57dd8f9
 2022-03-23 17:31:18 +00:00
Lucas Silva
0f29d1562d Update screen saver overlay toggle description 
Change-Id: I6baab768fd845211e0d0eaf98b6a59cff4e25832
 2022-03-23 17:31:00 +00:00
Ricky Wai
1aa790501f Update restricted setting dialog, unlock toast, and menu strings 
Bug: 224970895
Bug: 224992636
Bug: 224970884
Bug: 224988456

Test: Can see updated strings and toast in UI
Change-Id: I29e257fcc15310558ae8e56cbc51de3c874471ed
 2022-03-23 14:39:17 +00:00
jasonwshsu
3b96a2c57e Apply new flow to hint user about triple-tap will delay when user select triple-tap shortcut on window-mode. 
Root Cause: Original content in magnification switch shortcut dialog needs to have different versions for different accessibility software shortcuts. Use the generic content and new flow to replace it.

Solution: Apply new flow from UX suggestion.

Bug: 210593079
Test: make RunSettingsRoboTests ROBOTEST_FILTER=MagnificationModePreferenceControllerTest
Test: make RunSettingsRoboTests ROBOTEST_FILTER=AccessibilityDialogUtilsTest
Change-Id: Id09b8847cca4fce1f3fb77770a03bff53ae05855
 2022-03-23 19:43:03 +08:00
TreeHugger Robot
5f1205dbb7 Merge "Update the string" into tm-dev am: 53fa29af01 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17341684

Change-Id: I68792833ff9c35840232c8bf0f50774f79b2ae78
 2022-03-23 07:26:43 +00:00
TreeHugger Robot
4de69b01a3 Merge "Update the string" into tm-dev am: 53fa29af01 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17341684

Change-Id: I630c98bc22722afb09a0a835b570c2b6776d8d39
 2022-03-23 07:26:28 +00:00
TreeHugger Robot
53fa29af01 Merge "Update the string" into tm-dev 2022-03-23 07:11:54 +00:00
Gary Jian
47e14df7cb Merge "Add a developer option to controll mockmodemservice permission" am: 78b2b241a9 am: 41ec2bc89b am: 24888461da am: e1356cdb64 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2026223

Change-Id: I71c344d0c3eea2f26c6d0ab4db2bf28e28cb65ff
 2022-03-23 07:04:26 +00:00
Gary Jian
abbccaf748 Merge "Add a developer option to controll mockmodemservice permission" am: 78b2b241a9 am: 41ec2bc89b am: 24888461da am: e1356cdb64 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2026223

Change-Id: I551760d32c0bea35118fae7b579f0283fedaea15
 2022-03-23 07:04:19 +00:00
Gary Jian
e1356cdb64 Merge "Add a developer option to controll mockmodemservice permission" am: 78b2b241a9 am: 41ec2bc89b am: 24888461da 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2026223

Change-Id: I12e5aa6274b2db7f70a231d8b6512f40d32ff8a9
 2022-03-23 06:56:17 +00:00