Fan Zhang
cde04d3dfc
Merge "Add string needed by app usage tracking feature." into pi-dev am: 80bf63a2dd
...
am: f3fcb03c86
2018-03-23 22:01:56 +00:00
Matthew Fritze
3f0122fa05
Merge "Add keywords for search terms" into pi-dev am: dd0e23b987
...
am: 49a3169cb4
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
2018-03-23 21:51:05 +00:00
Doris Ling
3d6dd75b90
Merge "Update battery saver condition text." into pi-dev am: 96a85d6aca
...
am: e6f6441255
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
2018-03-23 21:39:13 +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
2018-03-23 20:58:53 +00:00
Matthew Fritze
49a3169cb4
Merge "Add keywords for search terms" into pi-dev
...
am: dd0e23b987
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
2018-03-23 20:49:01 +00:00
Christine Franks
f1cc3ad4a1
Merge "Add strings for night display UX changes" into pi-dev
...
am: 0aa142ff18
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
2018-03-23 20:37:55 +00:00
Salvador Martinez
61266a2c29
Merge "Add new string for updating auto-wifi" into pi-dev
...
am: e9b0ba9bac
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
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
2018-03-23 20:10:15 +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
Fan Zhang
2e1d9e802a
Merge changes I034a9f0a,Iad5ec577 into pi-dev am: dd5977901d
...
am: 7e75de29b1
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
2018-03-23 19:48:40 +00:00
Matthew Fritze
fcdfc2d83f
Return back-up slices for unavailable settings
...
When an inline slice is requested, and the setting is unavailable,
we should present more useful information to the user. This CL handles:
- Unsupported: return intent slice to Settings home page
- Disabled for user: intent to the setting page
- Unknown reason: intent to setting page
- Disabled dependency: Create intent-based Slice rather
than the requested inline slice.
Bug: 71640747
Test: robotests
Change-Id: I9c1a0ee36119d4f9f3b205e0824c251f4356db55
2018-03-23 12:47:36 -07:00
hylo
85afc26e7f
Merge "Add string for forget confirmation dialog" into pi-dev am: 4b8715afa8
...
am: ae943c5f4d
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
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
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
2018-03-23 18:51:42 +00:00
Fan Zhang
7e75de29b1
Merge changes I034a9f0a,Iad5ec577 into pi-dev
...
am: dd5977901d
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
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
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
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
Doris Ling
380b61bbd7
Add toggle title for Data Saver
...
Bug: 75983536
Test: rebuild
Change-Id: I38f860abca92fae634f9a41d953512b3f977d38e
2018-03-23 10:42:13 -07: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
Fan Zhang
7d66123f4c
Add string needed by app usage tracking feature.
...
Bug: 74580195
Test: rebuild
Change-Id: I9bd5c3e8e73c4be9e00acf6ede3a33df087cddac
2018-03-23 10:12:25 -07:00
TreeHugger Robot
4b8715afa8
Merge "Add string for forget confirmation dialog" into pi-dev
2018-03-23 17:10:14 +00:00
Jason Monk
fb9b6077c4
Merge "Add option for settings to push to a device index" into pi-dev am: f9c6bc59ae
...
am: 5411c21dde
2018-03-23 17:08:10 +00:00
