Corina Grigoras
770cbdb00a
Merge "Rename READ_MEDIA_IMAGE to READ_MEDIA_IMAGES" into tm-dev am: f2c1c97edc
am: 3b4b590e52
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17149237
Change-Id: I09b188444279f45bc8e640882a25f980f974ef20
2022-03-10 22:35:32 +00:00
Corina Grigoras
5a1f4f2de3
Merge "Rename READ_MEDIA_IMAGE to READ_MEDIA_IMAGES" into tm-dev am: f2c1c97edc
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17149237
Change-Id: I89ebb3f7b4fa8f59c8e3133004b826c35d339c6e
2022-03-10 22:03:21 +00:00
Corina Grigoras
3b4b590e52
Merge "Rename READ_MEDIA_IMAGE to READ_MEDIA_IMAGES" into tm-dev am: f2c1c97edc
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17149237
Change-Id: I702d7c0d1066ae822bc6a7109a5de1dd9bdc7078
2022-03-10 22:03:04 +00:00
TreeHugger Robot
6ac83540c5
Merge "Fix WhenToDreamPreferenceControllerTest" into tm-dev am: fdd48399d9
am: 53e410b4e9
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17158224
Change-Id: I7cdbb646a1d9479c422e5bf0f1a361b1a4bec5b0
2022-03-10 21:36:41 +00:00
Corina Grigoras
f2c1c97edc
Merge "Rename READ_MEDIA_IMAGE to READ_MEDIA_IMAGES" into tm-dev
2022-03-10 21:36:38 +00:00
TreeHugger Robot
6fe18b04b0
Merge "Fix WhenToDreamPreferenceControllerTest" into tm-dev am: fdd48399d9
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17158224
Change-Id: I57f6fb3d333c333f8ce1b031222f976d5b9593c2
2022-03-10 21:23:25 +00:00
TreeHugger Robot
53e410b4e9
Merge "Fix WhenToDreamPreferenceControllerTest" into tm-dev am: fdd48399d9
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17158224
Change-Id: I613c7a2508544a7aa7e5f5783e4a6bf70a439a25
2022-03-10 21:12:30 +00:00
TreeHugger Robot
fdd48399d9
Merge "Fix WhenToDreamPreferenceControllerTest" into tm-dev
2022-03-10 20:54:28 +00:00
TreeHugger Robot
f65a2e1199
Merge "Show lock icon in restricted settings dialog" into tm-dev am: 48eb6726c3
am: 21ffd376fa
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17140467
Change-Id: I04a035bc7cca2d4bc4741847d6f366c7ee97108c
2022-03-10 20:30:14 +00:00
Marie Matheson
21ac5e7d94
Merge "Bug fix - when enrolled, biometrics have ok safety state." into tm-dev am: 0b82bf9df3
am: 8bb49c90cc
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17142588
Change-Id: Ic6c1efe682ed768994f189cc7cbaea99d972de27
2022-03-10 20:28:14 +00:00
Ricky Wai
7e2a295b1b
Merge "Apply restricted settings to notification access." into tm-dev am: 6840252c11
am: e1c3fce993
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17140466
Change-Id: I64be205b79629f5d9e809369469c0734f56160c0
2022-03-10 20:12:04 +00:00
Lucas Silva
b418d4272f
Fix WhenToDreamPreferenceControllerTest
...
The current test uses a mock context, which doesn't support all the
methods being used. Instead, switch to using a real context.
Test: make -j64 RunSettingsRoboTests ROBOTEST_FILTER="com.android.settings.dream.WhenToDreamPreferenceControllerTest"
Bug: 216036457
Change-Id: Ib431d27943a8a732da1ef2dfad2eb1ce7ede36c2
2022-03-10 13:49:47 -05:00
TreeHugger Robot
21ffd376fa
Merge "Show lock icon in restricted settings dialog" into tm-dev am: 48eb6726c3
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17140467
Change-Id: I939ee3e421eaa700261a59f37bb5974c078706dd
2022-03-10 18:10:30 +00:00
Marie Matheson
8bb49c90cc
Merge "Bug fix - when enrolled, biometrics have ok safety state." into tm-dev am: 0b82bf9df3
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17142588
Change-Id: I402bd68845db5aefddffb387181fdadf0707798b
2022-03-10 18:01:25 +00:00
Ricky Wai
e1c3fce993
Merge "Apply restricted settings to notification access." into tm-dev am: 6840252c11
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17140466
Change-Id: I068649b895f6c632919d6b299c51f4b96dc24909
2022-03-10 17:56:46 +00:00
TreeHugger Robot
48eb6726c3
Merge "Show lock icon in restricted settings dialog" into tm-dev
2022-03-10 16:38:09 +00:00
Marie Matheson
0b82bf9df3
Merge "Bug fix - when enrolled, biometrics have ok safety state." into tm-dev
2022-03-10 13:40:54 +00:00
Patrick Rohr
3fe8175bcd
Merge "Add ingress rate limit to developer settings"
2022-03-10 13:11:33 +00:00
Tom Hsu
76147437bf
Merge "[Panlingual] Revamp the panlingual UI in Settings."
2022-03-10 13:06:47 +00:00
Les Lee
d6b5a04ca1
Merge "wifi setting: Add psk length check" into tm-dev am: 4801983e1f
am: b55282a2f6
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17130190
Change-Id: I0335b73992c96901a2a7174369baca86199dc2b2
2022-03-10 12:32:07 +00:00
Ricky Wai
6840252c11
Merge "Apply restricted settings to notification access." into tm-dev
2022-03-10 12:04:49 +00:00
Les Lee
5353d3462c
Merge "wifi setting: Add psk length check" into tm-dev am: 4801983e1f
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17130190
Change-Id: Ie5ac9db46431671170110909bbcdf84dac13bebd
2022-03-10 11:59:24 +00:00
Les Lee
b55282a2f6
Merge "wifi setting: Add psk length check" into tm-dev am: 4801983e1f
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17130190
Change-Id: I4532d9a8b28012ac97ac60fdf8d0a21466003e9a
2022-03-10 11:58:27 +00:00
Les Lee
4801983e1f
Merge "wifi setting: Add psk length check" into tm-dev
2022-03-10 11:28:43 +00:00
Patrick Rohr
b0e5e84d49
Add ingress rate limit to developer settings
...
Test: make -j64 RunSettingsRoboTests
ROBOTEST_FILTER="com.android.settings.development.IngressRateLimitPreferenceControllerTest"
Bug: 157552970
Bug: 122993151
Change-Id: I0d0aa40610016c1f9e94596cfe3ed6c9a0614d89
2022-03-10 11:54:31 +01:00
TreeHugger Robot
f7d6c80ea8
Merge "Add highlight menu key for app pages" into tm-dev am: 439bd335a4
am: 2d9363bab4
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17148789
Change-Id: I42643a7b727bf0d3a2db7305bfc480d5ce5929ee
2022-03-10 10:39:04 +00:00
TreeHugger Robot
377d4dfea4
Merge "Add highlight menu key for app pages" into tm-dev am: 439bd335a4
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17148789
Change-Id: I5b3a8d326cbcd08508adbbdddf495117ab534826
2022-03-10 10:15:56 +00:00
TreeHugger Robot
2d9363bab4
Merge "Add highlight menu key for app pages" into tm-dev am: 439bd335a4
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17148789
Change-Id: Iac284cb2054da317c6d713d32b4233a3ccbd17d0
2022-03-10 10:14:55 +00:00
Chaohui Wang
4c11521b3f
Merge "Clean up unused profile_select_tablayout." am: aee21e8cbd
am: dc70876ddb
am: b6799b65c7
am: 8ff1d57150
am: 6a7dc39b69
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2019419
Change-Id: Ieaa12de20b073bc75af12cf2fa68029ca0899f80
2022-03-10 10:04:17 +00:00
TreeHugger Robot
439bd335a4
Merge "Add highlight menu key for app pages" into tm-dev
2022-03-10 09:56:35 +00:00
Chaohui Wang
8178c328b4
Merge "Clean up unused profile_select_tablayout." am: aee21e8cbd
am: dc70876ddb
am: b6799b65c7
am: 8ff1d57150
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2019419
Change-Id: Id1d99192904c19cee1b463f9b23b57d2cc2e86a7
2022-03-10 09:06:23 +00:00
Chaohui Wang
6a7dc39b69
Merge "Clean up unused profile_select_tablayout." am: aee21e8cbd
am: dc70876ddb
am: b6799b65c7
am: 8ff1d57150
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2019419
Change-Id: I60a492fd2962afd2868fe6f1dc74b6d311ae983f
2022-03-10 09:04:38 +00:00
Chaohui Wang
8ff1d57150
Merge "Clean up unused profile_select_tablayout." am: aee21e8cbd
am: dc70876ddb
am: b6799b65c7
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2019419
Change-Id: Icf0a5207f8cbb41b6cfac623b34e12b58fb76b24
2022-03-10 08:43:15 +00:00
Chaohui Wang
b6799b65c7
Merge "Clean up unused profile_select_tablayout." am: aee21e8cbd
am: dc70876ddb
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2019419
Change-Id: Id0eb4d409cb9a434e608cc255056de08e9428050
2022-03-10 08:22:21 +00:00
Chaohui Wang
dc70876ddb
Merge "Clean up unused profile_select_tablayout." am: aee21e8cbd
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2019419
Change-Id: Ibb221e416ecc360fb3460ef00defbf35e8abf567
2022-03-10 07:59:55 +00:00
Jason Chiu
bbb9f20346
Add highlight menu key for app pages
...
Fix: 216402156
Test: manual
Change-Id: I8a79e72e07739aca831a62b8186bdaaa3dc69870
2022-03-10 15:34:55 +08:00
Chaohui Wang
aee21e8cbd
Merge "Clean up unused profile_select_tablayout."
2022-03-10 07:30:04 +00:00
Jay Thomas Sullivan
cd2109a17b
Rename READ_MEDIA_IMAGE to READ_MEDIA_IMAGES
...
This permission was only created very recently, and it is unlikely that
any apps are using it yet.
After its creation, it was decided that it should be renamed.
Bug: 223691971
Test: atest CtsPermissionTestCases CtsPermission3TestCases
Change-Id: If82cee5995a2adc8e1b1fcc88ea7b540e7df0fac
2022-03-09 22:34:52 -08:00
PETER LIANG
ef3b0d2870
Merge "Fix that the theme of "Vision Settings" was inconsistent with "Anything else?"." into tm-dev am: 66a510d2dd
am: c23fa1ebfe
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17137385
Change-Id: Ie81e38624d5c03bfa7d656549d9e735b0dffda33
2022-03-10 06:20:59 +00:00
PETER LIANG
87910b8e70
Merge "Apply the settings lib style into the reset button of "Display size and text"." into tm-dev am: b4e91fa866
am: b4d6e5956d
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17100789
Change-Id: I6f5dcfdc074c7b29fe92de9dea52e10adaf68cfb
2022-03-10 06:20:57 +00:00
PETER LIANG
c23fa1ebfe
Merge "Fix that the theme of "Vision Settings" was inconsistent with "Anything else?"." into tm-dev am: 66a510d2dd
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17137385
Change-Id: Icccabb0ce9a5c90d969b0fb1abd09321ba07c27a
2022-03-10 05:57:49 +00:00
PETER LIANG
b4d6e5956d
Merge "Apply the settings lib style into the reset button of "Display size and text"." into tm-dev am: b4e91fa866
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17100789
Change-Id: I7c722a0ad6c66e541ea087f0e5b100544e6e1d72
2022-03-10 05:57:48 +00:00
PETER LIANG
9ecf3b2b44
Merge "Fix that the theme of "Vision Settings" was inconsistent with "Anything else?"." into tm-dev am: 66a510d2dd
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17137385
Change-Id: Idada6dac443ebf07e64fa387354d0ae7911fc8c1
2022-03-10 05:57:46 +00:00
PETER LIANG
6dfedd2fec
Merge "Apply the settings lib style into the reset button of "Display size and text"." into tm-dev am: b4e91fa866
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17100789
Change-Id: Ic524c38aad4053e72eb1cab65fc99db4146c6c0e
2022-03-10 05:57:44 +00:00
PETER LIANG
66a510d2dd
Merge "Fix that the theme of "Vision Settings" was inconsistent with "Anything else?"." into tm-dev
2022-03-10 05:40:17 +00:00
PETER LIANG
b4e91fa866
Merge "Apply the settings lib style into the reset button of "Display size and text"." into tm-dev
2022-03-10 05:40:17 +00:00
Chaohui Wang
d6814ba19f
Merge "Fix App Compatibility Settings' lifecycle" am: 0ba498b226
am: 7e7924bf35
am: 0f1547cb76
am: c2ca082457
am: 8cb607b188
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2010296
Change-Id: Ifd9eb8c72a8130f8a44a2c1f9daa7371f5f3c603
2022-03-10 05:24:08 +00:00
Chaohui Wang
8cb607b188
Merge "Fix App Compatibility Settings' lifecycle" am: 0ba498b226
am: 7e7924bf35
am: 0f1547cb76
am: c2ca082457
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2010296
Change-Id: I616fb3fa43af7c1c1095c67e4d0c44bc1adc6268
2022-03-10 05:01:49 +00:00
Chaohui Wang
bfa9a0b2a2
Merge "Fix App Compatibility Settings' lifecycle" am: 0ba498b226
am: 7e7924bf35
am: 0f1547cb76
am: c2ca082457
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2010296
Change-Id: Ia32e6b5c62bd05256b2160a96811449113f8c3fb
2022-03-10 05:01:43 +00:00
Chaohui Wang
34261e25a7
Clean up unused profile_select_tablayout.
...
Change-Id: If1f58f13a8cf14bf078bce16c23fed6726ff223a
2022-03-10 04:57:00 +00:00