OSDN Git Service

android-x86/packages-apps-Settings.git
6 years agoMerge "Adding zen duration preference" into pi-dev
Beverly Tai [Mon, 12 Mar 2018 23:29:41 +0000 (23:29 +0000)]
Merge "Adding zen duration preference" into pi-dev
am: e652a039af

Change-Id: Ief1577186f507572471d65d9aa8cbdf8cb7e1d69

6 years agoMerge "Bluetooth: Enable AVDTP Delay reports by default." into pi-dev
Ajay Panicker [Mon, 12 Mar 2018 22:57:27 +0000 (22:57 +0000)]
Merge "Bluetooth: Enable AVDTP Delay reports by default." into pi-dev
am: 5906621ea4

Change-Id: I643cee8c6e35519f41d15939ea80dab056649e37

6 years agoMerge "Fix failing testcases in SettingsAdapterTest." into pi-dev
Doris Ling [Mon, 12 Mar 2018 22:10:49 +0000 (22:10 +0000)]
Merge "Fix failing testcases in SettingsAdapterTest." into pi-dev
am: 425f033782

Change-Id: I86b200c0e3a33fc1e3538a7a25eec8c249469fb0

6 years agoMerge "Adding zen duration preference" into pi-dev
Beverly Tai [Mon, 12 Mar 2018 21:39:18 +0000 (21:39 +0000)]
Merge "Adding zen duration preference" into pi-dev

6 years agoMerge "Fix tests" into pi-dev
Julia Reynolds [Mon, 12 Mar 2018 21:17:21 +0000 (21:17 +0000)]
Merge "Fix tests" into pi-dev
am: f22eb94b18

Change-Id: I42ade3f384469eb817555e9c6b6f7e76d2791870

6 years agoMerge "Bluetooth: Enable AVDTP Delay reports by default." into pi-dev
TreeHugger Robot [Mon, 12 Mar 2018 21:08:59 +0000 (21:08 +0000)]
Merge "Bluetooth: Enable AVDTP Delay reports by default." into pi-dev

6 years agoMerge "Fix failing testcases in SettingsAdapterTest." into pi-dev
TreeHugger Robot [Mon, 12 Mar 2018 19:36:32 +0000 (19:36 +0000)]
Merge "Fix failing testcases in SettingsAdapterTest." into pi-dev

6 years agoMerge "Fix tests" into pi-dev
TreeHugger Robot [Mon, 12 Mar 2018 19:22:22 +0000 (19:22 +0000)]
Merge "Fix tests" into pi-dev

6 years agoMerge "Introduce boolean flag to show/hide Reset Options." into pi-dev
Ben Lin [Mon, 12 Mar 2018 18:53:53 +0000 (18:53 +0000)]
Merge "Introduce boolean flag to show/hide Reset Options." into pi-dev
am: aedf00c4f8

Change-Id: Ie0d8a377c4c138b3bc1dcd1e8bd1bf0761d59d9a

6 years agoMerge "Introduce boolean flags to show/hide Encryption status." into pi-dev
Ben Lin [Mon, 12 Mar 2018 18:45:46 +0000 (18:45 +0000)]
Merge "Introduce boolean flags to show/hide Encryption status." into pi-dev
am: 2d452df643

Change-Id: I027d3de2a7388da8b6ece1d03e9c2c5a0b4ffce9

6 years agoMerge "Introduce boolean flag to show/hide Reset Options." into pi-dev
Ben Lin [Mon, 12 Mar 2018 17:52:47 +0000 (17:52 +0000)]
Merge "Introduce boolean flag to show/hide Reset Options." into pi-dev

6 years agoMerge "Introduce boolean flags to show/hide Encryption status." into pi-dev
Ben Lin [Mon, 12 Mar 2018 17:52:37 +0000 (17:52 +0000)]
Merge "Introduce boolean flags to show/hide Encryption status." into pi-dev

6 years agoAdding zen duration preference
Beverly [Mon, 26 Feb 2018 14:19:41 +0000 (09:19 -0500)]
Adding zen duration preference

Test: make ROBOTEST_FILTER=ZenModeDurationPreferenceControllerTest RunSettingsRoboTests -j40
Bug: 73741459
Change-Id: I55a75897045ef059dc872bf6403a62f46cedc417

6 years agoMerge "Updated dnd secondary text in sound settings" into pi-dev
Beverly [Mon, 12 Mar 2018 15:33:19 +0000 (15:33 +0000)]
Merge "Updated dnd secondary text in sound settings" into pi-dev
am: c984e49262

