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
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
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
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
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
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
Fan Zhang
64a8f70a7f
Add preference controller to launch app-time-spent UI.
...
Bug: 74580195
Test: robotests
Change-Id: Iba9338f04cc037a134ef9445ce97cbbe21f53833
2018-03-23 14:13:57 -07:00
Daniel Nishi
1225469ee9
"My Phone" -> "About Phone"
...
String polishing fix.
Bug: 36458278
Test: Manual
Change-Id: If0d90aa252d0ffe8bdbb8d255d1bec736ba2017a
2018-03-23 14:03:23 -07:00
Fan Zhang
f3fcb03c86
Merge "Add string needed by app usage tracking feature." into pi-dev
...
am: 80bf63a2dd
Change-Id: Iecd8186a7ab00da30f76ec7fb7f4ea05a197b72f
2018-03-23 20:58:53 +00:00
Matthew Fritze
49a3169cb4
Merge "Add keywords for search terms" into pi-dev
...
am: dd0e23b987
Change-Id: I799ea57dd55845562585deb1bd1d2856af671d7e
2018-03-23 20:55:16 +00:00
Christine Franks
f1cc3ad4a1
Merge "Add strings for night display UX changes" into pi-dev
...
am: 0aa142ff18
Change-Id: Ib18f40bad556370bb3e56b223446754a9de8863c
2018-03-23 20:45:36 +00:00
Beverly
332679de37
Add string for app info summary
...
Test: n/a
Bug: 72442731
Change-Id: Ibdf83450159334647ba26b2c44ee6cc5b21638d7
2018-03-23 16:43:07 -04:00
Doris Ling
e6f6441255
Merge "Update battery saver condition text." into pi-dev
...
am: 96a85d6aca
Change-Id: Ia5e121af00fa07aae39f89b70a5a1dc36bb171d4
2018-03-23 20:37:55 +00:00
Salvador Martinez
61266a2c29
Merge "Add new string for updating auto-wifi" into pi-dev
...
am: e9b0ba9bac
Change-Id: Ieeefa5bc8a8ad96f80905b8838d2d0357627e1ef
2018-03-23 20:33:19 +00:00
Salvador Martinez
553c2778af
Merge "Add new strings for auto-wifi" into pi-dev
2018-03-23 20:33:07 +00:00
Salvador Martinez
8bbb4082bb
Merge "Add extra strings for hidden network option" into pi-dev
2018-03-23 20:32:16 +00:00
Jan Nordqvist
becfdd247f
Merge "Rename "Primary data" to "Current data"." into pi-dev
...
am: 7884751938
Change-Id: Ieac649b12d0df53a1102a619afd59be6463d7adc
2018-03-23 20:12:03 +00:00
Salvador Martinez
5cfebe55ea
Merge "Add strings for mobile hotspot bands" into pi-dev
2018-03-23 20:10:49 +00:00
Sean Callanan
504cc266d8
[Settings] Add strings for Natural and Automatic color modes
...
These strings are not properly reflected in the UI yet. Automatic and
Saturated currently map to the same display setting (and the UI reflects
this by checking both).
Bug: 75982435
Test: Modified the existing testcases to reflect the new string.
Change-Id: Iaef08599c0233e018eaafaf89d60eab92e102782
(cherry picked from commit e8f9bf5f68 )
2018-03-23 20:06:25 +00:00
Daniel Nishi
97f3615a07
Add string to warn users about device name.
...
Device name is exposed to apps and through Bluetooth name and Wi-Fi
hotspot name. This warning tells users that before they set it.
Bug: 74981919
Test: Builds -- string currently unused.
Change-Id: I0b4bb49bcff6485a79688d98ca9bab1ce9948efd
2018-03-23 13:04:57 -07:00
TreeHugger Robot
1ff54d7e05
Merge "[QS] Add Settings intent filters for Data Usage" into pi-dev
2018-03-23 19:51:16 +00:00
Victor Chang
d1b3a4c1c6
New strings for time zone picker
...
Bug: 75322108
Test: m SettingsGoogle
Change-Id: I04662384bf1487066b1dc91944b6f1d2115d509a
2018-03-23 19:27:57 +00:00
Doris Ling
89bd8454fc
Update title text for finterprint suggestion.
...
Bug: 76098479
Test: rebuild
Change-Id: Id09a8019844ca5f6c528f4bd1b37117380e663b8
2018-03-23 12:24:58 -07:00
Fan Zhang
80bf63a2dd
Merge "Add string needed by app usage tracking feature." into pi-dev
2018-03-23 19:19:13 +00:00
Tony Mak
0482925f44
Updates the policy transparency dialog string
...
Test: Build and observe the string.
Fixes: 68973125
Change-Id: Ic1461f8b7157cfcc50d6f4766fced725307b9cc0
2018-03-23 19:02:24 +00:00
Lei Yu
1684f605f7
Merge "Hide password for wifi tether" into pi-dev
...
am: 9bb2efa0ff
Change-Id: I7f82bf71672b6e966bf699ca17a215547c0dc8d9
2018-03-23 18:51:42 +00:00
Fan Zhang
7e75de29b1
Merge changes I034a9f0a,Iad5ec577 into pi-dev
...
am: dd5977901d
Change-Id: If135a04e461c80dafe0994010d6d1b36324a8f9a
2018-03-23 18:46:08 +00:00
Neil Fuller
790a55fc97
Merge "Show time zone used in or after 2018 only" into pi-dev
...
am: cbaa984cde
Change-Id: Ibfeab2c86368c80315b6be18701e70deeac5069f
2018-03-23 18:40:32 +00:00
TreeHugger Robot
dd0e23b987
Merge "Add keywords for search terms" into pi-dev
2018-03-23 18:35:23 +00:00
hylo
ae943c5f4d
Merge "Add string for forget confirmation dialog" into pi-dev
...
am: 4b8715afa8
Change-Id: I5d7217a63c5cd3585b38f15de892f00aa7beb6ed
2018-03-23 18:33:28 +00:00
Christine Franks
0aa142ff18
Merge "Add strings for night display UX changes" into pi-dev
2018-03-23 18:33:06 +00:00