PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
74,961 Commits 1 Branch 0 Tags
6e3bbccf2da3edfae68b5043d24ffcb57754bbcc
Commit Graph

74961 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Matthew Mintz
6e3bbccf2d Merge "Make WallpaperPreferenceController available when only style picker present." am: 827665a4a4 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12248956

Change-Id: Idc1b7445e7906e75ccd0f03017f683caaafd5288
 2020-07-30 07:05:26 +00:00
Edgar Wang
ba4333e5d0 Merge "Update language to comply with Android's inclusive language guidance" am: 8a3e7d77a0 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12248948

Change-Id: I146e113f071a96ad385a5d66ee48ae2bea777274
 2020-07-30 07:04:22 +00:00
Blake Kragten
3a7181d8f4 Merge "Remove Enhanced Connectivity Dev Option" into rvc-d1-dev am: 4a142045aa am: 9efa2b85f0 am: aea24e652a am: f0cd62cf8d 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12172090

Change-Id: I821fcf2f36530762ffc823c38f2a430bc45acd0f
 2020-07-30 07:03:33 +00:00
Matthew Mintz
827665a4a4 Merge "Make WallpaperPreferenceController available when only style picker present." 2020-07-30 05:32:55 +00:00
Edgar Wang
8a3e7d77a0 Merge "Update language to comply with Android's inclusive language guidance" 2020-07-30 02:17:48 +00:00
Blake Kragten
f0cd62cf8d Merge "Remove Enhanced Connectivity Dev Option" into rvc-d1-dev am: 4a142045aa am: 9efa2b85f0 am: aea24e652a 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12172090

Change-Id: I6c2ec7ab13e11648cf2bfad4866e978eaafd5b8d
 2020-07-30 00:06:55 +00:00
Blake Kragten
aea24e652a Merge "Remove Enhanced Connectivity Dev Option" into rvc-d1-dev am: 4a142045aa am: 9efa2b85f0 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12172090

Change-Id: Ib24274b8006238992cbaea5701e799a392b2edc3
 2020-07-29 23:45:51 +00:00
Blake Kragten
9efa2b85f0 Merge "Remove Enhanced Connectivity Dev Option" into rvc-d1-dev am: 4a142045aa 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12172090

Change-Id: I00117ec751f2e097e11dca61c9bb25e37e6b3016
 2020-07-29 23:27:51 +00:00
Blake Kragten
4a142045aa Merge "Remove Enhanced Connectivity Dev Option" into rvc-d1-dev 2020-07-29 23:04:17 +00:00
Amy Hsu
eff9693442 [automerger skipped] Change the UI strings of developer in Settings app am: e81c695a47 am: 8fdbf9c60e -s ours am: 45e4334a8a -s ours am: 16c9b12b9b -s ours 
am skip reason: Change-Id I79a9b955aae70da5e19f93504b39b2191a151c8f with SHA-1 e81c695a47 is in history

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

Change-Id: I90a671c2277704b48a2d1f53b30bd5577ab5a553
 2020-07-29 09:42:05 +00:00
Amy Hsu
046fecd5c9 [automerger skipped] Change the UI strings of developer in Settings app am: e81c695a47 am: df5b523ead am: 3d3da5a356 -s ours am: 64ee74c444 -s ours 
am skip reason: Change-Id I79a9b955aae70da5e19f93504b39b2191a151c8f with SHA-1 d3835522a4 is in history

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

Change-Id: Iee7b2753a41e3745bafa33676befdb8f35f4f595
 2020-07-29 09:41:59 +00:00
Treehugger Robot
59d1dc35f8 Merge "Update language to comply with Android's inclusive language guidance" am: 7df1fb2af1 am: 4d421a47dc am: 7b10a29318 am: 9b63618b47 am: 0c65a47568 am: 726531266c 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1374789

Change-Id: I6d1292fad499b74c649f4b3224b2750b834cc9e4
 2020-07-29 09:41:51 +00:00
Matthew Mintz
3243920695 Make WallpaperPreferenceController available when only style picker present. 
WallpaperPreferenceController prefers the style picker over the basic wallpaper picker. However, the entire setting is disabled when only the style picker is available, even though the basic wallpaper picker is not used. This change corrects that.