Change-Id: I27d5c30102a5786e4e7a5aaf9306d1286089b33b

6 years agoMerge "Updated dnd secondary text in sound settings" into pi-dev
TreeHugger Robot [Mon, 12 Mar 2018 15:02:01 +0000 (15:02 +0000)]
Merge "Updated dnd secondary text in sound settings" into pi-dev

6 years agoFix tests
Julia Reynolds [Mon, 12 Mar 2018 14:08:19 +0000 (10:08 -0400)]
Fix tests

Test: make -j20 RunSettingsRoboTests
Change-Id: I40fda22b4a9da3df7f4319bc68a78d291c1b943d
Fixes: 74446970

6 years agoMerge "Declare official platform slice" into pi-dev
Matthew Fritze [Mon, 12 Mar 2018 03:24:40 +0000 (03:24 +0000)]
Merge "Declare official platform slice" into pi-dev
am: decea2055d

Change-Id: Ic0ae75607d275ff75f383d83ea1193ab8229ae1a

6 years agoMerge "Declare official platform slice" into pi-dev
TreeHugger Robot [Mon, 12 Mar 2018 03:17:19 +0000 (03:17 +0000)]
Merge "Declare official platform slice" into pi-dev

6 years agoMerge "Reenable pre-N style hard keyboard layout settings" into pi-dev
Yohei Yukawa [Mon, 12 Mar 2018 02:19:58 +0000 (02:19 +0000)]
Merge "Reenable pre-N style hard keyboard layout settings" into pi-dev
am: e1703e867a

Change-Id: I6d1e6304f2d592ec9ff46b265bd9937ed554bef9

6 years agoMerge "Reenable pre-N style hard keyboard layout settings" into pi-dev
TreeHugger Robot [Mon, 12 Mar 2018 01:58:06 +0000 (01:58 +0000)]
Merge "Reenable pre-N style hard keyboard layout settings" into pi-dev

6 years agoMerge changes from topic "picker-analytics" into pi-dev
Victor Chang [Sat, 10 Mar 2018 12:39:17 +0000 (12:39 +0000)]
Merge changes from topic "picker-analytics" into pi-dev
am: 371404c404

Change-Id: I19783657cd7266b0055138ee9873d529f847d4b4

6 years agoAdd tron metric logging
Victor Chang [Sat, 10 Mar 2018 12:38:36 +0000 (12:38 +0000)]
Add tron metric logging
am: ab775e1b0f

Change-Id: I443c5e8ca14dbe033085eae69342ee09893d059e

6 years agoMerge changes from topic "picker-analytics" into pi-dev
Victor Chang [Sat, 10 Mar 2018 12:24:38 +0000 (12:24 +0000)]
Merge changes from topic "picker-analytics" into pi-dev

* changes:
  Fix UX problems in time zone pickers
  Add tron metric logging

6 years agoMerge "Add extra log for battery tip." into pi-dev
jackqdyulei [Sat, 10 Mar 2018 05:34:36 +0000 (05:34 +0000)]
Merge "Add extra log for battery tip." into pi-dev
am: 9fc80c5064

Change-Id: I9d7f8c9fba445c8d4766c2bd62550bece920ee46

6 years agoMerge "Disable bluetooth controller if unsupported" into pi-dev
Weilun Du [Sat, 10 Mar 2018 05:25:32 +0000 (05:25 +0000)]
Merge "Disable bluetooth controller if unsupported" into pi-dev
am: a63d41da21

Change-Id: Iaecb698fb95d91a8687ef8c18c8902e2318e518f

6 years agoMerge "Make battery seekbar update continuous" into pi-dev
Lei Yu [Sat, 10 Mar 2018 05:04:37 +0000 (05:04 +0000)]
Merge "Make battery seekbar update continuous" into pi-dev
am: defea95e1d

Change-Id: Ia9302da923237fc99f1278c5f118ab1c3efa2807

6 years agoMerge "Add extra log for battery tip." into pi-dev
TreeHugger Robot [Sat, 10 Mar 2018 01:43:04 +0000 (01:43 +0000)]
Merge "Add extra log for battery tip." into pi-dev

6 years agoMerge "Disable bluetooth controller if unsupported" into pi-dev
TreeHugger Robot [Sat, 10 Mar 2018 01:21:41 +0000 (01:21 +0000)]
Merge "Disable bluetooth controller if unsupported" into pi-dev

