Commit Graph

74978 Commits

Author SHA1 Message Date
Blake Kragten
1836c8d970 Merge "Remove Enhanced Connectivity Dev Option" into rvc-d1-dev am: 4a142045aa am: 23dd1699e2 am: 341c3c387e am: 88e4363384
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12172090

Change-Id: Ic54bd3b2588f9be57ff134e61a4e2637b2b1885a
2020-07-31 01:25:21 +00:00
Blake Kragten
88e4363384 Merge "Remove Enhanced Connectivity Dev Option" into rvc-d1-dev am: 4a142045aa am: 23dd1699e2 am: 341c3c387e
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12172090

Change-Id: I086dd980328616f11810bb057b794287354ad871
2020-07-31 00:56:55 +00:00
Blake Kragten
341c3c387e Merge "Remove Enhanced Connectivity Dev Option" into rvc-d1-dev am: 4a142045aa am: 23dd1699e2
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12172090

Change-Id: Ied32e650b82e0725329d7fa55c18073ce4b4cc91
2020-07-31 00:16:59 +00:00
TreeHugger Robot
a81fec7bb5 [automerger skipped] Merge "Allows to launch only authenticator owned activities" into pi-dev am: d3ab16f1e2 -s ours am: b3448be7c7 -s ours am: 2076a10386 -s ours am: c5cc1c5939 -s ours am: 9a4e24e12e -s ours am: d6f6c8da11 -s ours am: 0d82f65875 -s ours am: bbd7642c59 -s ours
am skip reason: Change-Id I5ce1a0b3838db7b3fbe48c6ea23d5f093d625cdb with SHA-1 818fef48f3 is in history

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

Change-Id: I2f5a3db02e9cf63f956035846ef32504f422dcf5
2020-07-30 18:16:19 +00:00
TreeHugger Robot
bbd7642c59 [automerger skipped] Merge "Allows to launch only authenticator owned activities" into pi-dev am: d3ab16f1e2 -s ours am: b3448be7c7 -s ours am: 2076a10386 -s ours am: c5cc1c5939 -s ours am: 9a4e24e12e -s ours am: d6f6c8da11 -s ours am: 0d82f65875 -s ours
am skip reason: Change-Id I5ce1a0b3838db7b3fbe48c6ea23d5f093d625cdb with SHA-1 818fef48f3 is in history

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

Change-Id: I029eee6fa9c17ce697afcca041532abbf2ae23bd
2020-07-30 18:08:03 +00:00
TreeHugger Robot
5647233b72 Merge "Change battery saver text." am: 644d7f5b30
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12272177

Change-Id: I726ca51c562e62d6e26080fd2c9c310cddf105b3
2020-07-30 18:07:19 +00:00
TreeHugger Robot
644d7f5b30 Merge "Change battery saver text." 2020-07-30 17:49:42 +00:00
TreeHugger Robot
0d82f65875 [automerger skipped] Merge "Allows to launch only authenticator owned activities" into pi-dev am: d3ab16f1e2 -s ours am: b3448be7c7 -s ours am: 2076a10386 -s ours am: c5cc1c5939 -s ours am: 9a4e24e12e -s ours am: d6f6c8da11 -s ours
am skip reason: Change-Id I5ce1a0b3838db7b3fbe48c6ea23d5f093d625cdb with SHA-1 818fef48f3 is in history

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

Change-Id: Ia5a4353c5437338f539c61c2341bcdff3359dcbb
2020-07-30 17:48:26 +00:00
TreeHugger Robot
d6f6c8da11 [automerger skipped] Merge "Allows to launch only authenticator owned activities" into pi-dev am: d3ab16f1e2 -s ours am: b3448be7c7 -s ours am: 2076a10386 -s ours am: c5cc1c5939 -s ours am: 9a4e24e12e -s ours
am skip reason: Change-Id I5ce1a0b3838db7b3fbe48c6ea23d5f093d625cdb with SHA-1 818fef48f3 is in history

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

Change-Id: Ia57744d17a4c1fa1cdf092ce5e1777acc772b922
2020-07-30 17:30:02 +00:00
TreeHugger Robot
9a4e24e12e [automerger skipped] Merge "Allows to launch only authenticator owned activities" into pi-dev am: d3ab16f1e2 -s ours am: b3448be7c7 -s ours am: 2076a10386 -s ours am: c5cc1c5939 -s ours
am skip reason: Change-Id I5ce1a0b3838db7b3fbe48c6ea23d5f093d625cdb with SHA-1 818fef48f3 is in history

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

Change-Id: Icfb4a5ba3aa6c8086788d166ded8e871c5c8efaf
2020-07-30 17:12:01 +00:00
TreeHugger Robot
c5cc1c5939 [automerger skipped] Merge "Allows to launch only authenticator owned activities" into pi-dev am: d3ab16f1e2 -s ours am: b3448be7c7 -s ours am: 2076a10386 -s ours
am skip reason: Change-Id I5ce1a0b3838db7b3fbe48c6ea23d5f093d625cdb with SHA-1 818fef48f3 is in history

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

Change-Id: Ic782d5e5a5e1943394e735b6e8ca39a3436e9a88
2020-07-30 16:52:18 +00:00
Kweku Adams
8e408638c9 Change battery saver text.
Make it a little clearer that the device has to charge above a certain
level before BS will turn off, instead of just *being* above a certain
level.

Bug: 158293108
Test: N/A
Change-Id: I532d1fee8f637d95335c251e59d45a5b7860b412
2020-07-30 09:41:41 -07:00
TreeHugger Robot
2076a10386 [automerger skipped] Merge "Allows to launch only authenticator owned activities" into pi-dev am: d3ab16f1e2 -s ours am: b3448be7c7 -s ours
am skip reason: Change-Id I5ce1a0b3838db7b3fbe48c6ea23d5f093d625cdb with SHA-1 818fef48f3 is in history

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

Change-Id: I1cfca1524b3a01f509de2d39a28f1139ded1c5dc
2020-07-30 16:31:55 +00:00
TreeHugger Robot
b3448be7c7 [automerger skipped] Merge "Allows to launch only authenticator owned activities" into pi-dev am: d3ab16f1e2 -s ours
am skip reason: Change-Id I5ce1a0b3838db7b3fbe48c6ea23d5f093d625cdb with SHA-1 818fef48f3 is in history

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

Change-Id: I617235e4c0ed84c85737980bbc77af18fbf3105a
2020-07-30 16:13:58 +00:00
TreeHugger Robot
d3ab16f1e2 Merge "Allows to launch only authenticator owned activities" into pi-dev 2020-07-30 15:53:33 +00:00
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
23dd1699e2 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: I394df7a8da5c74ae0937d04e60e1a7acc9c62791
2020-07-29 23:26:26 +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