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

8108 Commits

Author SHA1 Message Date
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
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
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
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
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
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
Alan Huang
616b0925ac DO NOT MERGE Add setting page for the Spatial audio 
The Spatial audio settings page control the state for the phone speaker
and the wired headphones

Test: make RunSettingsRoboTests

Bug: 220811398
Change-Id: I49e3fab48186d09357a8481652bdccb4aa5d044a
 2022-03-20 15:55:53 +00:00
Peter_Liang
d6b2b705ec Polish and humanize the strings for the preview of the conversation message. 
New strings will replace the current strings of the conversation message.

Bug: 219163254
Test: manual test
Change-Id: I54d6563a04af2eb3e216d5b371d10a72c5d98c12
 2022-03-20 12:09:50 +08:00
Peter_Liang
31f3dca871 Polish and humanize the strings for the confirm dialog of "Display size and text". 
Extra action:
Add new strings.

Bug: 219163254
Test: manual test
Change-Id: Icaa8d4dd446872da665895b3343d8436717e22ed
 2022-03-20 12:08:41 +08:00
PETER LIANG
1920f07380 Merge "Polish and humanize the strings for the preview of mail content." into tm-dev am: 763f9c5a98 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17247844

Change-Id: Ie66f0906238f9fe5a37f0f884dc2ec25f55906c5
 2022-03-19 14:36:21 +00:00
PETER LIANG
763f9c5a98 Merge "Polish and humanize the strings for the preview of mail content." into tm-dev 2022-03-19 14:32:04 +00:00
Jason Hsu
85795aac19 Merge "Update content in Accessibility -> Hearing aids" into tm-dev am: eb4cc843ae 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17252806

Change-Id: I835201e9abd7146bb819a5c0e2808fcd18c77f96
 2022-03-19 14:11:42 +00:00
Jason Hsu
5c8b1c8751 Merge "Add strings for pair other ear dialog." into tm-dev am: 5f3bf16471 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17252805

Change-Id: I376502728d348e030a4c91918c3511b1b19ed706
 2022-03-19 14:11:31 +00:00
Jason Hsu
eb4cc843ae Merge "Update content in Accessibility -> Hearing aids" into tm-dev 2022-03-19 14:02:31 +00:00
Jason Hsu
5f3bf16471 Merge "Add strings for pair other ear dialog." into tm-dev 2022-03-19 14:01:13 +00:00
jasonwshsu
702f242e47 Update content in Accessibility -> Hearing aids 
* Update pair instruction dialog
* Update summary of hearing aids preference
* Add a title of the preference screen

Bug: 225117843
Test: build pass
Change-Id: Ia74b75a813a465d2ef6817d5a46d962f61a77a7c
 2022-03-19 21:51:38 +08:00
jasonwshsu
438db974c4 Add strings for pair other ear dialog. 
Dialog shows when only one of the hearing aid device set is connected.

Bug: 225117454
Test: build pass
Change-Id: If7a98c022749f62bf6905ef6ee153037333dd725
 2022-03-19 21:51:38 +08:00
Kweku Adams
6ff3a5e686 Merge "Make action constants configurable." into tm-dev am: 696010b0c5 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17260256

Change-Id: I1910a7aa9c45398184800f542372685492fc28a8
 2022-03-18 22:17:01 +00:00
Kweku Adams
6525ff3d79 Make action constants configurable. 
Make it possible to configure the base price and cost to produce of all
supported actions.

Bug: 158300259
Bug: 189850067
Bug: 191876714
Bug: 191877052
Test: Manual
Change-Id: I2dcd3382f7404655fb0d10538a426071c157ea18
 2022-03-18 18:54:00 +00:00
Peter_Liang
b8f477691c Polish and humanize the strings for the preview of mail content. 
Bug: 219163254
Test: manual test
Change-Id: I54bdd13f6cafeec1d68e414ce07cdc09608f2165
 2022-03-18 09:05:35 +08:00
Jason Hsu
b00938910e Merge "Add the string for new flow to hint user about triple-tap will delay when user select triple-tap shortcut on window-mode." into tm-dev am: f8f1ff2594 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17217203

Change-Id: I4aa54b397fd73f38c24f33ad5feb5aeefbbb0f30
 2022-03-17 09:20:55 +00:00
Jason Hsu
f8f1ff2594 Merge "Add the string for new flow to hint user about triple-tap will delay when user select triple-tap shortcut on window-mode." into tm-dev 2022-03-17 08:46:50 +00:00
Yuri Lin
003049ce20 Merge "Remove translatable=false from zen mode people settings footer" into tm-dev am: 9793acfafd 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17220597

Change-Id: Id71f9c7ac104bd1140008648308a7d62caea5b55
 2022-03-16 19:55:39 +00:00
Eric Biggers
f755f6fde9 Merge "Remove support for converting from FDE to FBE" am: 804dc16a03 am: 629db5f9f8 am: c749aa3ed1 am: 6a8f883aee 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2026904

Change-Id: Ib07f915c728fa3a00861aa14d4b3d77e3e78f173
 2022-03-16 19:55:29 +00:00
Yuri Lin
9793acfafd Merge "Remove translatable=false from zen mode people settings footer" into tm-dev 2022-03-16 19:52:49 +00:00
Eric Biggers
6a8f883aee Merge "Remove support for converting from FDE to FBE" am: 804dc16a03 am: 629db5f9f8 am: c749aa3ed1 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2026904

Change-Id: I919c43559218b13c0f6188e04f104f3051a28731
 2022-03-16 19:33:25 +00:00