Commit Graph

15041 Commits

Author SHA1 Message Date
TreeHugger Robot
a41941ce39 Merge "Add Data warning and limit footer text." into pi-dev 2018-03-14 05:44:44 +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
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
Sundeep Ghuman
101c1d09e1 Fix new DataUsageSummary page line spacing.
There are still some unspecified items pending UX. Have left comments on
ag/3702541 to avoid regressions.

Bug: 70950124
Test: UI change only, no code to test.
Change-Id: I7fa96134af750d71786d031652162aed6bffbeb5
2018-03-13 17:56:19 -07: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
Lei Yu
94e89aeff1 Update strings for location
Bug: 65626601
Test: Screenshot
Change-Id: I66dc675246e3a15069821fddb9d02123429c3722
2018-03-13 16:19:47 -07:00
jackqdyulei
ede87ce19f Add dialog for summary tip
Also change SummaryTip to store the time data, which is used
in the dialog. If "Full last charge" time is available, show
normal message otherwise show message without it.

Bug: 72997971
Test: RunSettingsRoboTests
Change-Id: I4ce94f0935465a18275edb13e3be343313427c3b
2018-03-13 15:23:20 -07: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
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
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
Andreas Terzis
2e7e15c82f Merge "Increase string character limits to 40" into pi-dev 2018-03-13 17:58:12 +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
Doris Ling
388b5314d7 Merge "Update suggestion title and summary text." into pi-dev 2018-03-13 00:27:34 +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
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
Beverly Tai
e652a039af Merge "Adding zen duration preference" into pi-dev 2018-03-12 21:39:18 +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
Doris Ling
9de138b8ab Update suggestion title and summary text.
Bug: 73164111
Test: rebuild
Change-Id: I35db24cd78e88091154e5cbcc9fa089181f3edb2
2018-03-12 12:26:33 -07: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
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
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
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
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
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
Beverly
aa31b9cb4a Updated dnd secondary text in sound settings
Test: manual
Bug: 74441398
Change-Id: I4dafd9082e03bc9fa8f5e3f9505a8a1bb2fcc4da
2018-03-09 15:14:07 -05:00
Matthew Fritze
a4a3dfffa2 Declare official platform slice
Create the notion of an official platform slice.
This includes:
- Adding a second authority to the provider
- tagging slices in xml with a platform slice flag
- Including authority in the getUri method

Bug:73359139
Test: robotests
Change-Id: I5382be138a262dbc5a8324c34aab131c5d0d5516
Merged-In: I581ee6dfcdf935f452a15e89e5d055e375ff1877
2018-03-09 18:04:06 +00:00
Julia Reynolds
45e8898f7e Merge "Show new visual effects options in dnd settings" into pi-dev
am: e056b2ebc9

Change-Id: I0d3721c70f30e41099702642bd279924c89f35dc
2018-03-09 15:20:20 +00:00
Yohei Yukawa
7129b374bb Reenable pre-N style hard keyboard layout settings
This CL logically reverts Settings app changes for Bug 25752812, which
aimed to improve UX by tightly integrating physical keyboard layout
with input method subtype.

What went wrong is that the concept of input method subtype is not
widely accepted by the ecosystem actually.  Until we figoure out any
other better way here, let's revert back to the good old way that
enables users to specify multiple keyboard layouts per physical
keyboard device, not one layout per one input method subtype.

Note that we cannot simply revert the CL that originally introduced
the new flow [1] because it was indeed a huge CL that also touched IME
settings, which we want to continue using.  In that sense, this CL is
a kind of re-implementation of the previous style on top of the recent
language settings flow.

Note also that a fix [2] fox Bug 25062009 was also ported from
previous InputMethodAndLanguageSetting to
KeyboardLayoutPickerFragment.

 [1]: I728d7ee185827ed328c16cb7abce244557a26518
      976bb3f459
 [2]: I4483dfc89afc8d148b2cfa7c6a5f66d2a02f712a
      17b6319884

Fix: 66498367
Test: make -j RunSettingsRoboTests
Test: Manually done with two Bluetooth keyboards
Change-Id: I7a2ed6dd39dcd8207d3d94e12cd01d5d67ba4bb5
2018-03-09 01:54:55 +00:00
Julia Reynolds
d640a97ce8 Show new visual effects options in dnd settings
Bug: 74075050
Test: make -j20 RunSettingsRoboTests
Change-Id: Ia629007d1c80b657aaf756d0f6d2edfd89a7f6b4
2018-03-08 16:42:35 -05:00
Doris Ling
7eef8156ea Merge "Fix layout height for suggestion tile." into pi-dev
am: ec9606addb

Change-Id: I518af49e44a386ef6fcc7381f11ad0b635ba3ea7
2018-03-08 05:40:11 +00:00
TreeHugger Robot
ec9606addb Merge "Fix layout height for suggestion tile." into pi-dev 2018-03-08 05:32:25 +00:00
TreeHugger Robot
7c2713cb2d Merge "Import translations. DO NOT MERGE" into pi-dev 2018-03-08 05:12:11 +00:00
jackqdyulei
b65ae02db2 Merge "Make "Add device" as restricted preference." into pi-dev
am: e03bb88c09

Change-Id: I8ba721585a25bdc45b4d3dff97811955e02715b6
2018-03-08 03:05:09 +00:00