Commit Graph

44048 Commits

Author SHA1 Message Date
Matthew Fritze
206691d079 Merge "Return back-up slices for unavailable settings" into pi-dev am: 362ba01789
am: 2cc4516030

Change-Id: Iaf5c385ebae91340294b027ee6037bb0589fa607
2018-03-24 07:59:35 +00:00
Maurice Lam
2f4745d402 Merge "Separate skip and clear button in pattern screen" into pi-dev am: 59b25d0043
am: f95ec59cbf

Change-Id: Ia8aeb392ce080533c503d3cf4e9b6e9370425e87
2018-03-24 07:58:42 +00:00
Doris Ling
468bbfaa7c Merge "Add toggle title for Data Saver" into pi-dev am: c812ec6c89
am: 4d3390d619

Change-Id: I58b7c65faa67e70a261b5ceebfd787d3159c9cbd
2018-03-24 07:57:22 +00:00
Lei Yu
3f49c24d3f Merge "Add callback when tethering fails" into pi-dev am: 1682085feb
am: 7fcde4490c

Change-Id: Ie1e512ffa61b138769b25bf0c54bc459940f91fc
2018-03-24 07:56:32 +00:00
Fan Zhang
60d7e5fb74 Merge ""My Phone" -> "About Phone"" into pi-dev am: 6ab6ed4e7a
am: bb40b8e157

Change-Id: I3d8c617eec7fc1cf739094d834eede3af785e42a
2018-03-24 07:55:43 +00:00
Fan Zhang
d157f7c846 Merge "Add preference controller to launch app-time-spent UI." into pi-dev am: 30da391fa0
am: 490eaa1c8c

Change-Id: Ic19a6b808359f45a8c51d06de04d635d1ea10ceb
2018-03-24 07:54:54 +00:00
Sean Callanan
ecef2f8d0c Merge "[Settings] Add strings for Natural and Automatic color modes" into pi-dev am: 8d8ee565b1
am: ee8a899d89

Change-Id: Ie9efef5b5a8abe1a16048a129ad770048342438c
2018-03-24 07:53:36 +00:00
Beverly
397e45bf29 Merge "Add string for app info summary" into pi-dev am: 2e32d30298
am: 714c5fad50

Change-Id: If7cd1cd90e7cb7ec50e5b4bbf627e0624b011b5c
2018-03-24 07:50:56 +00:00
Doris Ling
a93b5fe982 Merge "Update title text for finterprint suggestion." into pi-dev am: 7bf63eb62a
am: c69a2a1b6d

Change-Id: I0ae5e6ec09c21914f384d9cf66c23538b3a17777
2018-03-24 07:47:39 +00:00
Stanley Tng
19f50512ac Merge "Add new strings for Hearing Aid profile in Accessibility app" into pi-dev am: 53332b6dcf
am: 36f2f35b8c

Change-Id: I8ef143a25ed8cb9d90dfd961f97b0e6ebcdd6c06
2018-03-24 07:35:48 +00:00
Matthew Fritze
2cc4516030 Merge "Return back-up slices for unavailable settings" into pi-dev
am: 362ba01789

Change-Id: Ic4dbd881bbe0bc5044b148a4c57736a1a0dc9fac
2018-03-24 07:17:35 +00:00
TreeHugger Robot
362ba01789 Merge "Return back-up slices for unavailable settings" into pi-dev 2018-03-24 07:04:47 +00:00
Maurice Lam
f95ec59cbf Merge "Separate skip and clear button in pattern screen" into pi-dev
am: 59b25d0043

Change-Id: Ibd042c0e3686e899e22a144295829309bc623fa4
2018-03-24 05:55:25 +00:00
TreeHugger Robot
59b25d0043 Merge "Separate skip and clear button in pattern screen" into pi-dev 2018-03-24 05:46:35 +00:00
Doris Ling
4d3390d619 Merge "Add toggle title for Data Saver" into pi-dev
am: c812ec6c89

Change-Id: Idc9711ebf92a19337e79a01665c8a46330634fda
2018-03-24 05:36:14 +00:00
Lei Yu
7fcde4490c Merge "Add callback when tethering fails" into pi-dev
am: 1682085feb

