Android/packages_apps_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

10515 Commits

Author SHA1 Message Date
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
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
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
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
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
53fa29af01 Merge "Update the string" into tm-dev 2022-03-23 07:11:54 +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
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
Kevin Han
22f532e6f3 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: Ibe0d63375342ee268619b4c3d5bb737cab1dfa74
 2022-03-23 04:38:02 +00:00
Kevin Han
46adb8e175 Merge "Update hibernation toggle string" into tm-dev 2022-03-23 04:24:38 +00:00
Kedar Chitnis
948dee1b6f Guest mode UX flow updates to user settings 
- Add option in user settings to enable/disable ephemeral
  mode for guest user
- Update user settings to show exit guest and reset guest preferences
- Update user settings to show guest related preferences grouped together

Bug: 214031645, 175795666
Screenshots: go/ephemeral-guest-b-214031645-ux
Test: Manual test on sunfish, atest SystemUITests, atest SettingsRoboTests
Change-Id: I7cf205883f8250178ac24c67c74b9142ceb6c1f5
 2022-03-23 03:42:37 +00:00
Hugh Chen
b355af9a87 Update the string 
Bug: 225982666
Test: build pass
Change-Id: I47a9a27fedcc657d1cbd41708607174486d33fc2
 2022-03-23 03:04:23 +00:00
Kweku Adams
e1b959bbef Merge "Make reward constants configurable." into tm-dev am: 32edc913a7 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17263186

Change-Id: I366f2939c28b8a00b164c6912af59c6f717038ea
 2022-03-22 19:07:43 +00:00
Yanli Wan
e80aad534a Merge "Update financed device info strings" 2022-03-22 18:53:27 +00:00
Kweku Adams
10ef599170 Make reward constants configurable. 
Make it possible to configure the instant and max values of all
supported actions. Ongoing rewards will be enabled later.

Bug: 158300259
Bug: 189850067
Bug: 191876714
Bug: 191877052
Test: Manual
Change-Id: Ia854f18820f3fe95b3b1448c5fa8411853859052
 2022-03-22 17:37:07 +00:00
PETER LIANG
04f5262673 Merge "Polish and humanize the strings for the preview of mail content." into tm-dev am: 679e6a140e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17312729

Change-Id: Idbfc8799acf7e9e22df3d9dc0b63467eb5d89135
 2022-03-22 12:25:15 +00:00
PETER LIANG
679e6a140e Merge "Polish and humanize the strings for the preview of mail content." into tm-dev 2022-03-22 12:08:19 +00:00
TreeHugger Robot
5230f93ca8 Merge "Update spatial audio strings" into tm-dev am: 46756fcb44 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17312726

Change-Id: Ie9f24e6b733f01bc7a91a7dd01e332751241fd4d
 2022-03-22 10:12:38 +00:00
Edgar Wang
18f8850521 Update data_usage_bytes_editor spinner background 
Bug: 220322347
Test: visual verify
Change-Id: I04f83d0a9437f58a073120d8a4b1657db829ec91
 2022-03-22 10:09:49 +00:00
Peter_Liang
2d54d60ead Polish and humanize the strings for the preview of mail content. 
Bug: 219163254
Test: manual test
Change-Id: I6138bab2640a184a5faeed83c9b30df8a7829da1
 2022-03-22 16:47:55 +08:00
Hugh Chen
d10effc102 Update spatial audio strings 
Bug: 225982666
Test: build pass
Change-Id: I3882960f2807799945d8e57766ec2161f287f8f1
 2022-03-22 05:57:06 +00:00
Gary Jian
5a535e6674 Add a developer option to controll mockmodemservice permission 
Bug: 220995034
Test: 1.enable/disable from developer option and check the property value
      2.atest MockModemPreferenceControllerTest

Change-Id: Iaa1a29f4214e1208fe4de497ff4b05c47c34b266
 2022-03-22 12:02:52 +08:00
Yanli Wan
9d6aabe1e2 Update financed device info strings 
Bug: 225814149
Test: Manual
Change-Id: Iaf121b90f775befb2d89b0378c35b23e048f3649
 2022-03-21 20:21:47 -07:00
Kevin Han
188fe36c8d Update hibernation toggle string 
Update the toggle string in App Info to make it more clear that
notifications will stop for hibernating apps.

Bug: 201759939
Test: manual, check screenshots in bug
Change-Id: Ie7223ad7d92ae43fbb644b8d0a9f9c95309dbce0
 2022-03-21 18:03:39 -07:00
Treehugger Robot
3378f6e4da Merge "Add LE audio hardware offload development option" am: 3c209b06c0 am: bcb4ee1e8c 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1927033

Change-Id: I4d509aab5b501b432bdd6789827945508c7468f0
 2022-03-21 06:25:46 +00:00
Treehugger Robot
3c209b06c0 Merge "Add LE audio hardware offload development option" 2022-03-21 05:24:10 +00:00
TreeHugger Robot
d4d3413385 Merge "Fix connected device detail page slice items are in smaller font size" into tm-dev am: 27c2e0db82 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17233883

Change-Id: I72498de9e9b4f93f1dc7c10bdd1754a1f6222cc0
 2022-03-21 03:01:22 +00:00
TreeHugger Robot
27c2e0db82 Merge "Fix connected device detail page slice items are in smaller font size" into tm-dev 2022-03-21 02:54:54 +00:00
Jenhou (Alan) Huang
e8ca43b239 Merge "DO NOT MERGE Add setting page for the Spatial audio" into tm-dev 2022-03-21 01:59:31 +00:00
PETER LIANG
d057fbb8d3 Merge "Polish and humanize the strings for the preview of the conversation message." into tm-dev am: 24548b3a09 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17252803

Change-Id: I84ab5eed871998fab95a9531f638ed805f64d387
 2022-03-20 22:42:39 +00:00
PETER LIANG
cef67abf45 Merge "Polish and humanize the strings for the confirm dialog of "Display size and text"." into tm-dev am: 4269e13c19 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17247846

Change-Id: Id3c74876d5b99e8322bc1391a05ef3aeb85958c1
 2022-03-20 22:42:29 +00:00