Android/packages_apps_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
101,431 Commits 1 Branch 0 Tags
a9318375ea225525fbb4e1542ce861ca59dfbb63
Commit Graph

25565 Commits

Author SHA1 Message Date
Grace Cheng
d17e49853f Merge changes from topic "presubmit-am-329e8f4e07b8433d90ca6850e1be95f1" into tm-mainline-prod 
* changes:
  [automerge] Hide fingerprint setup animation from talkback users 2p: 404ed2b0b2
  Hide fingerprint setup animation from talkback users
 2022-03-28 23:47:06 +00:00
TreeHugger Robot
daef9fa397 Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-mainline-prod 2022-03-28 18:56:52 +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
Bill Yi
c0a1868fbd Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I1f7899a8f405fd16339a9615074c21a278760530
 2022-03-26 00:49:25 +00:00
Grace Cheng
404ed2b0b2 Hide fingerprint setup animation from talkback users 
Hides fingerprint setup animation from talkback users to prevent
unlabelled talkback

Fixes: 215461655
Test: Manually navigate to fingerprint setup page, swipe to confirm
animation is not focusable or spoken by talkback
Change-Id: I610ae68ed75d6b9f92005b0e12473b9c5dc6815b
 2022-03-25 21:52:40 +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
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
Bill Yi
d91297b13a Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-mainline-prod 2022-03-24 15:26:09 +00:00
Bill Yi
f2b3e82be3 Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-mainline-prod 2022-03-24 15:25:55 +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
796ecbc7bb 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: Ife1aaa337d4c9ac47a424256c32eb7548d6f6d3d
 2022-03-24 13:44: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
Yasin Kilicdere
b724929454 Merge "Singularization of duplicated multi user strings." into tm-dev 2022-03-24 12:03:29 +00:00
Yasin Kilicdere
e6ae1dbe4d Merge changes from topic "[settings] duplicated-multiuser-strings" into tm-mainline-prod 
* changes:
  [automerge] Singularization of duplicated multi user strings. 2p: 4564bce03c
  Singularization of duplicated multi user strings.
 2022-03-24 12:03:29 +00:00
TreeHugger Robot
17e6118c96 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: I24e99cd17f2427f1ea29c74b8d5fd60305080e00
 2022-03-24 10:37:40 +00:00
TreeHugger Robot
6f5e9072ae 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: I2d60265473c2a785850d77cc38bd3603e60a5986
 2022-03-24 10:36:40 +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
ff5f6bb47f 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: I7ef3eda5c9cc14fe03eb025750982d9696f5bec0
 2022-03-24 10:07:20 +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
6bfb9f50de 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: I1f926c8375f1da0366ce26ae8fbe45061a54ec0c
 2022-03-24 06:08:37 +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
f4f09c446e Merge changes from topic "presubmit-am-79923e45dbeb447a849c3ed6d03e96f1" into tm-mainline-prod 
* changes:
  [automerge] Update multiple users strings 2p: 296b904bf1
  Update multiple users strings
 2022-03-24 04:05: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
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
ab0bfefb6c Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I58009fae8d10e23e7ebaec62817ebb90475c6d28
 2022-03-23 18:01:17 +00:00
Bill Yi
2aec804097 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I878477ca669ea08c234a859312994165fe6d6b4c
 2022-03-23 17:53:40 +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
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
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
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
Gary Jian
24888461da Merge "Add a developer option to controll mockmodemservice permission" am: 78b2b241a9 am: 41ec2bc89b 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2026223

Change-Id: Icbe95d63e86ef204fec957757a8f8b49ef77ac82
 2022-03-23 06:34:55 +00:00
Gary Jian
78b2b241a9 Merge "Add a developer option to controll mockmodemservice permission" 2022-03-23 05:46:22 +00:00
Peter_Liang
5069aa7263 Fix that strings have the similar color as the background in preview section. 
Add the text color attribute.

Fix: 225805027
Test: manual test
Change-Id: Ie914797920631ed8e096e27ecd6e1c8184ee4505
 2022-03-23 05:43:37 +00:00
Kevin Han
7c8166e851 Merge "Update hibernation toggle string" into tm-dev am: 46adb8e175 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17304592

Change-Id: Ibd698dd496b29770d5f1112871408e96cf0ff32e
 2022-03-23 04:37:43 +00:00