Sundeep Ghuman
8d0f26f621
Merge "Add Data warning and limit footer text." into pi-dev am: a41941ce39
...
am: a543aa03e7
2018-03-14 06:05:31 +00:00
Sundeep Ghuman
a543aa03e7
Merge "Add Data warning and limit footer text." into pi-dev
...
am: a41941ce39
2018-03-14 05:54:20 +00:00
TreeHugger Robot
a41941ce39
Merge "Add Data warning and limit footer text." into pi-dev
2018-03-14 05:44:44 +00:00
Android Build Merger (Role)
39f5286a3e
Merge "Merge changes from topic "dnd_touch_sounds" into pi-dev am: e9fbcd7114 am: 57cda98f4c"
2018-03-13 23:08:42 +00:00
Doris Ling
668d9b733c
Merge "Revert "[Settings] Request focus in Add network dialog""
2018-03-13 22:49:35 +00:00
Beverly
917c8fb21e
Merge changes from topic "dnd_touch_sounds" into pi-dev am: e9fbcd7114
...
am: 57cda98f4c
2018-03-13 22:35:42 +00:00
Sundeep Ghuman
5fc38ecae9
Add Data warning and limit footer text.
...
Bug: 70550124
Test: XML only change, visual inspection.
Change-Id: Iaea3f100051bb908b13ca6809463db7f01f8d92d
2018-03-13 14:21:36 -07:00
Beverly
57cda98f4c
Merge changes from topic "dnd_touch_sounds" into pi-dev
...
am: e9fbcd7114
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
Yuchen Chang
35c14a2ac3
Revert "[Settings] Request focus in Add network dialog"
...
This reverts commit 49d314f8c3http://ag/3714337 is proper fix to make all case in wifi dialog can get focus.
Change-Id: I99035a4c437ea6c033e3ba6a83e39967c236d973
2018-03-13 05:26:47 +00:00
Victor Chang
923e5b3ed3
Merge "Align the search view with the setting items" into pi-dev am: f11976d817
...
am: ef959abc5b
2018-03-13 02:35:38 +00:00
Beverly Tai
060f852332
Merge "Adding zen duration preference" into pi-dev am: e652a039af
...
am: 797d541953
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
2018-03-13 00:27:00 +00:00
Beverly Tai
797d541953
Merge "Adding zen duration preference" into pi-dev
...
am: e652a039af
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
2018-03-12 22:57:27 +00:00
Julia Reynolds
a1cb8216ed
Merge "Fix tests" into pi-dev am: f22eb94b18
...
am: 878e66baa8
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
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
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
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
2018-03-12 16:23:17 +00:00
Beverly
468ebafdc7
Merge "Updated dnd secondary text in sound settings" into pi-dev
...
am: c984e49262
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
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
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
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
2018-03-10 12:51:03 +00:00
Victor Chang
13b48736af
Add tron metric logging am: ab775e1b0f
...
am: c2f0fcd32e
2018-03-10 12:50:24 +00:00
Victor Chang
968a143b43
Merge changes from topic "picker-analytics" into pi-dev
...
am: 371404c404
2018-03-10 12:39:17 +00:00
Victor Chang
c2f0fcd32e
Add tron metric logging
...
am: ab775e1b0f
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
2018-03-10 11:11:46 +00:00
Lei Yu
c202e5191b
Merge "Make battery seekbar update continuous" into pi-dev am: defea95e1d
...
am: c525d1d26a
2018-03-10 10:34:01 +00:00
jackqdyulei
ed48fd0a7e
Merge "Add extra log for battery tip." into pi-dev
...
am: 9fc80c5064
2018-03-10 05:34:36 +00:00
Weilun Du
198f54d552
Merge "Disable bluetooth controller if unsupported" into pi-dev
...
am: a63d41da21
2018-03-10 05:25:32 +00:00
Lei Yu
c525d1d26a
Merge "Make battery seekbar update continuous" into pi-dev
...
am: defea95e1d
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