6 years agoMerge "Bluetooth: Enable AVDTP Delay reports by default." am: f8ad32823c -s ours
Ajay Panicker [Sat, 10 Mar 2018 00:59:27 +0000 (00:59 +0000)]
Merge "Bluetooth: Enable AVDTP Delay reports by default." am: f8ad32823c  -s ours
am: 76e5237e92

Change-Id: I100d661935afe40657e6de516120d0a4eb651ea2

6 years agoIntroduce boolean flag to show/hide Reset Options.
Ben Lin [Wed, 7 Mar 2018 23:24:37 +0000 (15:24 -0800)]
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
(cherry picked from commit bd180a62ec597dbcc205ff55395851769cdbe730)

6 years agoIntroduce boolean flags to show/hide Encryption status.
Ben Lin [Tue, 6 Mar 2018 00:35:48 +0000 (16:35 -0800)]
Introduce boolean flags to show/hide Encryption status.

This adds one new flag:
config_show_encryption_and_credentials_encryption_status

Which when set to false, will hide Encryption status from Encryption &
credentials. This is when the storage is not being handed by Android,
and so this preference would not be necessarily correct.

Bug: 74127210
Test: Updated robotests
Change-Id: I13665fa369086ef29a4de5f99a78bfbaf96f2f6b
(cherry picked from commit 2d5df469d3a50a1aea6245785e54d0d4ad301d39)

6 years agoMerge "Make battery seekbar update continuous" into pi-dev
TreeHugger Robot [Sat, 10 Mar 2018 00:22:39 +0000 (00:22 +0000)]
Merge "Make battery seekbar update continuous" into pi-dev

6 years agoMerge "Bluetooth: Enable AVDTP Delay reports by default."
Ajay Panicker [Sat, 10 Mar 2018 00:08:20 +0000 (00:08 +0000)]
Merge "Bluetooth: Enable AVDTP Delay reports by default."
am: f8ad32823c  -s ours

Change-Id: If7d482f107e0ce4924748c8b08334cfbbef491e8

6 years agoFix failing testcases in SettingsAdapterTest.
Doris Ling [Fri, 9 Mar 2018 23:22:57 +0000 (15:22 -0800)]
Fix failing testcases in SettingsAdapterTest.

- added the shadow class for CardView to fix the not implemented error.

Change-Id: I17a53f804310ffb3330c1cd3ca11943cf91335a6
Fixes: 74446970
Test: make RunSettingsRoboTests

6 years agoAdd extra log for battery tip.
jackqdyulei [Sat, 3 Mar 2018 00:33:59 +0000 (16:33 -0800)]
Add extra log for battery tip.

For each visible battery tip, logs its type and state. For battery tip
with app list, also log that list:

1. HighUsageTip: apps that used too much battery
2. RestrictAppTip: apps with anomaly, also logs the anomaly type

Bug: 73888115
Test: RunSettingsRoboTests
Change-Id: I1b61eb1d793d979baab4864d2d652e12260b590d

6 years agoDisable bluetooth controller if unsupported
Weilun Du [Tue, 6 Mar 2018 20:05:32 +0000 (12:05 -0800)]
Disable bluetooth controller if unsupported

Only disable the controllers not the whole fragment because
user might need to have entry for other features.

Fixes: 73664409
Merged-In: I98ed248cf33d11715dd523e711cbc68ebf128ef8
Change-Id: I98ed248cf33d11715dd523e711cbc68ebf128ef8
Signed-off-by: Weilun Du <wdu@google.com>
(cherry picked from commit 68a195ae932df264fa0cb6cd457b1655d1cd1420)

6 years agoBypass failing test for SuggestionAdapterTest.
Doris Ling [Fri, 9 Mar 2018 23:32:29 +0000 (23:32 +0000)]
Bypass failing test for SuggestionAdapterTest.
am: d95e1752f6

Change-Id: I896169097d8f41ce89b30e1b7d6389e61b861893

6 years agoMerge "Change anomalyType to ArraySet in AppInfo" into pi-dev
Lei Yu [Fri, 9 Mar 2018 22:35:55 +0000 (22:35 +0000)]
Merge "Change anomalyType to ArraySet in AppInfo" into pi-dev
am: 7208905cb9

Change-Id: I45adf9ac403dc1d9ad4522184ba6eab0a7420c47

6 years agoBypass failing test for SuggestionAdapterTest.
Doris Ling [Fri, 9 Mar 2018 22:00:36 +0000 (14:00 -0800)]
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