Change-Id: I453702ec5cba4ea5d65d3287acc75d2adc4890e4
2018-03-24 05:33:56 +00:00
TreeHugger Robot
c812ec6c89 Merge "Add toggle title for Data Saver" into pi-dev 2018-03-24 05:30:28 +00:00
Fan Zhang
bb40b8e157 Merge ""My Phone" -> "About Phone"" into pi-dev
am: 6ab6ed4e7a

Change-Id: I892a6697735121389b4f8797bfadfde4f5b93602
2018-03-24 05:24:32 +00:00
TreeHugger Robot
1682085feb Merge "Add callback when tethering fails" into pi-dev 2018-03-24 05:24:09 +00:00
Fan Zhang
490eaa1c8c Merge "Add preference controller to launch app-time-spent UI." into pi-dev
am: 30da391fa0

Change-Id: Id6ac2c1980a2fb9ab995168a204295b08cf8e2d8
2018-03-24 05:23:53 +00:00
Sean Callanan
ee8a899d89 Merge "[Settings] Add strings for Natural and Automatic color modes" into pi-dev
am: 8d8ee565b1

Change-Id: I147f0648d976094b291b49c2649d8529930436be
2018-03-24 05:23:17 +00:00
Beverly
714c5fad50 Merge "Add string for app info summary" into pi-dev
am: 2e32d30298

Change-Id: I96ddc68b7262503a71dc4faf56aef30021e63c87
2018-03-24 05:22:40 +00:00
Fan Zhang
6ab6ed4e7a Merge ""My Phone" -> "About Phone"" into pi-dev 2018-03-24 05:16:01 +00:00
Doris Ling
c69a2a1b6d Merge "Update title text for finterprint suggestion." into pi-dev
am: 7bf63eb62a

Change-Id: I566d7bfbcef79ad3231b74dbfb72976459fd5563
2018-03-24 05:15:50 +00:00
TreeHugger Robot
30da391fa0 Merge "Add preference controller to launch app-time-spent UI." into pi-dev 2018-03-24 05:14:32 +00:00
TreeHugger Robot
8d8ee565b1 Merge "[Settings] Add strings for Natural and Automatic color modes" into pi-dev 2018-03-24 05:14:29 +00:00
TreeHugger Robot
2e32d30298 Merge "Add string for app info summary" into pi-dev 2018-03-24 05:14:24 +00:00
TreeHugger Robot
7bf63eb62a Merge "Update title text for finterprint suggestion." into pi-dev 2018-03-24 04:58:29 +00:00
Stanley Tng
36f2f35b8c Merge "Add new strings for Hearing Aid profile in Accessibility app" into pi-dev
am: 53332b6dcf

Change-Id: Id736294962a1aa79e1e93647abca38bc4a9c575a
2018-03-24 04:23:02 +00:00
Stanley Tng
53332b6dcf Merge "Add new strings for Hearing Aid profile in Accessibility app" into pi-dev 2018-03-24 04:09:04 +00:00
Daniel Nishi
1304bf0885 Merge "Add string to warn users about device name." into pi-dev am: 0d221f7767
am: 8537eeb1e9

Change-Id: I8e770ba62dbcb9d95c1246b23c8134b32ba36911
2018-03-24 04:08:07 +00:00
Tony Mak
dfc32a3f3a Merge "Updates the policy transparency dialog string" into pi-dev am: 95e22fa7bd
am: 6f924f55b7

Change-Id: I088eea88abdbde838ebe364289cda1f50187a0e5
2018-03-24 03:14:55 +00:00
Victor Chang
0b9c868670 Merge "New strings for time zone picker" into pi-dev am: 6c737f9790
am: 04766dba13

Change-Id: Ia485d022a01ada5286e35b5935ee844aa3219e7f
2018-03-24 03:10:48 +00:00
Salvador Martinez
766b2f644b Merge "Add new strings for auto-wifi" into pi-dev am: 553c2778af
am: 8faae1eebb

