PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
101,076 Commits 1 Branch 0 Tags
14c20b34e33c2c2018bd53cde581270ed5b2a4a0
Commit Graph

101076 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
PETER LIANG
14c20b34e3 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: I1c20b786db24265f9dd4c2287bbceeea0e8828f6
 2022-03-20 22:42:53 +00:00
PETER LIANG
4269e13c19 Merge "Polish and humanize the strings for the confirm dialog of "Display size and text"." into tm-dev 2022-03-20 22:34:50 +00:00
PETER LIANG
98091d6efd Merge "Fix that icons overlapped in Preview at Display size and text screen under Vision Settings." into tm-dev am: ca73aa40ef 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17233888

Change-Id: I21e37c71393071a8d143bd26703c94db48825ae3
 2022-03-20 05:29:18 +00:00
PETER LIANG
ca73aa40ef Merge "Fix that icons overlapped in Preview at Display size and text screen under Vision Settings." into tm-dev 2022-03-20 05:19:43 +00: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
a1caf7fc8f 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: I2c492f3668da2f900d0d27563b0decc94209de2c
 2022-03-19 14:36:35 +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
8a683e72ad 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: I872fc750b0e6037454fbaaffbc811d205aa0affa
 2022-03-19 14:11:52 +00:00
Jason Hsu
bf510f1a44 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: I084f840b4b61a22210a7aa338409cdb962f99c95
 2022-03-19 14:11:45 +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
Kholoud Mohamed
af10f3f270 Merge "RESTRICT AUTOMERGE Refactor device policy resource APIs to a separate class" into tm-dev am: 51043a1513 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17182607

Change-Id: If4d83b29d33b390cbc08e34217f741754eea812e
 2022-03-19 06:37:09 +00:00
kholoud mohamed
9693ec41ed RESTRICT AUTOMERGE Refactor device policy resource APIs to a separate class am: de78149c16 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17182607

Change-Id: Icd8f69faf43667745b9c467c23db213a9e928530
 2022-03-19 06:36:59 +00:00
Kholoud Mohamed
51043a1513 Merge "RESTRICT AUTOMERGE Refactor device policy resource APIs to a separate class" into tm-dev 2022-03-19 06:30:10 +00:00
TreeHugger Robot
4f45c5cb60 Merge "Hide emergency setting from "Search settings"" into tm-dev am: 70e2ed1b9d 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17252529

Change-Id: I83478f5d399adaa63d41e868d23b1fab8e43e97d
 2022-03-19 02:39:23 +00:00
TreeHugger Robot
70e2ed1b9d Merge "Hide emergency setting from "Search settings"" into tm-dev 2022-03-19 02:22:59 +00:00
Treehugger Robot
76c6ece6e5 Merge "Add null check for mChannel object in WifiP2Settings" am: 2f4962c862 am: 0b28adfd8e am: bbb9db4149 am: 4463829319 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2030626

Change-Id: Idebb078b5ebaf953181ce31eb501262f902cc9af
 2022-03-18 23:42:33 +00:00
Treehugger Robot
4463829319 Merge "Add null check for mChannel object in WifiP2Settings" am: 2f4962c862 am: 0b28adfd8e am: bbb9db4149 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2030626

Change-Id: Ibe6ef9677e7892448000bb2d83501258dacd57d9
 2022-03-18 23:24:19 +00:00
Treehugger Robot
bbb9db4149 Merge "Add null check for mChannel object in WifiP2Settings" am: 2f4962c862 am: 0b28adfd8e 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2030626

Change-Id: Ie97da8acc7f25ae088d9ef36932aeb93be30b7cd
 2022-03-18 23:11:21 +00:00
Treehugger Robot
0b28adfd8e Merge "Add null check for mChannel object in WifiP2Settings" am: 2f4962c862 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2030626

Change-Id: I34c53ca0500252de1245691e403327f470d0e293
 2022-03-18 22:55:36 +00:00
Treehugger Robot
2f4962c862 Merge "Add null check for mChannel object in WifiP2Settings" 2022-03-18 22:38:19 +00:00
Kweku Adams
55cdc01a76 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: I36a0737b6233702830bc01b70ebcf37040b538f0
 2022-03-18 22:16:54 +00:00
Giulio Fiscella
761fab2027 [automerger skipped] Merge "Use new severity levels and builders" into tm-dev am: d5d6846846 -s ours 
am skip reason: Merged-In I9fa4b22e0ca1ca63e75eab427a7beedd95b744da with SHA-1 3612e9e440 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17106963

Change-Id: I69ab1a8fc2ad52089b159f495da40cf50b2e68fe
 2022-03-18 22:16:42 +00:00
Giulio Fiscella
2d7f940ccd [automerger skipped] Use new severity levels and builders am: 9112567332 -s ours 
am skip reason: Merged-In I9fa4b22e0ca1ca63e75eab427a7beedd95b744da with SHA-1 3612e9e440 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17106963

Change-Id: I5ed25afdb420f4ba725de1a4dc3f4ce086a8adf3
 2022-03-18 22:16:40 +00:00
Kweku Adams
696010b0c5 Merge "Make action constants configurable." into tm-dev 2022-03-18 22:04:56 +00:00
Giulio Fiscella
d5d6846846 Merge "Use new severity levels and builders" into tm-dev 2022-03-18 22:00: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
Yibo Wang
e20ddfa5f4 Add null check for mChannel object in WifiP2Settings 
When user switch between settings of hotspot(Enable hotspot),
Internet(Enable Wifi) and Wifi-Direct(establish, disconnect and
forgot P2P connection).

