Doris Ling
c149594bfa
Merge "Fix alignment for the instant app button." into pi-dev am: 2dd0a66c81
...
am: 03c8f085e3
2018-03-14 02:07:46 +00:00
Katsiaryna Naliuka
30464e1b8c
Merge "Made ordering in the Sound settings page more sparse to allow injecting tiles in arbitrary positions." into pi-dev am: 2ae02f56fb
...
am: 40dc8a5249
2018-03-14 01:25:13 +00:00
Doris Ling
03c8f085e3
Merge "Fix alignment for the instant app button." into pi-dev
...
am: 2dd0a66c81
2018-03-14 01:10:37 +00:00
Katsiaryna Naliuka
40dc8a5249
Merge "Made ordering in the Sound settings page more sparse to allow injecting tiles in arbitrary positions." into pi-dev
...
am: 2ae02f56fb
2018-03-14 00:55:10 +00:00
TreeHugger Robot
2dd0a66c81
Merge "Fix alignment for the instant app button." into pi-dev
2018-03-14 00:28:12 +00:00
Katsiaryna Naliuka
2ae02f56fb
Merge "Made ordering in the Sound settings page more sparse to allow injecting tiles in arbitrary positions." into pi-dev
2018-03-13 23:29:01 +00:00
Doris Ling
72f1450bad
Merge "Fix presubmit test failure." into pi-dev am: ceaa6c5a0b
...
am: 1b2e1511ca
2018-03-13 23:21:12 +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
Doris Ling
9e04a917b6
Fix alignment for the instant app button.
...
- wrap the secondary button in the FrameLayout to make it align properly
with the primary button.
Change-Id: I6964bc67773a77eae551521747c19898a2f22210
Fixes: 69562807
Test: visual
2018-03-13 14:38:33 -07:00
Doris Ling
1b2e1511ca
Merge "Fix presubmit test failure." into pi-dev
...
am: ceaa6c5a0b
2018-03-13 21:04:23 +00:00
Andreas Terzis
02e2df71e9
Merge "Increase string character limits to 40" into pi-dev am: 2e7e15c82f
...
am: 885c503f00
2018-03-13 21:01:36 +00: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
ceaa6c5a0b
Merge "Fix presubmit test failure." into pi-dev
2018-03-13 20:18:14 +00:00
Katsiaryna Naliuka
64a89bc9a7
Made ordering in the Sound settings page more sparse to allow injecting
...
tiles in arbitrary positions.
Also increased a number of settings that are not hidden behind the
overflow to accommodate 1 more line.
Bug: 64065365
Test: manual
Change-Id: I3ac8dfd4802967e02bebc6558a5b96d68cb2ea34
2018-03-13 21:02:55 +01: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
Andreas Terzis
885c503f00
Merge "Increase string character limits to 40" into pi-dev
...
am: 2e7e15c82f
2018-03-13 18:31:24 +00:00
Doris Ling
20ed555112
Fix presubmit test failure.
...
- fix the typo in the manifest that reference the zen mode fragment.
Change-Id: Iae6975d015174fabb98033b917290c954c5483c2
Fixes: 74577539
Test: make SettingsUnitTests
2018-03-13 11:25:04 -07:00
Andreas Terzis
2e7e15c82f
Merge "Increase string character limits to 40" into pi-dev
2018-03-13 17:58:12 +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
Doris Ling
ae038f6a06
Merge "Update suggestion title and summary text." into pi-dev am: 388b5314d7
...
am: e83856b0c2
2018-03-13 04:10:37 +00:00
TreeHugger Robot
d5fb944de2
Merge "Don't log sim-pin"
2018-03-13 02:50:42 +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
Doris Ling
e83856b0c2
Merge "Update suggestion title and summary text." into pi-dev
...
am: 388b5314d7
2018-03-13 01:10:58 +00:00
Ajay Panicker
7b2a1f67be
Merge "Bluetooth: Enable AVDTP Delay reports by default." into pi-dev am: 5906621ea4
...
am: 19c35e5a7d
2018-03-13 00:35:51 +00:00
Doris Ling
388b5314d7
Merge "Update suggestion title and summary text." into pi-dev
2018-03-13 00:27:34 +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
Doris Ling
0b5582fe14
Merge "Fix failing testcases in SettingsAdapterTest." into pi-dev am: 425f033782
...
am: 1c088eb185
2018-03-12 23:19:48 +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
Doris Ling
1c088eb185
Merge "Fix failing testcases in SettingsAdapterTest." into pi-dev
...
am: 425f033782
2018-03-12 22:10:49 +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
Andreas Terzis
33a6d0738a
Increase string character limits to 40
...
Increase character limits for the "billing_cycle" and
"app_usage_cycle" strings to 40 characters because the
current limit of 30 characters is not enough for some
translations.
Test: manual
Test: make RunSettingsRoboTests
Bug: 70950124
Change-Id: I2091915ca78786f4b29de211b4635af45cb4946f
2018-03-12 13:00:20 -07: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
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
2018-03-12 19:32:12 +00:00
Doris Ling
9de138b8ab
Update suggestion title and summary text.
...
Bug: 73164111
Test: rebuild
Change-Id: I35db24cd78e88091154e5cbcc9fa089181f3edb2
2018-03-12 12:26:33 -07: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
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
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
Beverly
170b88c6fc
Test for string changes in DND Sound Settings
...
Test: this
Change-Id: I47ba1d1bad6a5be04d718d2e58eaf5dd6c69f107
Fixes: 74529508
2018-03-12 14:35:27 -04: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
