Commit Graph

43256 Commits

Author SHA1 Message Date
Yohei Yukawa
6042f68aa9 Merge "Reenable pre-N style hard keyboard layout settings" into pi-dev am: e1703e867a
am: 3013858ec0

Change-Id: Ia0047941e8162ba940f0ee2b9b903bafbaea35af
2018-03-12 02:40:29 +00:00
Yohei Yukawa
3013858ec0 Merge "Reenable pre-N style hard keyboard layout settings" into pi-dev
am: e1703e867a

Change-Id: I6d1e6304f2d592ec9ff46b265bd9937ed554bef9
2018-03-12 02:19:58 +00:00
TreeHugger Robot
e1703e867a Merge "Reenable pre-N style hard keyboard layout settings" into pi-dev 2018-03-12 01:58:06 +00:00
Victor Chang
5d46b1de10 Merge changes from topic "picker-analytics" into pi-dev am: 371404c404
am: 968a143b43

Change-Id: Id58b0d364e4b22656a6eefecb13be905a353b2c6
2018-03-10 12:51:03 +00:00
Victor Chang
13b48736af Add tron metric logging am: ab775e1b0f
am: c2f0fcd32e

Change-Id: Ibfc5af17166d01d3d1db5b93c9ec1e88ece09766
2018-03-10 12:50:24 +00:00
Victor Chang
968a143b43 Merge changes from topic "picker-analytics" into pi-dev
am: 371404c404

Change-Id: I19783657cd7266b0055138ee9873d529f847d4b4
2018-03-10 12:39:17 +00:00
Victor Chang
c2f0fcd32e Add tron metric logging
am: ab775e1b0f

Change-Id: I443c5e8ca14dbe033085eae69342ee09893d059e
2018-03-10 12:38:36 +00:00
Victor Chang
371404c404 Merge changes from topic "picker-analytics" into pi-dev
* changes:
  Fix UX problems in time zone pickers
  Add tron metric logging
2018-03-10 12:24:38 +00:00
jackqdyulei
8267c9ab7e Merge "Add extra log for battery tip." into pi-dev am: 9fc80c5064
am: ed48fd0a7e

Change-Id: I7fc0f3a46eeaed3620286438d36b9f0de561e6e3
2018-03-10 11:11:46 +00:00
Weilun Du
b6f471c516 Merge "Disable bluetooth controller if unsupported" into pi-dev am: a63d41da21
am: 198f54d552  -s ours

Change-Id: I81702e21284988f519e7934002b0563c43ce2735
2018-03-10 10:55:25 +00:00
Lei Yu
c202e5191b Merge "Make battery seekbar update continuous" into pi-dev am: defea95e1d
am: c525d1d26a

Change-Id: Id2f9a4ba369107fd280a2582cd3e67875d149ad6
2018-03-10 10:34:01 +00:00
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
jackqdyulei
ed48fd0a7e Merge "Add extra log for battery tip." into pi-dev
am: 9fc80c5064

Change-Id: I9d7f8c9fba445c8d4766c2bd62550bece920ee46
2018-03-10 05:34:36 +00:00
Weilun Du
198f54d552 Merge "Disable bluetooth controller if unsupported" into pi-dev
am: a63d41da21

Change-Id: Iaecb698fb95d91a8687ef8c18c8902e2318e518f
2018-03-10 05:25:32 +00:00
Lei Yu
c525d1d26a Merge "Make battery seekbar update continuous" into pi-dev
am: defea95e1d

Change-Id: Ia9302da923237fc99f1278c5f118ab1c3efa2807
2018-03-10 05:04:37 +00:00
TreeHugger Robot
9fc80c5064 Merge "Add extra log for battery tip." into pi-dev 2018-03-10 01:43:04 +00:00
TreeHugger Robot
a63d41da21 Merge "Disable bluetooth controller if unsupported" into pi-dev 2018-03-10 01:21:41 +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
TreeHugger Robot
defea95e1d Merge "Make battery seekbar update continuous" into pi-dev 2018-03-10 00:22:39 +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
jackqdyulei
513ddb14a6 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
2018-03-09 15:47:03 -08:00
Weilun Du
d4e1b94b58 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 68a195ae93)
2018-03-09 23:40:40 +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
Victor Chang
ca529d9e89 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
2018-03-09 19:48:14 +00:00
Victor Chang
ab775e1b0f 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
2018-03-09 19:48:05 +00:00
Lei Yu
bb5fc6a54f 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
2018-03-09 11:18:42 -08: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
Yohei Yukawa
7129b374bb 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
      976bb3f459
 [2]: I4483dfc89afc8d148b2cfa7c6a5f66d2a02f712a
      17b6319884

Fix: 66498367
Test: make -j RunSettingsRoboTests
Test: Manually done with two Bluetooth keyboards
Change-Id: I7a2ed6dd39dcd8207d3d94e12cd01d5d67ba4bb5
2018-03-09 01:54:55 +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