Commit Graph

43233 Commits

Author SHA1 Message Date
Ajay Panicker
62051b7afc Merge "Bluetooth: Enable AVDTP Delay reports by default." am: f8ad32823c -s ours am: 76e5237e92
am: 80f1e63b9d  -s ours

Change-Id: I55c89767bc7bb3bfc07cf3d76a3256d840f5d69b
2018-03-10 09:57:46 +00:00
Ajay Panicker
80f1e63b9d Merge "Bluetooth: Enable AVDTP Delay reports by default." am: f8ad32823c -s ours
am: 76e5237e92

Change-Id: I100d661935afe40657e6de516120d0a4eb651ea2
2018-03-10 00:59:27 +00:00
Doris Ling
e6811b4501 Bypass failing test for SuggestionAdapterTest. am: d95e1752f6
am: 98706c3185

Change-Id: I1cb221fe238d997dcd52391d0e6e755c85bce48e
2018-03-10 00:11:20 +00:00
Ajay Panicker
76e5237e92 Merge "Bluetooth: Enable AVDTP Delay reports by default."
am: f8ad32823c  -s ours

Change-Id: If7d482f107e0ce4924748c8b08334cfbbef491e8
2018-03-10 00:08:20 +00:00
Doris Ling
98706c3185 Bypass failing test for SuggestionAdapterTest.
am: d95e1752f6

Change-Id: I896169097d8f41ce89b30e1b7d6389e61b861893
2018-03-09 23:32:29 +00:00
Lei Yu
e5525fa1b5 Merge "Change anomalyType to ArraySet in AppInfo" into pi-dev am: 7208905cb9
am: 6079093af3

Change-Id: Ic8d589093eb17c6f19ed84e20a33f3649a5cfa9c
2018-03-09 23:27:37 +00:00
Lei Yu
6079093af3 Merge "Change anomalyType to ArraySet in AppInfo" into pi-dev
am: 7208905cb9

Change-Id: I45adf9ac403dc1d9ad4522184ba6eab0a7420c47
2018-03-09 22:35:55 +00:00
Doris Ling
d95e1752f6 Bypass failing test for SuggestionAdapterTest.
- other changes might have caused this test to start failing. Need more
time to investigate or properly fix the tests. Since they are blocking
presubmit right now, will ignore the tests first and provide fix
later.

Bug: 74444815
Test: make RunSettingsRoboTests
Change-Id: I985abe74c64a562fb117b91056a23895181897bd
2018-03-09 14:21:05 -08:00
Treehugger Robot
f8ad32823c Merge "Bluetooth: Enable AVDTP Delay reports by default." 2018-03-09 20:56:50 +00:00
Ajay Panicker
a8cf0b9371 Bluetooth: Enable AVDTP Delay reports by default.
Bug: 32755225
Test: See that delay reports are enabled when connecting to device
Change-Id: Icba9be6fc8ba455d37df39d283e36129f6acb536
2018-03-09 17:59:26 +00:00
Lei Yu
7208905cb9 Merge "Change anomalyType to ArraySet in AppInfo" into pi-dev 2018-03-09 17:38:53 +00:00
Julia Reynolds
7ba6604850 Merge "Show new visual effects options in dnd settings" into pi-dev am: e056b2ebc9
am: 45e8898f7e

Change-Id: I380430deac85016196bfcc4f9f469c9b49c3fef8
2018-03-09 17:04:54 +00:00
Julia Reynolds
45e8898f7e Merge "Show new visual effects options in dnd settings" into pi-dev
am: e056b2ebc9

Change-Id: I0d3721c70f30e41099702642bd279924c89f35dc
2018-03-09 15:20:20 +00:00
Julia Reynolds
e056b2ebc9 Merge "Show new visual effects options in dnd settings" into pi-dev 2018-03-09 13:38:06 +00:00
Makoto Onuki
39ba053925 Merge "Get auto-battery saver threshold max from global setting" into pi-dev am: d29926c5a1
am: 5042f95d16

Change-Id: Ib7e83a9a483840edfd8376381798a7825b345ea4
2018-03-09 09:18:59 +00:00
Makoto Onuki
5042f95d16 Merge "Get auto-battery saver threshold max from global setting" into pi-dev
am: d29926c5a1

Change-Id: I6e1636fc05696d410eb82b851c6b9072a9520b46
2018-03-09 06:46:27 +00:00
TreeHugger Robot
d29926c5a1 Merge "Get auto-battery saver threshold max from global setting" into pi-dev 2018-03-09 03:51:41 +00:00
TreeHugger Robot
9e74de7efc Merge "Declare official platform slice" 2018-03-09 03:41:51 +00:00
Julia Reynolds
d640a97ce8 Show new visual effects options in dnd settings
Bug: 74075050
Test: make -j20 RunSettingsRoboTests
Change-Id: Ia629007d1c80b657aaf756d0f6d2edfd89a7f6b4
2018-03-08 16:42:35 -05:00
Matthew Fritze
fd185baca5 Declare official platform slice
Create the notion of an official platform slice.
This includes:
- Adding a second authority to the provider
- tagging slices in xml with a platform slice flag
- Including authority in the getUri method