6 years agoBluetooth: Enable AVDTP Delay reports by default.
Ajay Panicker [Wed, 7 Mar 2018 23:55:02 +0000 (15:55 -0800)]
Bluetooth: Enable AVDTP Delay reports by default.

Bug: 32755225
Test: See that delay reports are enabled when connecting to device
Change-Id: Icba9be6fc8ba455d37df39d283e36129f6acb536
(cherry picked from commit a8cf0b9371bf9bcb2b92243ec29b822f1f021098)

6 years agoMerge "Bluetooth: Enable AVDTP Delay reports by default."
Treehugger Robot [Fri, 9 Mar 2018 20:56:50 +0000 (20:56 +0000)]
Merge "Bluetooth: Enable AVDTP Delay reports by default."

6 years agoUpdated dnd secondary text in sound settings
Beverly [Fri, 9 Mar 2018 20:14:07 +0000 (15:14 -0500)]
Updated dnd secondary text in sound settings

Test: manual
Bug: 74441398
Change-Id: I4dafd9082e03bc9fa8f5e3f9505a8a1bb2fcc4da

6 years agoFix UX problems in time zone pickers
Victor Chang [Fri, 9 Mar 2018 12:03:03 +0000 (12:03 +0000)]
Fix UX problems in time zone pickers

- Remove emoji region flag in the region picker.
  It's more consistent with locale picker which shows no flag in region
  picker
- Remove redundant information in the summary field
  e.g. same GMT offset in primary and secondary field in fixed offset
  picker
- Better mode switching flow. Switch region/fixed offset mode
only when the user confirms their selection in the picker.

Bug: 73952488
Test: m RunSettingsRoboTests ROBOTEST_FILTER=com.android.settings.datetime.timezone
Change-Id: Id5da8a2516acd10c9a3d71181e94bc617d797d20

6 years agoAdd tron metric logging
Victor Chang [Fri, 9 Mar 2018 17:16:05 +0000 (17:16 +0000)]
Add tron metric logging

- one tracking id for every picker type

Bug: 73952488
Test: m RunSettingsRoboTests ROBOTEST_FILTER=com.android.settings.datetime.timezone
Change-Id: Ia487f1657d6ed1f0fb40b61f39f4a47c38bd6179

6 years agoMake battery seekbar update continuous
Lei Yu [Fri, 9 Mar 2018 19:18:42 +0000 (11:18 -0800)]
Make battery seekbar update continuous

After this cl, when user slides the slider, the text will be
updated continuously.

Bug: 73763634
Test: Manual
Change-Id: Ief9278d39426f6ec9ce9bbcc0be911d083673684

6 years agoDeclare official platform slice
Matthew Fritze [Wed, 28 Feb 2018 16:15:55 +0000 (08:15 -0800)]
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: I5382be138a262dbc5a8324c34aab131c5d0d5516
Merged-In: I581ee6dfcdf935f452a15e89e5d055e375ff1877

6 years agoMerge "Change anomalyType to ArraySet in AppInfo" into pi-dev
Lei Yu [Fri, 9 Mar 2018 17:38:53 +0000 (17:38 +0000)]
Merge "Change anomalyType to ArraySet in AppInfo" into pi-dev

6 years agoMerge "Show new visual effects options in dnd settings" into pi-dev
Julia Reynolds [Fri, 9 Mar 2018 15:20:20 +0000 (15:20 +0000)]
Merge "Show new visual effects options in dnd settings" into pi-dev
am: e056b2ebc9

Change-Id: I0d3721c70f30e41099702642bd279924c89f35dc

6 years agoMerge "Show new visual effects options in dnd settings" into pi-dev
Julia Reynolds [Fri, 9 Mar 2018 13:38:06 +0000 (13:38 +0000)]
Merge "Show new visual effects options in dnd settings" into pi-dev

6 years agoMerge "Get auto-battery saver threshold max from global setting" into pi-dev
Makoto Onuki [Fri, 9 Mar 2018 06:46:27 +0000 (06:46 +0000)]
Merge "Get auto-battery saver threshold max from global setting" into pi-dev
am: d29926c5a1

Change-Id: I6e1636fc05696d410eb82b851c6b9072a9520b46

6 years agoMerge "Get auto-battery saver threshold max from global setting" into pi-dev
TreeHugger Robot [Fri, 9 Mar 2018 03:51:41 +0000 (03:51 +0000)]
Merge "Get auto-battery saver threshold max from global setting" into pi-dev