Fixes: 162395248
Test: Added unit tests. Also built, flashed and tested setting with all four combinations of CategoryPickerActivity and CustomizationPickerActivity enabled/disabled.
Change-Id: I4184f834ed771359cef13b64aacf2072e592d6d8
 2020-07-29 17:39:47 +08:00
Amy Hsu
16c9b12b9b [automerger skipped] Change the UI strings of developer in Settings app am: e81c695a47 am: 8fdbf9c60e -s ours am: 45e4334a8a -s ours 
am skip reason: Change-Id I79a9b955aae70da5e19f93504b39b2191a151c8f with SHA-1 e81c695a47 is in history

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

Change-Id: I43463c2e0e965d3aef8d165471fa5f93410f8e08
 2020-07-29 09:31:51 +00:00
Amy Hsu
45e4334a8a [automerger skipped] Change the UI strings of developer in Settings app am: e81c695a47 am: 8fdbf9c60e -s ours 
am skip reason: Change-Id I79a9b955aae70da5e19f93504b39b2191a151c8f with SHA-1 e81c695a47 is in history

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

Change-Id: Ic7fb82dfd760c4133a555198551163a38c4740f3
 2020-07-29 09:27:09 +00:00
Amy Hsu
64ee74c444 [automerger skipped] Change the UI strings of developer in Settings app am: e81c695a47 am: df5b523ead am: 3d3da5a356 -s ours 
am skip reason: Change-Id I79a9b955aae70da5e19f93504b39b2191a151c8f with SHA-1 d3835522a4 is in history

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

Change-Id: If1f4d5a73a7909cc95de784b72c763fdd705f0fc
 2020-07-29 09:25:03 +00:00
Treehugger Robot
726531266c Merge "Update language to comply with Android's inclusive language guidance" am: 7df1fb2af1 am: 4d421a47dc am: 7b10a29318 am: 9b63618b47 am: 0c65a47568 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1374789

Change-Id: Iddfb1a01a496149d0aa6c0accd7f2cb92254ac46
 2020-07-29 09:24:48 +00:00
Amy Hsu
8fdbf9c60e Change the UI strings of developer in Settings app am: e81c695a47 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12248943

Change-Id: Idd8a83f2d2edfa7f5b13f8e90738cfa9418d2fcc
 2020-07-29 09:06:39 +00:00
Amy Hsu
3d3da5a356 Change the UI strings of developer in Settings app am: e81c695a47 am: df5b523ead 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12248943

Change-Id: I500936a6958e89240cca3acfd8b48b62ce2db372
 2020-07-29 09:05:34 +00:00
TreeHugger Robot
676c76e330 Merge "Update language to comply with Android's inclusive language guidance" am: 5cfe4c247b 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12248946

Change-Id: I3eeb45856b1edcdefdbbe738285fd2865fd02b92
 2020-07-29 09:05:28 +00:00
Amy Hsu
df5b523ead Change the UI strings of developer in Settings app am: e81c695a47 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12248943

Change-Id: I9420885b7e20207f022a22a76fa83b8bf24e8c5a
 2020-07-29 09:05:18 +00:00
Treehugger Robot
0c65a47568 Merge "Update language to comply with Android's inclusive language guidance" am: 7df1fb2af1 am: 4d421a47dc am: 7b10a29318 am: 9b63618b47 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1374789

Change-Id: I7b1b7b777fcf8b93744e5950a31359ae71c4b98d
 2020-07-29 09:05:17 +00:00
Treehugger Robot
9b63618b47 Merge "Update language to comply with Android's inclusive language guidance" am: 7df1fb2af1 am: 4d421a47dc am: 7b10a29318 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1374789

Change-Id: I3be1c10144d2d4b1076f843aa4fecbfe7bed8b0c
 2020-07-29 08:49:06 +00:00
TreeHugger Robot
5cfe4c247b Merge "Update language to comply with Android's inclusive language guidance" 2020-07-29 08:47:49 +00:00
Treehugger Robot
7b10a29318 Merge "Update language to comply with Android's inclusive language guidance" am: 7df1fb2af1 am: 4d421a47dc 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1374789