Bug:73359139
Test: robotests
Change-Id: I581ee6dfcdf935f452a15e89e5d055e375ff1877
2018-03-08 13:32:52 -08:00
TreeHugger Robot
47d646e4ff Merge "Introduce boolean flag to show/hide Reset Options." 2018-03-08 21:04:09 +00:00
Antony Sargent
497376ceb6 [automerger skipped] Import translations. DO NOT MERGE skipped: 0a7ae11c49 skipped: d923718d10 skipped: 59ab695e25 skipped: eb76bf9861 skipped: 5755ec9bff skipped: ddd9cb6be9 skipped: 6827142bd1 skipped: ca801490c1 skipped: fb6a179745 am: 5943908af4 -s ours am: f224aa6af9 -s ours am: 086df75f9a -s ours am: 9a9b8cad39 -s ours
am: 024d1dca46  -s ours

Change-Id: I85f2c961c3dc015b277fcf6f880dd1b5e67dec8e
2018-03-08 20:48:47 +00:00
Lei Yu
7caecd36f7 Change anomalyType to ArraySet in AppInfo
After this cl, in AppInfo we could store mutilple anomalyTypes, so
AppInfo list will only contain one instance for each uid(however
still keep all the anomaly data)

In this way we could remove the duplicate items in app dialog.

Bug: 74335346
Test: RunSettingsRoboTests
Change-Id: I2ef7c218df2a956eea66aa6bdf03f5ddd19948e3
2018-03-08 12:40:18 -08:00
Antony Sargent
024d1dca46 [automerger skipped] Import translations. DO NOT MERGE skipped: 0a7ae11c49 skipped: d923718d10 skipped: 59ab695e25 skipped: eb76bf9861 skipped: 5755ec9bff skipped: ddd9cb6be9 skipped: 6827142bd1 skipped: ca801490c1 skipped: fb6a179745 am: 5943908af4 -s ours am: f224aa6af9 -s ours am: 086df75f9a -s ours
am: 9a9b8cad39  -s ours

Change-Id: I3dfd1cf3e9bb94825aaec93c881b327cc65e1149
2018-03-08 20:22:22 +00:00
Maurice Lam
be88b303ac Hide options button when user starts entering pattern am: 4723abfe26
am: a9a48d83d4

Change-Id: I453e0f96a7081ba295e567983e825d4073bcfa24
2018-03-08 20:19:37 +00:00
Brad Ebinger
0ca94f81bc Merge "Donot disable Wi-Fi Calling when getting "registration error" intent." am: 4ec0e8e865 am: 9b282e231f
am: be581fd7ef

Change-Id: Ic22820dfa04d9ae565b83dde67fb9909ce38b6f6
2018-03-08 20:09:37 +00:00
Antony Sargent
9a9b8cad39 [automerger skipped] Import translations. DO NOT MERGE skipped: 0a7ae11c49 skipped: d923718d10 skipped: 59ab695e25 skipped: eb76bf9861 skipped: 5755ec9bff skipped: ddd9cb6be9 skipped: 6827142bd1 skipped: ca801490c1 skipped: fb6a179745 am: 5943908af4 -s ours am: f224aa6af9 -s ours
am: 086df75f9a  -s ours

Change-Id: I5d48e96b63dc79dbe89adde6eb83ceaad288efe7
2018-03-08 19:59:36 +00:00
Antony Sargent
086df75f9a [automerger skipped] Import translations. DO NOT MERGE skipped: 0a7ae11c49 skipped: d923718d10 skipped: 59ab695e25 skipped: eb76bf9861 skipped: 5755ec9bff skipped: ddd9cb6be9 skipped: 6827142bd1 skipped: ca801490c1 skipped: fb6a179745 am: 5943908af4 -s ours
am: f224aa6af9  -s ours

Change-Id: I0441b99e9f7b945d41303fdc8d0e412426a081e3
2018-03-08 19:48:36 +00:00
Maurice Lam
a9a48d83d4 Hide options button when user starts entering pattern
am: 4723abfe26

Change-Id: I3223a1a40b08c0dcef90ec117ac08b1888e6174e
2018-03-08 19:43:21 +00:00
Antony Sargent
f224aa6af9 [automerger skipped] Import translations. DO NOT MERGE skipped: 0a7ae11c49 skipped: d923718d10 skipped: 59ab695e25 skipped: eb76bf9861 skipped: 5755ec9bff skipped: ddd9cb6be9 skipped: 6827142bd1 skipped: ca801490c1 skipped: fb6a179745
am: 5943908af4  -s ours

Change-Id: I26672d57ced63374a8b03ae3e8e0647c6a4bd150
2018-03-08 19:42:30 +00:00
Victor Chang
bb61d3696c Merge "Show time zone standard name in FixedOffsetPreferenceController" into pi-dev am: 4f5a113d8f
am: 894f5521ab

Change-Id: I1ccf2442418b0e655f7969b803a9bc09de227b44
2018-03-08 19:37:49 +00:00
Brad Ebinger
be581fd7ef Merge "Donot disable Wi-Fi Calling when getting "registration error" intent." am: 4ec0e8e865
am: 9b282e231f