6 years agoReenable pre-N style hard keyboard layout settings
Yohei Yukawa [Thu, 8 Mar 2018 21:47:56 +0000 (13:47 -0800)]
Reenable pre-N style hard keyboard layout settings

This CL logically reverts Settings app changes for Bug 25752812, which
aimed to improve UX by tightly integrating physical keyboard layout
with input method subtype.

What went wrong is that the concept of input method subtype is not
widely accepted by the ecosystem actually.  Until we figoure out any
other better way here, let's revert back to the good old way that
enables users to specify multiple keyboard layouts per physical
keyboard device, not one layout per one input method subtype.

Note that we cannot simply revert the CL that originally introduced
the new flow [1] because it was indeed a huge CL that also touched IME
settings, which we want to continue using.  In that sense, this CL is
a kind of re-implementation of the previous style on top of the recent
language settings flow.

Note also that a fix [2] fox Bug 25062009 was also ported from
previous InputMethodAndLanguageSetting to
KeyboardLayoutPickerFragment.

 [1]: I728d7ee185827ed328c16cb7abce244557a26518
      976bb3f45915bdd5165d9a50402d4c1163dae809
 [2]: I4483dfc89afc8d148b2cfa7c6a5f66d2a02f712a
      17b631988451613393c4656900c1821e23d8434a

Fix: 66498367
Test: make -j RunSettingsRoboTests
Test: Manually done with two Bluetooth keyboards
Change-Id: I7a2ed6dd39dcd8207d3d94e12cd01d5d67ba4bb5

6 years agoShow new visual effects options in dnd settings
Julia Reynolds [Fri, 2 Mar 2018 20:51:14 +0000 (15:51 -0500)]
Show new visual effects options in dnd settings

Bug: 74075050
Test: make -j20 RunSettingsRoboTests
Change-Id: Ia629007d1c80b657aaf756d0f6d2edfd89a7f6b4

6 years agoChange anomalyType to ArraySet in AppInfo
Lei Yu [Thu, 8 Mar 2018 01:17:29 +0000 (17:17 -0800)]
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

