Commit Graph

43280 Commits

Author SHA1 Message Date
Doris Ling
0b5582fe14 Merge "Fix failing testcases in SettingsAdapterTest." into pi-dev am: 425f033782
am: 1c088eb185

Change-Id: I3ca913ab7ffcdec2ede4d7fad39e89dd4f376492
2018-03-12 23:19:48 +00:00
Doris Ling
1c088eb185 Merge "Fix failing testcases in SettingsAdapterTest." into pi-dev
am: 425f033782

Change-Id: I86b200c0e3a33fc1e3538a7a25eec8c249469fb0
2018-03-12 22:10:49 +00:00
Julia Reynolds
a1cb8216ed Merge "Fix tests" into pi-dev am: f22eb94b18
am: 878e66baa8

Change-Id: I9a24f5683ba339a5f874fac2bf7eca4daf22ac25
2018-03-12 22:06:53 +00:00
Julia Reynolds
878e66baa8 Merge "Fix tests" into pi-dev
am: f22eb94b18

Change-Id: I42ade3f384469eb817555e9c6b6f7e76d2791870
2018-03-12 21:17:21 +00:00
TreeHugger Robot
425f033782 Merge "Fix failing testcases in SettingsAdapterTest." into pi-dev 2018-03-12 19:36:32 +00:00
Ben Lin
6d3511c9b3 Merge "Introduce boolean flag to show/hide Reset Options." into pi-dev am: aedf00c4f8
am: c462dbee94

Change-Id: I10dcd41fdefe36f63711b2eb8c11d113fb3749ac
2018-03-12 19:32:12 +00:00
TreeHugger Robot
f22eb94b18 Merge "Fix tests" into pi-dev 2018-03-12 19:22:22 +00:00
Ben Lin
119a10794e Merge "Introduce boolean flags to show/hide Encryption status." into pi-dev am: 2d452df643
am: 4bdd8476e2

Change-Id: I9dc0115a4888c4097528e8f79f8e27d634686621
2018-03-12 19:05:31 +00:00
Ben Lin
c462dbee94 Merge "Introduce boolean flag to show/hide Reset Options." into pi-dev
am: aedf00c4f8

Change-Id: Ie0d8a377c4c138b3bc1dcd1e8bd1bf0761d59d9a
2018-03-12 18:53:53 +00:00
Ben Lin
4bdd8476e2 Merge "Introduce boolean flags to show/hide Encryption status." into pi-dev
am: 2d452df643

Change-Id: I027d3de2a7388da8b6ece1d03e9c2c5a0b4ffce9
2018-03-12 18:45:46 +00:00
Ben Lin
aedf00c4f8 Merge "Introduce boolean flag to show/hide Reset Options." into pi-dev 2018-03-12 17:52:47 +00:00
Ben Lin
2d452df643 Merge "Introduce boolean flags to show/hide Encryption status." into pi-dev 2018-03-12 17:52:37 +00:00
Beverly
a4727c70d1 Merge "Updated dnd secondary text in sound settings" into pi-dev am: c984e49262
am: 468ebafdc7

Change-Id: I4e3351ccd315665383e0776b81d556b3e56b85f3
2018-03-12 16:23:17 +00:00
Beverly
468ebafdc7 Merge "Updated dnd secondary text in sound settings" into pi-dev
am: c984e49262

Change-Id: I27d5c30102a5786e4e7a5aaf9306d1286089b33b
2018-03-12 15:33:19 +00:00
TreeHugger Robot
c984e49262 Merge "Updated dnd secondary text in sound settings" into pi-dev 2018-03-12 15:02:01 +00:00
Julia Reynolds
7b6422ee06 Fix tests
Test: make -j20 RunSettingsRoboTests
Change-Id: I40fda22b4a9da3df7f4319bc68a78d291c1b943d
Fixes: 74446970
2018-03-12 10:08:19 -04:00
Matthew Fritze
7b6b22301e Merge "Declare official platform slice" into pi-dev am: decea2055d
am: 535e81e56e  -s ours

Change-Id: Ied4cb1664ed7ba5838cdb86208c668bce21fbfcf
2018-03-12 03:33:41 +00:00
Matthew Fritze
535e81e56e Merge "Declare official platform slice" into pi-dev
am: decea2055d

Change-Id: Ic0ae75607d275ff75f383d83ea1193ab8229ae1a
2018-03-12 03:24:40 +00:00
TreeHugger Robot
decea2055d Merge "Declare official platform slice" into pi-dev 2018-03-12 03:17:19 +00:00
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
Ben Lin
a53001dd13 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 bd180a62ec)
2018-03-10 00:26:15 +00:00
Ben Lin
1f61ff4cf9 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 2d5df469d3)
2018-03-10 00:25:16 +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
Doris Ling
1063e48ab8 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
2018-03-09 15:48:50 -08: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