Yi-Ling Chuang
d44a2fe211
Use the plural format for "See all COUNT apps"
...
Although there will never be only one app on the device, we still have
to use the plural format for the strings.
Fixes: 146513299
Test: rebuild and see the string in Apps&Notifications page.
Change-Id: I326be50cfddb605584390ebba57dbd06c0ac29b0
2020-06-04 17:14:17 +08:00
TreeHugger Robot
0a46e21d5c
Merge "Hide "Open by default" entirely for browser apps" into rvc-dev am: f420d0f310
am: ff187711f7
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11708192
Change-Id: I7db070d73d8d4638d46728b6d3ff8e3e4e87fdbf
2020-06-04 08:30:21 +00:00
TreeHugger Robot
475eb8a610
Merge "Hide "Open by default" entirely for browser apps" into rvc-dev am: f420d0f310
am: 5694046ad0
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11708192
Change-Id: Ie4399e8fd6760235532f1f4657f34a9b350c9bb3
2020-06-04 08:29:33 +00:00
TreeHugger Robot
ff187711f7
Merge "Hide "Open by default" entirely for browser apps" into rvc-dev am: f420d0f310
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11708192
Change-Id: I51ec29556af58a47020353bb05cd805014130ed3
2020-06-04 08:16:07 +00:00
TreeHugger Robot
5694046ad0
Merge "Hide "Open by default" entirely for browser apps" into rvc-dev am: f420d0f310
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11708192
Change-Id: Ib3ecd01a559b0b51915a5aacddeae78d2a5e03d9
2020-06-04 08:15:41 +00:00
TreeHugger Robot
f420d0f310
Merge "Hide "Open by default" entirely for browser apps" into rvc-dev
2020-06-04 08:12:11 +00:00
youtengliang
c7cc312e0a
Settings performance testing
...
1. Add percentile tags.
2. Fill 0 to avg, max, min and percnetiles when we detected result array
not equals to TEST_TIME.
3. Write error message to log when above situation occurred.
Test: atest SettingsPerfTests:LaunchSettingsTest
Change-Id: I2fe72a9289d8d2c6cccd6ae52156df3b31934516
2020-06-04 14:49:07 +08:00
Jakub Pawlowski
c48d63752a
Prevent overlay drawing on top of Bluetooth discovery request dialog
...
Bug: 155650356
Change-Id: I9cee6e5bb8cef77aa385d664fe0738db1496ef20
2020-06-04 06:45:16 +00:00
Tim Peng
5a9e58372a
“Bluetooth Audio Codec” is not getting listed while searching for it using “keywords” from settings search tab
...
-Implement PreferenceControllerMixin to decide nonIndexableKeys list according to isAvailable() status
Bug: 156337281
Test: make -j50 RunSettingsRoboTests
Change-Id: I8787acfd50ac351499781d016a3c806a1a6b4f9f
2020-06-04 14:25:31 +08:00
TreeHugger Robot
b65929d5e1
Merge "Revert "Stop usb tethering when user cancel it"" into rvc-dev am: 74755ac915
am: 85a4217776
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11708185
Change-Id: Ib4999548d747e284ccc0844ad4a117cbb402f92f
2020-06-04 04:48:49 +00:00
TreeHugger Robot
270646dbe1
Merge "Revert "Stop usb tethering when user cancel it"" into rvc-dev am: 74755ac915
am: d3d9b3d462
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11708185
Change-Id: I7abcc9e2109bf66e00b14bd8d72457622e392643
2020-06-04 04:48:36 +00:00
TreeHugger Robot
85a4217776
Merge "Revert "Stop usb tethering when user cancel it"" into rvc-dev am: 74755ac915
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11708185
Change-Id: I5d84c6b9d0b143bdce1fad1a2cc248c5f13f986d
2020-06-04 04:38:58 +00:00
TreeHugger Robot
d3d9b3d462
Merge "Revert "Stop usb tethering when user cancel it"" into rvc-dev am: 74755ac915
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11708185
Change-Id: I4c84d1e4c7f16fd85d8c8af15cd0e92e62dd6439
2020-06-04 04:38:53 +00:00
TreeHugger Robot
74755ac915
Merge "Revert "Stop usb tethering when user cancel it"" into rvc-dev
2020-06-04 04:24:55 +00:00
Will Brockman
a52b40c170
Merge "Statsd UiEvent logging for notification history." into rvc-dev am: 5c1b9c357d
am: 5d859ea300
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11694447
Change-Id: I0f9c8ac84872b7e88c860e3033b1aac81d7a127e
2020-06-03 18:01:01 +00:00
Will Brockman
63bb9a404f
Merge "Statsd UiEvent logging for notification history." into rvc-dev am: 5c1b9c357d
am: 815dac6ce0
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11694447
Change-Id: I413de4bd9af640533e9be5e57af1ff00af2237b8
2020-06-03 18:00:11 +00:00
Will Brockman
815dac6ce0
Merge "Statsd UiEvent logging for notification history." into rvc-dev am: 5c1b9c357d
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11694447
Change-Id: I6ad5bfd54a1a0d52f6207c103adc5808f60365f8
2020-06-03 17:58:37 +00:00
Will Brockman
5d859ea300
Merge "Statsd UiEvent logging for notification history." into rvc-dev am: 5c1b9c357d
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11694447
Change-Id: I93a6ace5ceab0cf0b0794c8a241e99d301f07cb1
2020-06-03 17:58:02 +00:00
Will Brockman
5c1b9c357d
Merge "Statsd UiEvent logging for notification history." into rvc-dev
2020-06-03 17:55:47 +00:00
Xin Li
729c213fb7
Merge QQ3A.200605.002 into master
...
Bug: 158095402
Merged-In: I614914b738e3af198fe21b881d2e475e2e8eda41
Change-Id: Idd585020a1fed163866339c09d614dca0ca6e55f
2020-06-03 10:45:09 -07:00
TreeHugger Robot
9f9631b7ce
Merge "Add cross profile apps entry in the privacy screen" into rvc-dev am: 4bb32b6c58
am: 455227793c
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11710365
Change-Id: Idbda613b47fd4ba3e81e45ddb0fc50a77630e78d
2020-06-03 17:37:09 +00:00
TreeHugger Robot
cc0f307449
Merge "Add cross profile apps entry in the privacy screen" into rvc-dev am: 4bb32b6c58
am: 221f9b4c11
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11710365
Change-Id: I541a0150eff40fb07ef8263e8c510f869a9306cb
2020-06-03 17:36:41 +00:00
TreeHugger Robot
455227793c
Merge "Add cross profile apps entry in the privacy screen" into rvc-dev am: 4bb32b6c58
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11710365
Change-Id: Iae49b6d19752166dd0e1c2ba478625bc40b7aa1f
2020-06-03 17:23:14 +00:00
TreeHugger Robot
221f9b4c11
Merge "Add cross profile apps entry in the privacy screen" into rvc-dev am: 4bb32b6c58
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11710365
Change-Id: Ic2e1d889afacc4948360d04cef90188c600fd9c1
2020-06-03 17:23:08 +00:00
TreeHugger Robot
4bb32b6c58
Merge "Add cross profile apps entry in the privacy screen" into rvc-dev
2020-06-03 17:11:45 +00:00
Automerger Merge Worker
a1ce22e1e0
Merge "[automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: 82b99f14a2
-s ours am: 83d07425f4
-s ours" into rvc-d1-dev-plus-aosp
2020-06-03 14:58:31 +00:00
TreeHugger Robot
014b1dc5c0
[automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: 82b99f14a2
-s ours am: 83d07425f4
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11715902
Change-Id: Ia8301abffa4aa6c932187d2b99859d1afc8548d5
2020-06-03 14:58:27 +00:00
TreeHugger Robot
6fa00750af
[automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-d1-dev am: d1620abcfb
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11713510
Change-Id: Idcc36cc463d959e850ec09e790799750042fa988
2020-06-03 14:58:23 +00:00
TreeHugger Robot
14d5d07f76
[automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: 82b99f14a2
-s ours am: b57c537dde
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11715902
Change-Id: I422f46004a638318ead120466b91150a11fde0e1
2020-06-03 14:58:17 +00:00
TreeHugger Robot
36da31b9e4
[automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-d1-dev am: ba824d0593
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11716969
Change-Id: I6ab0716d3d9008326846d8afdbcc1365553a6040
2020-06-03 14:57:57 +00:00
TreeHugger Robot
d1620abcfb
Merge "Import translations. DO NOT MERGE" into rvc-d1-dev
2020-06-03 14:54:04 +00:00
Kholoud Mohamed
04b2ab2065
Add cross profile apps entry in the privacy screen
...
Test: manual testing
Bug: 146318770
Change-Id: Id30a2f4cf40cc5c83e4d4d2544ac6696366fc44a
2020-06-03 15:46:35 +01:00
TreeHugger Robot
83d07425f4
[automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: 82b99f14a2
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11715902
Change-Id: I47c198c73d09f9a46da6fa360a467e5cd65d3a90
2020-06-03 14:44:59 +00:00
TreeHugger Robot
b57c537dde
[automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: 82b99f14a2
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11715902
Change-Id: Icbfe834b63424afd43db3251c03268484799243f
2020-06-03 14:44:21 +00:00
TreeHugger Robot
ba824d0593
Merge "Import translations. DO NOT MERGE" into rvc-d1-dev
2020-06-03 14:43:44 +00:00
TreeHugger Robot
8a25126839
[automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: 879fba597f
-s ours am: ffaf35fed3
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11713511
Change-Id: I4833a399c940c6bb961f5ff6011f07b3840b5c34
2020-06-03 14:39:52 +00:00
TreeHugger Robot
28887ff65a
[automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: 879fba597f
-s ours am: 3998e37c08
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11713511
Change-Id: Id513baadb02e0a734800a8d3c19cbaab90d8771b
2020-06-03 14:39:20 +00:00
TreeHugger Robot
82b99f14a2
Merge "Import translations. DO NOT MERGE" into rvc-dev
2020-06-03 14:34:25 +00:00
TreeHugger Robot
ffaf35fed3
[automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: 879fba597f
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11713511
Change-Id: Iebea25bf71d692e404fdb3358d3fd4b76eafd58d
2020-06-03 14:17:32 +00:00
TreeHugger Robot
3998e37c08
[automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: 879fba597f
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11713511
Change-Id: I0f23e3a5bef0c7f719522c22eb2720380d64635d
2020-06-03 14:17:18 +00:00
TreeHugger Robot
879fba597f
Merge "Import translations. DO NOT MERGE" into rvc-dev
2020-06-03 14:07:12 +00:00
Automerger Merge Worker
dca875c0fb
Merge "Merge "Add entry point for conversation settings" into rvc-dev am: 613e3c4065
am: 5a195b89de" into rvc-d1-dev-plus-aosp
2020-06-03 11:49:57 +00:00
Julia Reynolds
3e9c05f1d6
Merge "Add entry point for conversation settings" into rvc-dev am: 613e3c4065
am: 5a195b89de
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11707398
Change-Id: I78e1e6007ce102dbb168fcf36a6e3a47ac718198
2020-06-03 11:49:46 +00:00
Julia Reynolds
9d22d9582b
Merge "Add entry point for conversation settings" into rvc-dev am: 613e3c4065
am: 62814ac56f
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11707398
Change-Id: I24ef690311d847645cbc4bb1dc7dae9210474301
2020-06-03 11:49:39 +00:00
Julia Reynolds
5a195b89de
Merge "Add entry point for conversation settings" into rvc-dev am: 613e3c4065
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11707398
Change-Id: I9ba9ec35fe40ec883c08622b075b2d56040fd1b7
2020-06-03 11:34:32 +00:00
Julia Reynolds
62814ac56f
Merge "Add entry point for conversation settings" into rvc-dev am: 613e3c4065
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11707398
Change-Id: I5776854796a31906783291df89ffea2559f6d4d3
2020-06-03 11:33:47 +00:00
Julia Reynolds
613e3c4065
Merge "Add entry point for conversation settings" into rvc-dev
2020-06-03 11:17:42 +00:00
Jakub Pawlowski
5037d1dafa
Prevent overlay drawing on top of Bluetooth pairing dialog am: 88815d1456
am: 103cc7cf29
am: 3185f80f23
am: 2a1b189cde
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11484060
Change-Id: I7a5539e7308d97b1be351d92434a4bdd92e9370a
2020-06-03 10:48:34 +00:00
Jakub Pawlowski
54a391f3c5
Prevent overlay drawing on top of Bluetooth pairing dialog am: 88815d1456
am: 103cc7cf29
am: 3185f80f23
am: 330bf35b22
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11484060
Change-Id: I219afbcc81e3e3748fccffa6dbd1d741d38f55fd
2020-06-03 10:48:11 +00:00
Jakub Pawlowski
330bf35b22
Prevent overlay drawing on top of Bluetooth pairing dialog am: 88815d1456
am: 103cc7cf29
am: 3185f80f23
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11484060
Change-Id: I613704afab8dc97bfc3d620120d82a6e76c893e9
2020-06-03 10:33:36 +00:00