Change-Id: I47066c39d6fced154b263febab7a3fb0a1e56049
 2020-07-29 08:26:22 +00:00
Treehugger Robot
4d421a47dc Merge "Update language to comply with Android's inclusive language guidance" am: 7df1fb2af1 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1374789

Change-Id: I02ccfae146dd0e360fa34592a3bb21f5c2501833
 2020-07-29 08:07:46 +00:00
Treehugger Robot
7df1fb2af1 Merge "Update language to comply with Android's inclusive language guidance" 2020-07-29 07:47:02 +00:00
Treehugger Robot
a8a236f8ba Merge "Update language to comply with Android's inclusive language guidance" am: 2c5a28bb2d am: f130a08d5e am: 0dd2798bf6 am: 2d6884929e am: 033bbb2df6 am: 8c388c98b6 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1375044

Change-Id: I8e17e9c08ca6b8a2aeb0774c82db970c879b36a1
 2020-07-29 07:41:02 +00:00
Amy Hsu
e81c695a47 Change the UI strings of developer in Settings app 
Bug: 161694718
Test: Manually check Settings app
Change-Id: I79a9b955aae70da5e19f93504b39b2191a151c8f
Merged-In: I79a9b955aae70da5e19f93504b39b2191a151c8f
 2020-07-29 07:21:34 +00:00
Treehugger Robot
8c388c98b6 Merge "Update language to comply with Android's inclusive language guidance" am: 2c5a28bb2d am: f130a08d5e am: 0dd2798bf6 am: 2d6884929e am: 033bbb2df6 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1375044

Change-Id: Ief5565c29da133f6c6f09f347f758217d713bbf3
 2020-07-29 07:17:13 +00:00
Treehugger Robot
033bbb2df6 Merge "Update language to comply with Android's inclusive language guidance" am: 2c5a28bb2d am: f130a08d5e am: 0dd2798bf6 am: 2d6884929e 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1375044

Change-Id: I309ee3bbc1e950f0a77099da008a0660c4c602d6
 2020-07-29 07:01:28 +00:00
Treehugger Robot
2d6884929e Merge "Update language to comply with Android's inclusive language guidance" am: 2c5a28bb2d am: f130a08d5e am: 0dd2798bf6 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1375044

Change-Id: If5c1b0a191bd1695f73c20eb7a6bb535cd8d7217
 2020-07-29 06:46:24 +00:00
Treehugger Robot
0dd2798bf6 Merge "Update language to comply with Android's inclusive language guidance" am: 2c5a28bb2d am: f130a08d5e 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1375044

Change-Id: I72db12567fbe5febdb09e67535904ad82925484d
 2020-07-29 06:28:35 +00:00
Treehugger Robot
f130a08d5e Merge "Update language to comply with Android's inclusive language guidance" am: 2c5a28bb2d 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1375044

Change-Id: If0c4119754ddb20c9dab6e6a3221ef2898c34c55
 2020-07-29 06:13:21 +00:00
TreeHugger Robot
b019768172 Merge "[Wi-Fi] Remove the files which use SettingsLib Wi-Fi objects" am: d1a60e73c8 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12246924

Change-Id: I8ce36e97e9a0653dcc95bc63196eeee4bb4504e5
 2020-07-29 06:12:29 +00:00
Edgar Wang
7af9ea9c90 Update language to comply with Android's inclusive language guidance 
See https://source.android.com/setup/contribute/respectful-code for reference

Bug: 161896447
Test: robotest & manual
Change-Id: I0254b07ba7ba096e33a9da3f828f99434ff07a2d
 2020-07-29 14:12:04 +08:00
Treehugger Robot
2c5a28bb2d Merge "Update language to comply with Android's inclusive language guidance" 2020-07-29 05:51:09 +00:00
TreeHugger Robot
d1a60e73c8 Merge "[Wi-Fi] Remove the files which use SettingsLib Wi-Fi objects" 2020-07-29 05:50:28 +00:00
Edgar Wang
4e02ceb8b4 Update language to comply with Android's inclusive language guidance 
See https://source.android.com/setup/contribute/respectful-code for reference