Change-Id: Ie2733871f24a873ebcad12f752fd41f6fa2032fa
2018-03-24 03:04:41 +00:00
Salvador Martinez
18d9810216 Merge "Add extra strings for hidden network option" into pi-dev am: 8bbb4082bb
am: d53258e023

Change-Id: Ic780a8fbe4bf63e4cd1e5252dfc79e09057c9362
2018-03-24 02:57:35 +00:00
Daniel Nishi
8537eeb1e9 Merge "Add string to warn users about device name." into pi-dev
am: 0d221f7767

Change-Id: I4863d112cedaecf0f14c3355c0b350ba03eb297e
2018-03-24 02:23:24 +00:00
Salvador Martinez
3c3c4626d9 Merge "Add strings for mobile hotspot bands" into pi-dev am: 5cfebe55ea
am: 22098f44b4

Change-Id: I772f8bc088a4b539f51bba84563271b13389c4ab
2018-03-24 01:47:15 +00:00
Rohan Shah
d10f3ea47a Merge "[QS] Add Settings intent filters for Data Usage" into pi-dev am: 1ff54d7e05
am: 742dc0097b

Change-Id: If957235f76ec7b4e60e4aca3070076137bf70504
2018-03-24 01:22:58 +00:00
Daniel Nishi
0d221f7767 Merge "Add string to warn users about device name." into pi-dev 2018-03-24 01:04:21 +00:00
Tony Mak
6f924f55b7 Merge "Updates the policy transparency dialog string" into pi-dev
am: 95e22fa7bd

Change-Id: I87885dd2ff53204017e547769c8d5641609fbf5a
2018-03-24 00:55:35 +00:00
Tony Mak
95e22fa7bd Merge "Updates the policy transparency dialog string" into pi-dev 2018-03-24 00:35:02 +00:00
Stanley Tng
9a9d8bc4ca Add new strings for Hearing Aid profile in Accessibility app
These new strings will be used by the Accessibility Settings App for the
hearing aid profile.

Test: compiled.
Bug: 74204427
Change-Id: I41cd5c2152a8b8dacb3dd4e5f974d1427d4a7ba4
2018-03-23 17:31:01 -07:00
Jeff Sharkey
c34eea991f Add UX string tweaks before string freeze.
We're fully intending to implement some string and layout tweaks
requested by UX, but we need to get the requested strings checked
in before the strings deadline.  We carefully keep existing (legacy)
strings intact to avoid any runtime crashes until we get the layout
work done.

Test: builds, boots
Bug: 76097999
Change-Id: Ic6531de170df8eaa8b3a0a23d76a0c8821bb5b16
2018-03-23 18:09:58 -06:00
Victor Chang
04766dba13 Merge "New strings for time zone picker" into pi-dev
am: 6c737f9790

Change-Id: I52ff1e792c10da219060eddf8ff7f3db42620113
2018-03-23 23:24:18 +00:00
Salvador Martinez
8faae1eebb Merge "Add new strings for auto-wifi" into pi-dev
am: 553c2778af

Change-Id: Ie344d56a288aaf643b507d25496ea4c3f85a32d5
2018-03-23 22:30:36 +00:00
Salvador Martinez
d53258e023 Merge "Add extra strings for hidden network option" into pi-dev
am: 8bbb4082bb

Change-Id: Id1b4364c37c7bb482312b442ee6f517005cac96b
2018-03-23 22:26:39 +00:00
Victor Chang
6c737f9790 Merge "New strings for time zone picker" into pi-dev 2018-03-23 22:23:23 +00:00
Salvador Martinez
22098f44b4 Merge "Add strings for mobile hotspot bands" into pi-dev
am: 5cfebe55ea

Change-Id: I6b6ef32dc0d93002c5e1c04049d638e42c1e22ab
2018-03-23 22:16:13 +00:00
TreeHugger Robot
d7707cf9b7 Merge "Import translations. DO NOT MERGE" 2018-03-23 22:11:24 +00:00
Rohan Shah
742dc0097b Merge "[QS] Add Settings intent filters for Data Usage" into pi-dev
am: 1ff54d7e05

Change-Id: I63d45796dcebb66db56d795054443b75a771c0df
2018-03-23 22:04:44 +00:00