Commit Graph

43334 Commits

Author SHA1 Message Date
Sundeep Ghuman
8d0f26f621 Merge "Add Data warning and limit footer text." into pi-dev am: a41941ce39
am: a543aa03e7

Change-Id: I28977f7c7878b04959f12000a1feaffe2ae761e3
2018-03-14 06:05:31 +00:00
Sundeep Ghuman
a543aa03e7 Merge "Add Data warning and limit footer text." into pi-dev
am: a41941ce39

Change-Id: I01e218c63c4b3955defdc54ada55903888cce6b9
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
Andreas Terzis
b6756fc770 Merge "Change the color of the measurement numbers below the data bar." into pi-dev am: b687dac159
am: a745277b34

Change-Id: I7dfae909ddc53c54143d1110b3a61bf55fea6495
2018-03-14 05:14:26 +00:00
Dianne Hackborn
0516c12710 Merge "Fix issue #62342672: API Review: OPSTR_ACTIVATE_VPN SystemApi" into pi-dev am: 2dc4e36a2c
am: 214d4dc523

Change-Id: I434b797747caaa5daade122bf54ce5168245360f
2018-03-14 04:55:52 +00:00
Andreas Terzis
a745277b34 Merge "Change the color of the measurement numbers below the data bar." into pi-dev
am: b687dac159

Change-Id: I8a90af2a6bfc35de53c5b9e5d9ecd2b582ed6c2d
2018-03-14 04:09:53 +00:00
Andreas Terzis
b687dac159 Merge "Change the color of the measurement numbers below the data bar." into pi-dev 2018-03-14 03:58:32 +00:00
Dianne Hackborn
214d4dc523 Merge "Fix issue #62342672: API Review: OPSTR_ACTIVATE_VPN SystemApi" into pi-dev
am: 2dc4e36a2c

Change-Id: I4e74cc4be5b45dad4772610adf1aded89e6f19d9
2018-03-14 03:15:39 +00:00
Dianne Hackborn
2dc4e36a2c Merge "Fix issue #62342672: API Review: OPSTR_ACTIVATE_VPN SystemApi" into pi-dev 2018-03-14 03:02:20 +00:00
Doris Ling
c149594bfa Merge "Fix alignment for the instant app button." into pi-dev am: 2dd0a66c81
am: 03c8f085e3

Change-Id: I6a9eacc4d21a468ead9698775f71ed204a342d29
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

Change-Id: If81076d1b18240a23e1f2f41d3f0cc8b2ac3652c
2018-03-14 01:25:13 +00:00
Doris Ling
03c8f085e3 Merge "Fix alignment for the instant app button." into pi-dev
am: 2dd0a66c81

Change-Id: I0d817a996ee558a3aa6f962ed0c3eccc45ce59eb
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

Change-Id: I86f951720246dadd5835dfae8ecbfa3158adc16e
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

Change-Id: I1504525336602ac4db33f9e58ffefd7ecd14db2a
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

Change-Id: I102fc43f6dc91f1bbeefdea822007475f0645768
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
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
Doris Ling
1b2e1511ca Merge "Fix presubmit test failure." into pi-dev
am: ceaa6c5a0b

Change-Id: I2af70de2d3917b470f78eef5ef920f5de6e42dc9
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

Change-Id: I0becf680a3a0a272abbbb60971de12b556ecdb6b
2018-03-13 21:01:36 +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
ceaa6c5a0b Merge "Fix presubmit test failure." into pi-dev 2018-03-13 20:18:14 +00:00
Jan Nordqvist
b17180d21a Change the color of the measurement numbers below the data bar.
Original line item: In Data Usage screen, Below the data bar, Make GB measurement numbers smaller.

Bug: 70950124

Test: manual
Test: make RunSettingsRoboTests
Change-Id: Id30233e038c664539fd688dcd4eb99af0c41f010
2018-03-13 13:12:49 -07: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

Change-Id: I41b251514ac761300e3c1923aa826648b2173e37
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 49d314f8c3.

Reason for revert: Revert for proper fix in pi-dev branch. Solution in 
 http://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

Change-Id: I622982dfe5073ec645bccc02e48bb1710bb5cfaf
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

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
Doris Ling
e83856b0c2 Merge "Update suggestion title and summary text." into pi-dev
am: 388b5314d7

Change-Id: I2cd2b0a74b5f07fd4115e74e9d30bf6354af9926
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

Change-Id: Ib14ae9f72f4f2173e1246e60fde82558d84c057d
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

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
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
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
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
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
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