mChannel becomes null during WiFi P2P user scenarios resulting
in Settings(com.android.settings) crash on enable Wifi.

This commit fixes mChannel IllegalArgumentException: Channel
needs to be initialized.

Test: manual test
Bug: 218608961
Change-Id: I72c67bcd1086afe2aa8d2c5521107e2d38e5b0bb
 2022-03-18 15:08:51 +01:00
Giulio Fiscella
582039b888 Merge "Use new severity levels and builders" into tm-mainline-prod 2022-03-18 12:32:10 +00:00
Patrick Huang
8f1e3fec84 Hide emergency setting from "Search settings" 
Use the same config value created in ag/16497464 and ag/16497621
to determine if emergency setting should be searchable in Settings.

Bug: 220437126
Test: Manual test on affected phone and tablet
Change-Id: I964dd9f75f6a5c3b239aabfa4dfce84cb75c8565
 2022-03-18 06:51:31 +00:00
Arc Wang
053a2cef0c Merge "Fix NullPointerException at ManageApplications$ApplicationsAdapter.access" into tm-dev am: f8e0b152ad 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17125146

Change-Id: Ieb67e4801430b3657e730de2fbb88714fe87dddb
 2022-03-18 06:15:04 +00:00
Arc Wang
f8e0b152ad Merge "Fix NullPointerException at ManageApplications$ApplicationsAdapter.access" into tm-dev 2022-03-18 05:56:51 +00:00
Jason Chiu
8fabd76ced Merge "Update the default split ratio" into tm-dev am: 3b1a9086a7 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17226778

Change-Id: I0bfdc83ad10b5f9e028e37411a5a21aec9540909
 2022-03-18 03:15:27 +00:00
Jason Chiu
3b1a9086a7 Merge "Update the default split ratio" into tm-dev 2022-03-18 03:12:14 +00:00
Bill Yi
72651dd7a2 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: c0c5c066f4 -s ours am: 75cce69c9a -s ours am: d953313d3f -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17208661

Change-Id: I23bcad8c2fb359bf76eef121f58b3a8bef2e737a
 2022-03-18 03:00:22 +00:00
Bill Yi
697597bbdb [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 28e4e39cee -s ours am: c0e6019a32 -s ours am: da9e66fe71 -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17208661

Change-Id: Idcc28755f8a4c7ed207f16b0b1e0a90af2765c0b
 2022-03-18 03:00:20 +00:00
Bill Yi
ec0f48658c Merge changes from topic "presubmit-am-38324c67819045d99732392e5fe804f8" into sc-v2-dev-plus-aosp am: 9b874759b1 am: 65bd2f419f 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17207704

Change-Id: Ib7af429a05de931bd79cf8c66b702db4c4e19947
 2022-03-18 02:59:45 +00:00
Bill Yi
c2c8dd5df2 [automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 6d7f03d94b am: ae75e97012 -s ours am: 6adefff78e -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17207704

Change-Id: Ia1405f0de1cb12e5741ab0b6229e90b9ecfd88d6
 2022-03-18 02:59:44 +00:00
Bill Yi
d953313d3f [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: c0c5c066f4 -s ours am: 75cce69c9a -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17208661

Change-Id: I2d6008490cfe535514ef6d03d914a90024a63b53
 2022-03-18 02:51:39 +00:00
Bill Yi
da9e66fe71 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 28e4e39cee -s ours am: c0e6019a32 -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17208661

Change-Id: I4ded1f78ef71c9f174a50952ba99296b3ce0c851
 2022-03-18 02:51:37 +00:00
Bill Yi
65bd2f419f Merge changes from topic "presubmit-am-38324c67819045d99732392e5fe804f8" into sc-v2-dev-plus-aosp am: 9b874759b1 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17207704

Change-Id: I9b5ba470dc8e40ddd7b7bbe5e0642565962edf5a
 2022-03-18 02:51:29 +00:00
Bill Yi
6adefff78e [automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 6d7f03d94b am: ae75e97012 -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17207704

Change-Id: Ia844d632034948b5cc99ee21caaab7d9fe4ebccc
 2022-03-18 02:51:27 +00:00
Bill Yi
75cce69c9a [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: c0c5c066f4 -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17208661

Change-Id: I02a68c6262293bdcf21ec90dc7a96ac187041479
 2022-03-18 02:50:07 +00:00
Bill Yi
c0e6019a32 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 28e4e39cee -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17208661

Change-Id: I61450277f98ace1bd9e3a9bb06244d18c0f627a8
 2022-03-18 02:49:54 +00:00
Bill Yi
298650d578 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod am: 18cb77b66a -s ours am: 78abbdb6e4 -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17201011

Change-Id: I39ad518cab69d6f0fb1d2f24cec5b319f4264dfc
 2022-03-18 02:44:34 +00:00
Bill Yi
e786c64db4 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: a9a68c077f -s ours am: 572d0be27b -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17201011

Change-Id: Ia57c9ca2bacd69b8280bdf75e6b5cfe32720fdeb
 2022-03-18 02:44:32 +00:00
Bill Yi
feefbaaec9 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 0980b77d42 -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17208154

Change-Id: Idc9008e8b93aca4ac7f5788adfb3efe7a7add812
 2022-03-18 02:44:09 +00:00
Bill Yi
78abbdb6e4 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod am: 18cb77b66a -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17201011

Change-Id: Ia3756535e8433e4f0826f4b5f8b61abf778cc495
 2022-03-18 02:44:06 +00:00