Beverly
917c8fb21e
Merge changes from topic "dnd_touch_sounds" into pi-dev am: e9fbcd7114
...
am: 57cda98f4c
Change-Id: I102fc43f6dc91f1bbeefdea822007475f0645768
2018-03-13 22:35:42 +00:00
Beverly
57cda98f4c
Merge changes from topic "dnd_touch_sounds" into pi-dev
...
am: e9fbcd7114
Change-Id: Ie536a0126a05b379d06caceb54681f4757077c7b
2018-03-13 20:34:41 +00:00
TreeHugger Robot
e9fbcd7114
Merge changes from topic "dnd_touch_sounds" into pi-dev
...
* changes:
Test for string changes in DND Sound Settings
Update seconday text DND Exceptions preference
2018-03-13 19:58:51 +00:00
Victor Chang
923e5b3ed3
Merge "Align the search view with the setting items" into pi-dev am: f11976d817
...
am: ef959abc5b
Change-Id: I5f4a8a5944ac9b323007eee60530f200d2691d38
2018-03-13 02:35:38 +00:00
Beverly Tai
060f852332
Merge "Adding zen duration preference" into pi-dev am: e652a039af
...
am: 797d541953
Change-Id: I294a0691c708066d22d2b569ff7678ae9bb47848
2018-03-13 01:12:33 +00:00
Victor Chang
ef959abc5b
Merge "Align the search view with the setting items" into pi-dev
...
am: f11976d817
Change-Id: Icb137a37b06643514f4c1f519b52ad61b1ad21e2
2018-03-13 00:27:00 +00:00
Beverly Tai
797d541953
Merge "Adding zen duration preference" into pi-dev
...
am: e652a039af
Change-Id: Ief1577186f507572471d65d9aa8cbdf8cb7e1d69
2018-03-12 23:29:41 +00:00
Victor Chang
f11976d817
Merge "Align the search view with the setting items" into pi-dev
2018-03-12 22:58:53 +00:00
Ajay Panicker
19c35e5a7d
Merge "Bluetooth: Enable AVDTP Delay reports by default." into pi-dev
...
am: 5906621ea4
Change-Id: I643cee8c6e35519f41d15939ea80dab056649e37
2018-03-12 22:57:27 +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
Beverly Tai
e652a039af
Merge "Adding zen duration preference" into pi-dev
2018-03-12 21:39:18 +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
5906621ea4
Merge "Bluetooth: Enable AVDTP Delay reports by default." into pi-dev
2018-03-12 21:08:59 +00:00
Victor Chang
9cc92cd90e
Align the search view with the setting items
...
- Remove the margin and paddings in the search view
Bug: 73952488
Test: m RunSettingsRoboTests ROBOTEST_FILTER=com.android.settings.datetime.timezone
Change-Id: I67fb420cf77fc427a550449a053f80dcf66d16ff
2018-03-12 19:40:31 +00:00
TreeHugger Robot
f22eb94b18
Merge "Fix tests" into pi-dev
2018-03-12 19:22:22 +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
3f3c8acce7
Adding zen duration preference
...
Test: make ROBOTEST_FILTER=ZenModeDurationPreferenceControllerTest RunSettingsRoboTests -j40
Bug: 73741459
Change-Id: I55a75897045ef059dc872bf6403a62f46cedc417
2018-03-12 13:46:32 -04:00
Beverly
23612e325b
Update seconday text DND Exceptions preference
...
Test: manual
Bug: 74441398
Change-Id: Ibaa459aa368f62c4ef8cdbefef462848e7bc6fe7
2018-03-12 13:03:48 -04: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
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
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
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
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
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
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
Ajay Panicker
ff6a90994f
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 a8cf0b9371 )
2018-03-09 21:21:45 +00:00