Bug: 161896447
Test: robotest & manual
Change-Id: I890335a0c0e31f7d3ea32c6130482e4ef0e20b88
 2020-07-29 13:36:09 +08:00
Treehugger Robot
dd86ef68db Merge "Update language to comply with Android's inclusive language guidance" am: ba534426bf am: 95773b6f1a am: d7e5e940ea am: c397bd301d am: 4727c3b1c5 am: a32b11f45b 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1374111

Change-Id: I7d3a5edcfb3b56743c505822ffd464c802cb06a3
 2020-07-29 04:00:04 +00:00
Treehugger Robot
32da6a7649 Merge "Update language to comply with Android's inclusive language guidance" am: c0d28b0f96 am: da02fb34b7 am: 0a318adf46 am: 0093ecd57f am: 78399afc0f am: ad253e7774 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1375043

Change-Id: Ib416e9755d9c8903507d02f606ff90b0c6e2aa53
 2020-07-29 03:59:02 +00:00
Treehugger Robot
a32b11f45b Merge "Update language to comply with Android's inclusive language guidance" am: ba534426bf am: 95773b6f1a am: d7e5e940ea am: c397bd301d am: 4727c3b1c5 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1374111

Change-Id: I77609347466b45e081c14fd64274f9844dd9822c
 2020-07-29 03:43:24 +00:00
Treehugger Robot
ad253e7774 Merge "Update language to comply with Android's inclusive language guidance" am: c0d28b0f96 am: da02fb34b7 am: 0a318adf46 am: 0093ecd57f am: 78399afc0f 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1375043

Change-Id: I2e0e40258e13fea3d7337989ffc511304daefdc8
 2020-07-29 03:43:12 +00:00
Treehugger Robot
4727c3b1c5 Merge "Update language to comply with Android's inclusive language guidance" am: ba534426bf am: 95773b6f1a am: d7e5e940ea am: c397bd301d 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1374111

Change-Id: Idd6d6589c99d8b40eaba09cc435aac6fd5a5db0e
 2020-07-29 03:27:08 +00:00
Treehugger Robot
78399afc0f Merge "Update language to comply with Android's inclusive language guidance" am: c0d28b0f96 am: da02fb34b7 am: 0a318adf46 am: 0093ecd57f 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1375043

Change-Id: I0f68a475fcfc214b4b8b39a0f80fe8fd99558879
 2020-07-29 03:25:37 +00:00
Treehugger Robot
c397bd301d Merge "Update language to comply with Android's inclusive language guidance" am: ba534426bf am: 95773b6f1a am: d7e5e940ea 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1374111

Change-Id: I3b337e53b5696121ccb6a72634aebddf9c04f955
 2020-07-29 03:08:26 +00:00
Treehugger Robot
0093ecd57f Merge "Update language to comply with Android's inclusive language guidance" am: c0d28b0f96 am: da02fb34b7 am: 0a318adf46 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1375043

Change-Id: Ie8d9822dba24a284fb18fe6c3a167fd747bebd17
 2020-07-29 03:08:10 +00:00
Treehugger Robot
d7e5e940ea Merge "Update language to comply with Android's inclusive language guidance" am: ba534426bf am: 95773b6f1a 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1374111

Change-Id: I458ae96ae298c32cc2f070dddac54d625929332c
 2020-07-29 02:48:26 +00:00
PETER LIANG
78b16150fe Merge "Create new strings for accessibility long press timout to avoid the string gender issue." am: d9a5ffaeee 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12217349

Change-Id: If1339cf8f15a72a08e3bb8b1992d52bf9fa9e221
 2020-07-29 02:48:12 +00:00
Treehugger Robot
0a318adf46 Merge "Update language to comply with Android's inclusive language guidance" am: c0d28b0f96 am: da02fb34b7 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1375043

Change-Id: I497a616313d2f9465f9a33fc296cd26ded64c835
 2020-07-29 02:48:12 +00:00