Change-Id: I95a108f4e6090b61e4584a64bed58c024e120fd0
2018-03-08 19:18:08 +00:00
Brad Ebinger
9b282e231f Merge "Donot disable Wi-Fi Calling when getting "registration error" intent."
am: 4ec0e8e865

Change-Id: I04c42bb5786b37f6d9aa124a663eef6d69b930a2
2018-03-08 19:13:20 +00:00
Maurice Lam
4723abfe26 Hide options button when user starts entering pattern
Test: cd tests/robotests && mma
Bug: 72409245
Change-Id: I82ab8822f13bc8bf8b74bc67f6d4d3a9fd2cc0c8
(cherry picked from commit ad554244b6)
2018-03-08 18:59:29 +00:00
Victor Chang
894f5521ab Merge "Show time zone standard name in FixedOffsetPreferenceController" into pi-dev
am: 4f5a113d8f

Change-Id: Icadc36b185da4f26c81985895569b18d9234f639
2018-03-08 18:58:32 +00:00
TreeHugger Robot
4f5a113d8f Merge "Show time zone standard name in FixedOffsetPreferenceController" into pi-dev 2018-03-08 18:45:30 +00:00
Ben Lin
bd180a62ec Introduce boolean flag to show/hide Reset Options.
This adds one new flag:
config_show_reset_dashboard

Which when set to false, will hide Reset Options from System settings.

Bug: 74127210
Test: Updated robotests
Change-Id: I42b14a0abde575f5c4e51985125e8543716d206a
2018-03-08 10:44:48 -08:00
Brad Ebinger
4ec0e8e865 Merge "Donot disable Wi-Fi Calling when getting "registration error" intent." 2018-03-08 18:32:56 +00:00
Makoto Onuki
113e3d5cc0 Get auto-battery saver threshold max from global setting
Bug: 74351418
Test: Manual test with "settings put global low_power_trigger_level_max 100"
Test: m ROBOTEST_FILTER=AutoBatterySeekBarPreferenceControllerTest RunSettingsRoboTests
Change-Id: Ice25835f36e7855e3ed665cd780d7eb1a26acd27
2018-03-08 08:19:37 -08:00
Victor Chang
d251a10cd6 Show time zone standard name in FixedOffsetPreferenceController
- Among all fixed offset time zone, only Etc/UTC has a time zone
standard name. The name should be shown in both picker and preference's
secondary text (summary).

Bug: 74338688
Test: m RunSettingsRoboTests ROBOTEST_FILTER=com.android.settings.datetime.timezone
Change-Id: I10c140f6054ab9acf6e0fb44528adef8b28fa23c
2018-03-08 15:13:15 +00:00
Doris Ling
14abf8d05a Merge "Fix layout height for suggestion tile." into pi-dev am: ec9606addb
am: 7eef8156ea

Change-Id: Ic4ba2e6fe757648304c90e22eb59b1a4535ef23e
2018-03-08 05:44:39 +00:00
Doris Ling
7eef8156ea Merge "Fix layout height for suggestion tile." into pi-dev
am: ec9606addb

Change-Id: I518af49e44a386ef6fcc7381f11ad0b635ba3ea7
2018-03-08 05:40:11 +00:00
TreeHugger Robot
ec9606addb Merge "Fix layout height for suggestion tile." into pi-dev 2018-03-08 05:32:25 +00:00
Bill Yi
39b2ef235d Merge "Import translations. DO NOT MERGE" into pi-dev am: 7c2713cb2d -s ours
am: 663ad81f07  -s ours

Change-Id: I6e1a89edd4db691445bd4cfc3bf6925c399d70a7
2018-03-08 05:28:16 +00:00
Bill Yi
663ad81f07 Merge "Import translations. DO NOT MERGE" into pi-dev
am: 7c2713cb2d  -s ours

Change-Id: I8eabcb331f4eb0809c644e724fe5a6a07802210b
2018-03-08 05:22:18 +00:00
TreeHugger Robot
7c2713cb2d Merge "Import translations. DO NOT MERGE" into pi-dev 2018-03-08 05:12:11 +00:00
TreeHugger Robot
5cb1e79157 Merge "[Settings] Request focus in Add network dialog" 2018-03-08 04:12:01 +00:00
jackqdyulei
0c2cd535c1 Merge "Update fuelguage to use uid in AppInfo" into pi-dev am: 6949175423
am: 6217b5cd7e

Change-Id: I9a045d24a8321a5c8af0699b148db964ab700e7c
2018-03-08 03:36:19 +00:00
jackqdyulei
6217b5cd7e Merge "Update fuelguage to use uid in AppInfo" into pi-dev
am: 6949175423

Change-Id: I31a6b9eeaba39e3678945796b729ddede797a28e
2018-03-08 03:32:00 +00:00
jackqdyulei
4ef021ee90 Merge "Make "Add device" as restricted preference." into pi-dev am: e03bb88c09
am: b65ae02db2

Change-Id: I256f92fc14b5c630bfbde737b1c8bf641de36fd3
2018-03-08 03:23:20 +00:00