Commit Graph

74229 Commits

Author SHA1 Message Date
TreeHugger Robot
08d93061f5 [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: f3f682446d -s ours
am skip reason: Change-Id I5ce1a0b3838db7b3fbe48c6ea23d5f093d625cdb with SHA-1 e2eab4e258 is in history

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

Change-Id: I726bb91508cef24f5ffc0ba598eb541c6a74aefc
2020-07-30 17:30:15 +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
a23d9273aa [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: Ia15c8c835df5ae2934b21b9a7ceff856de349cef
2020-07-30 17:28:47 +00:00
TreeHugger Robot
f3f682446d [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: Id9d192f0b0112a75a352bfd0a910ee1cbb88be27
2020-07-30 17:12:15 +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
changbetty
7eb7f6c795 Add setPackage for PendingIntent in SimSelectNotification
Bug: 153556754
Test: make RunSettingsRoboTests
ROBOTEST_FILTER=SimSelectNotificationTest

Change-Id: I919bbc92df24b5557b3d95c342b330075153a9cd
2020-07-30 23:29:51 +08:00
Matthew Mintz
827665a4a4 Merge "Make WallpaperPreferenceController available when only style picker present." 2020-07-30 05:32:55 +00:00
Edgar Wang
8829e515ca 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: Ibe64a68d7bddf84780dfac33555c097ff55c97a8
2020-07-30 12:54:27 +08:00
Edgar Wang
8a3e7d77a0 Merge "Update language to comply with Android's inclusive language guidance" 2020-07-30 02:17:48 +00:00
Alex Mang
04a75fb9a7 Updating feedback setting to be global
Test: atest AssistantFeedbackPreferenceControllerTest
Change-Id: I9dc79a8418a00db319f7f289b20724d00bd50b9e
2020-07-29 18:05:54 -07: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
Julia Reynolds
2d91b744cf Add 'all apps' to notification filters
Test: atest
Fixes: 141138853
Change-Id: If77e8186ddbfc754e7bb1a3d8541840f09db38d9
2020-07-29 11:25:15 -04: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
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
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
Arc Wang
8d5c8c2611 [Wi-Fi] Check if domain field is not empty when users choose a ca certificate
Domain is required for client to validate server's certificate.
This change disable Save button for a new Wi-Fi network of a
specified CA certificate but empty domain.

Bug: 161378819
Test: make RunSettingsRoboTests ROBOTEST_FILTER=WifiConfigControllerTest
      make RunSettingsRoboTests ROBOTEST_FILTER=WifiConfigController2Test
      manual
      1. Install a certificate.
      2. Add a new Wi-Fi network of EAP method PEAP
      3. Set CA certificate to the certificate installed at 1.
      4. Save button should be disabled.
      5. Input something in domain field.
      6. Save button should be enabled.
Change-Id: I65c8b29ec7a03b21403ddbfc087ce48c2a4a69e4
2020-07-29 15:13:28 +08: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
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
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