Commit Graph

43897 Commits

Author SHA1 Message Date
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
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
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
Fan Zhang
cde04d3dfc Merge "Add string needed by app usage tracking feature." into pi-dev am: 80bf63a2dd
am: f3fcb03c86

Change-Id: Ibce6ce6ca611f5ef6e39872303fc4e3e608d137c
2018-03-23 22:01:56 +00:00
Matthew Fritze
3f0122fa05 Merge "Add keywords for search terms" into pi-dev am: dd0e23b987
am: 49a3169cb4

Change-Id: I16065c59992f75fc9e45be4bd4b313a0691b13be
2018-03-23 21:55:14 +00:00
Christine Franks
09ddd4d650 Merge "Add strings for night display UX changes" into pi-dev am: 0aa142ff18
am: f1cc3ad4a1

Change-Id: Id37f77209f3bb184f06cb7451bb1698307fa5396
2018-03-23 21:51:05 +00:00
Doris Ling
3d6dd75b90 Merge "Update battery saver condition text." into pi-dev am: 96a85d6aca
am: e6f6441255

Change-Id: I2836de5db3950e01d0548c6443c1bbe4e104cd9e
2018-03-23 21:45:52 +00:00
Salvador Martinez
c46a7562ef Merge "Add new string for updating auto-wifi" into pi-dev am: e9b0ba9bac
am: 61266a2c29

Change-Id: I1a2df19f2dbc93b4ab4b77bd28ff812e23b57d0c
2018-03-23 21:39:13 +00: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
Jan Nordqvist
96e31ec1ad Merge "Rename "Primary data" to "Current data"." into pi-dev am: 7884751938
am: becfdd247f

Change-Id: I1c9126dd889f11ebda15a8eef50acf0aec99939a
2018-03-23 20:49:01 +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
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
Lei Yu
18994382d5 Merge "Hide password for wifi tether" into pi-dev am: 9bb2efa0ff
am: 1684f605f7

Change-Id: I8351f06cfdf8e505e1c00c78bfc3daaca15703b4
2018-03-23 20:10:15 +00:00
Fan Zhang
2e1d9e802a Merge changes I034a9f0a,Iad5ec577 into pi-dev am: dd5977901d
am: 7e75de29b1

Change-Id: Ife81eb4fa926cd9a54e84ea4b9d5374c07e1a5b6
2018-03-23 20:03:54 +00:00
TreeHugger Robot
1ff54d7e05 Merge "[QS] Add Settings intent filters for Data Usage" into pi-dev 2018-03-23 19:51:16 +00:00
Neil Fuller
8f5a7f2001 Merge "Show time zone used in or after 2018 only" into pi-dev am: cbaa984cde
am: 790a55fc97

Change-Id: Ibc62444b70c819f613df9e5c947cb6ec703af065
2018-03-23 19:48:40 +00:00
hylo
85afc26e7f Merge "Add string for forget confirmation dialog" into pi-dev am: 4b8715afa8
am: ae943c5f4d

Change-Id: Id0915109c06f4fc55bd47facad574ee840196238
2018-03-23 19:43:18 +00:00
Tao Bao
7110bf4cd6 Merge "Add summary text for "Automatic system updates" option." into pi-dev am: 06bf8a21c6
am: 08888b75f8

Change-Id: I8f7d989bad4e605bdfd756afeb873d8fc00031ea
2018-03-23 19:36:57 +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
Fan Zhang
80bf63a2dd Merge "Add string needed by app usage tracking feature." into pi-dev 2018-03-23 19:19:13 +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
Tao Bao
08888b75f8 Merge "Add summary text for "Automatic system updates" option." into pi-dev
am: 06bf8a21c6

Change-Id: I62b1f70d49b5492ffe9a4f442811f8ad11a1078c
2018-03-23 18:27:18 +00:00
Salvador Martinez
0b22dbf3c4 Add new strings for auto-wifi
This CL adds more strings that were needed for auto-wifi
permission requesting. A follow up cl will add a dialog to use
these strings when appropriate

Bug: 67070896
Test: None, just adds unused strings
Change-Id: I9780dbb0dd714ead7524b991ab5759f366bf4185
2018-03-23 11:21:10 -07:00
TreeHugger Robot
96a85d6aca Merge "Update battery saver condition text." into pi-dev 2018-03-23 18:20:24 +00:00
TreeHugger Robot
bf73ece580 Merge "Enable R8 for settings" 2018-03-23 18:09:44 +00:00
Salvador Martinez
e9b0ba9bac Merge "Add new string for updating auto-wifi" into pi-dev 2018-03-23 18:09:04 +00:00
TreeHugger Robot
7884751938 Merge "Rename "Primary data" to "Current data"." into pi-dev 2018-03-23 17:59:56 +00:00
TreeHugger Robot
9bb2efa0ff Merge "Hide password for wifi tether" into pi-dev 2018-03-23 17:37:23 +00:00
TreeHugger Robot
dd5977901d Merge changes I034a9f0a,Iad5ec577 into pi-dev
* changes:
  Get rid of UserPackageWrapper util.
  Get rid of extra whitespace under divider lines
2018-03-23 17:36:54 +00:00
Neil Fuller
cbaa984cde Merge "Show time zone used in or after 2018 only" into pi-dev 2018-03-23 17:18:36 +00:00