6 years ago[automerger skipped] Import translations. DO NOT MERGE skipped: 0a7ae11c49 skipped...
Antony Sargent [Thu, 8 Mar 2018 20:22:22 +0000 (20:22 +0000)]
[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

6 years ago[automerger skipped] Import translations. DO NOT MERGE skipped: 0a7ae11c49 skipped...
Antony Sargent [Thu, 8 Mar 2018 19:59:36 +0000 (19:59 +0000)]
[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

6 years ago[automerger skipped] Import translations. DO NOT MERGE skipped: 0a7ae11c49 skipped...
Antony Sargent [Thu, 8 Mar 2018 19:48:36 +0000 (19:48 +0000)]
[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

6 years agoHide options button when user starts entering pattern
Maurice Lam [Thu, 8 Mar 2018 19:43:21 +0000 (19:43 +0000)]
Hide options button when user starts entering pattern
am: 4723abfe26

Change-Id: I3223a1a40b08c0dcef90ec117ac08b1888e6174e

6 years ago[automerger skipped] Import translations. DO NOT MERGE skipped: 0a7ae11c49 skipped...
Antony Sargent [Thu, 8 Mar 2018 19:42:30 +0000 (19:42 +0000)]
[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

6 years agoMerge "Donot disable Wi-Fi Calling when getting "registration error" intent." am...
Brad Ebinger [Thu, 8 Mar 2018 19:18:08 +0000 (19:18 +0000)]
Merge "Donot disable Wi-Fi Calling when getting "registration error" intent." am: 4ec0e8e865
am: 9b282e231f

Change-Id: I95a108f4e6090b61e4584a64bed58c024e120fd0

6 years agoMerge "Donot disable Wi-Fi Calling when getting "registration error" intent."
Brad Ebinger [Thu, 8 Mar 2018 19:13:20 +0000 (19:13 +0000)]
Merge "Donot disable Wi-Fi Calling when getting "registration error" intent."
am: 4ec0e8e865

Change-Id: I04c42bb5786b37f6d9aa124a663eef6d69b930a2

6 years agoHide options button when user starts entering pattern
Maurice Lam [Sat, 3 Mar 2018 03:32:48 +0000 (19:32 -0800)]
Hide options button when user starts entering pattern

Test: cd tests/robotests && mma
Bug: 72409245
Change-Id: I82ab8822f13bc8bf8b74bc67f6d4d3a9fd2cc0c8
(cherry picked from commit ad554244b69d91e0304e9e5a45642b585c9e1fde)

6 years agoMerge "Show time zone standard name in FixedOffsetPreferenceController" into pi-dev
Victor Chang [Thu, 8 Mar 2018 18:58:32 +0000 (18:58 +0000)]
Merge "Show time zone standard name in FixedOffsetPreferenceController" into pi-dev
am: 4f5a113d8f

Change-Id: Icadc36b185da4f26c81985895569b18d9234f639

6 years agoMerge "Show time zone standard name in FixedOffsetPreferenceController" into pi-dev
TreeHugger Robot [Thu, 8 Mar 2018 18:45:30 +0000 (18:45 +0000)]
Merge "Show time zone standard name in FixedOffsetPreferenceController" into pi-dev

6 years agoMerge "Donot disable Wi-Fi Calling when getting "registration error" intent."
Brad Ebinger [Thu, 8 Mar 2018 18:32:56 +0000 (18:32 +0000)]
Merge "Donot disable Wi-Fi Calling when getting "registration error" intent."

6 years agoGet auto-battery saver threshold max from global setting
Makoto Onuki [Wed, 7 Mar 2018 22:03:55 +0000 (14:03 -0800)]
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

6 years agoShow time zone standard name in FixedOffsetPreferenceController
Victor Chang [Thu, 8 Mar 2018 15:05:14 +0000 (15:05 +0000)]
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

6 years agoMerge "Fix layout height for suggestion tile." into pi-dev
Doris Ling [Thu, 8 Mar 2018 05:40:11 +0000 (05:40 +0000)]
Merge "Fix layout height for suggestion tile." into pi-dev
am: ec9606addb

Change-Id: I518af49e44a386ef6fcc7381f11ad0b635ba3ea7

6 years agoMerge "Fix layout height for suggestion tile." into pi-dev
TreeHugger Robot [Thu, 8 Mar 2018 05:32:25 +0000 (05:32 +0000)]
Merge "Fix layout height for suggestion tile." into pi-dev

6 years agoMerge "Import translations. DO NOT MERGE" into pi-dev
Bill Yi [Thu, 8 Mar 2018 05:22:18 +0000 (05:22 +0000)]
Merge "Import translations. DO NOT MERGE" into pi-dev
am: 7c2713cb2d  -s ours

Change-Id: I8eabcb331f4eb0809c644e724fe5a6a07802210b

6 years agoMerge "Import translations. DO NOT MERGE" into pi-dev
TreeHugger Robot [Thu, 8 Mar 2018 05:12:11 +0000 (05:12 +0000)]
Merge "Import translations. DO NOT MERGE" into pi-dev

6 years agoMerge "Update fuelguage to use uid in AppInfo" into pi-dev
jackqdyulei [Thu, 8 Mar 2018 03:32:00 +0000 (03:32 +0000)]
Merge "Update fuelguage to use uid in AppInfo" into pi-dev
am: 6949175423

Change-Id: I31a6b9eeaba39e3678945796b729ddede797a28e

6 years agoMerge "Update fuelguage to use uid in AppInfo" into pi-dev
TreeHugger Robot [Thu, 8 Mar 2018 03:22:40 +0000 (03:22 +0000)]
Merge "Update fuelguage to use uid in AppInfo" into pi-dev

6 years agoMerge "Make "Add device" as restricted preference." into pi-dev
jackqdyulei [Thu, 8 Mar 2018 03:05:09 +0000 (03:05 +0000)]
Merge "Make "Add device" as restricted preference." into pi-dev
am: e03bb88c09

Change-Id: I8ba721585a25bdc45b4d3dff97811955e02715b6

6 years agoMerge "Make "Add device" as restricted preference." into pi-dev
TreeHugger Robot [Thu, 8 Mar 2018 02:58:25 +0000 (02:58 +0000)]
Merge "Make "Add device" as restricted preference." into pi-dev

6 years agoMerge "Move Auto sync data prefs from user to account screen" into pi-dev
Fan Zhang [Thu, 8 Mar 2018 02:20:27 +0000 (02:20 +0000)]
Merge "Move Auto sync data prefs from user to account screen" into pi-dev
am: 799c2545c0

Change-Id: I134995bd6c9191db9f82941c1212f7ef598fbef3

6 years agoMerge "Add whitelist for anomaly detection." into pi-dev
Lei Yu [Thu, 8 Mar 2018 02:07:58 +0000 (02:07 +0000)]
Merge "Add whitelist for anomaly detection." into pi-dev
am: 13eb2f18b4

Change-Id: I2fd14ec8f8f1770856c8aabf49e0e39210a08293

6 years agoMerge "For vibration settings page, create controllers from xml" into pi-dev
Fan Zhang [Thu, 8 Mar 2018 02:01:52 +0000 (02:01 +0000)]
Merge "For vibration settings page, create controllers from xml" into pi-dev
am: f3cfced1d1

Change-Id: I518634fb8e61f701ee8acab19855df5c941fec53

6 years agoMerge "Move Auto sync data prefs from user to account screen" into pi-dev
TreeHugger Robot [Thu, 8 Mar 2018 02:01:46 +0000 (02:01 +0000)]
Merge "Move Auto sync data prefs from user to account screen" into pi-dev

6 years agoUpdate fuelguage to use uid in AppInfo
jackqdyulei [Thu, 1 Mar 2018 01:48:27 +0000 (17:48 -0800)]
Update fuelguage to use uid in AppInfo

The uid is needed to distinguish the same app used
by different users(even work profile user). So
we need to store the correct uid in AppInfo and
use it across the settings app.

Bug: 74022362
Test: RunSettingsRoboTests
Change-Id: Iaa0ea1ac1fbd3a3a1251e0cd1096d6a8c75c4ed8

6 years agoMerge "Add whitelist for anomaly detection." into pi-dev
Lei Yu [Thu, 8 Mar 2018 01:14:51 +0000 (01:14 +0000)]
Merge "Add whitelist for anomaly detection." into pi-dev

6 years agoMerge "For vibration settings page, create controllers from xml" into pi-dev
TreeHugger Robot [Thu, 8 Mar 2018 01:07:38 +0000 (01:07 +0000)]
Merge "For vibration settings page, create controllers from xml" into pi-dev

6 years agoBluetooth: Enable AVDTP Delay reports by default.
Ajay Panicker [Wed, 7 Mar 2018 23:42:58 +0000 (15:42 -0800)]
Bluetooth: Enable AVDTP Delay reports by default.

Bug: 32755225
Test: See that delay reports are enabled when connecting to device
Change-Id: I03bd216eb1725ee3e2e5da4e0baae61007ba2dcf
Merged-In: Icba9be6fc8ba455d37df39d283e36129f6acb536

6 years agoMove Auto sync data prefs from user to account screen
Fan Zhang [Wed, 7 Mar 2018 23:42:53 +0000 (15:42 -0800)]
Move Auto sync data prefs from user to account screen

Change-Id: Idb69ed49c6e21f93cafa593ba5e7dffa32f377b7
Fixes: 73739376
Test: existing robotests & atest

6 years agoMerge "Clean up comment" into pi-dev
Fan Zhang [Wed, 7 Mar 2018 23:46:01 +0000 (23:46 +0000)]
Merge "Clean up comment" into pi-dev
am: 12a8fced66

Change-Id: Ie7ad8654f289e9772ea395c362fa9a77be0eb217

6 years agoMerge "Update string: clear data -> clear storage" into pi-dev
Fan Zhang [Wed, 7 Mar 2018 23:36:57 +0000 (23:36 +0000)]
Merge "Update string: clear data -> clear storage" into pi-dev
am: ad24c98c2d

Change-Id: Iea916ddb14f8202ea43b79577d272b66b77de8ab

6 years agoMerge "Clean up comment" into pi-dev
TreeHugger Robot [Wed, 7 Mar 2018 23:34:43 +0000 (23:34 +0000)]
Merge "Clean up comment" into pi-dev

6 years agoImport translations. DO NOT MERGE
Bill Yi [Wed, 7 Mar 2018 21:43:31 +0000 (13:43 -0800)]
Import translations. DO NOT MERGE

BUG:72647570

Change-Id: I0056af6763c58ffc34e49c3c6f84211c1c9a674c
Auto-generated-cl: translation import

6 years agoMerge "Update string: clear data -> clear storage" into pi-dev
TreeHugger Robot [Wed, 7 Mar 2018 23:26:30 +0000 (23:26 +0000)]
Merge "Update string: clear data -> clear storage" into pi-dev

6 years agoMerge "Rename "Billing Cycle" to "App usage cycle"." into pi-dev
Andreas Terzis [Wed, 7 Mar 2018 23:25:05 +0000 (23:25 +0000)]
Merge "Rename "Billing Cycle" to "App usage cycle"." into pi-dev
am: d9eba6b856

Change-Id: Ic41ad59b20a933bef89f0f15989788b61c2e11ed

6 years agoFix layout height for suggestion tile.
Doris Ling [Wed, 7 Mar 2018 23:04:11 +0000 (15:04 -0800)]
Fix layout height for suggestion tile.

- set minHeight instead of using a fix height, so that when the
font/display size is set to larger, the height will expand accordingly
to fit all elements in the suggestion card.

- revert the change that tint all suggestion icons. The previous logic
should be used to determine if we should tint the icon or not.

Change-Id: I2451490130cee216ff65301a600eb91d2e65c321
Fixes: 74261827
Test: visual and make RunSettingsRoboTests

6 years agoUpdate BatteryInfo to include averageTimeToDischarge
Salvador Martinez [Wed, 7 Mar 2018 22:51:56 +0000 (22:51 +0000)]
Update BatteryInfo to include averageTimeToDischarge
am: db1efa3e03

Change-Id: Ibad0041006908e4ab4a229bf8dc7bde5f14bb18a

6 years agoFor vibration settings page, create controllers from xml
Fan Zhang [Wed, 7 Mar 2018 22:15:28 +0000 (14:15 -0800)]
For vibration settings page, create controllers from xml

This change leverages a new support in settings framework to
automatically share preference controllers between full setting page,
search, and slice provider.

Bug: 73668763
Test: existing robotest and atest
Change-Id: Ie96a28f1b503377b3fdf86e28d297c8560d8bf71

6 years agoMerge "Rename "Billing Cycle" to "App usage cycle"." into pi-dev
Andreas Terzis [Wed, 7 Mar 2018 22:46:13 +0000 (22:46 +0000)]
Merge "Rename "Billing Cycle" to "App usage cycle"." into pi-dev

6 years agoClean up comment
Fan Zhang [Wed, 7 Mar 2018 21:36:58 +0000 (13:36 -0800)]
Clean up comment

Bug: 73074893
Test: none
Change-Id: If7dcfcbb2e943d5734239ddb51c0e6ac798b641b

6 years agoAdd whitelist for anomaly detection.
jackqdyulei [Tue, 6 Mar 2018 21:19:15 +0000 (13:19 -0800)]
Add whitelist for anomaly detection.

Even though we can add whitelist in config, we still need to have a
on device whitelist to reduce the size of config.

Use doze whitelist here because we already used it to detect whether
we can restrict the app in battery detail page.

Bug: 74241534
Test: RunSettingsRoboTests
Change-Id: I35b6f3eba9fbc8ae51bb02cd9d5416e4360c388e

6 years agoUpdate string: clear data -> clear storage
Fan Zhang [Wed, 7 Mar 2018 21:19:52 +0000 (13:19 -0800)]
Update string: clear data -> clear storage

Change-Id: I710f7b95a53e5437d895ff920f3cce7aa4c5a6cf
Fixes: 34515307
Test: visual

6 years agoUpdate BatteryInfo to include averageTimeToDischarge
Salvador Martinez [Sat, 3 Mar 2018 01:09:48 +0000 (17:09 -0800)]
Update BatteryInfo to include averageTimeToDischarge

This updates the Estimate data model class as well as the places
it is used to populate the new field when available.

Test: robotests
Bug: 74020365
Change-Id: Ibcecf933819f8b8cd8514205768569e9bd7d1517
(cherry picked from commit 453db0cdbcb9a721a190218261b24c84ff7727b3)
Merged-In: 453db0cdbcb9a721a190218261b24c84ff7727b3

6 years agoRename "Billing Cycle" to "App usage cycle".
Andreas Terzis [Wed, 7 Mar 2018 08:26:15 +0000 (00:26 -0800)]
Rename "Billing Cycle" to "App usage cycle".

Under Settings > Data Usage, rename "Billing cycle" to
"Data warning & limit".

In the new "Data warning & limit" screen rename "Billing cycle"
to "App usage cycle".

Bug: 74321150
Test: manual
Change-Id: Ied4fd604fe98f5fc613fd4f7fc3a3bea5908bb7c

6 years agoMerge "Block location accuracy when DISALLOW_CONFIG_LOCATION is set." into pi-dev
Yueming Wang [Wed, 7 Mar 2018 20:19:23 +0000 (20:19 +0000)]
Merge "Block location accuracy when DISALLOW_CONFIG_LOCATION is set." into pi-dev
am: fd7b78afb0

Change-Id: Ib3f68f2b2372973b300091cbd9640f4cd5a972d0