Commit Graph

5692 Commits

Author SHA1 Message Date
Alison Cichowlas
4b29f593f0 Merge "Add group name into channel summary, if applicable." into oc-dev 2017-06-02 15:39:44 +00:00
Doris Ling
2c80b4fc3a Update string for recent apps.
Bug: 62273254
Test: builds
Change-Id: I57a06b4bdfaa9c41636baeddcb94c71bf4518ebc
2017-06-01 17:58:04 -07:00
TreeHugger Robot
31d5b3de6f Merge "Add strings in battery usage page" 2017-06-01 23:38:43 +00:00
TreeHugger Robot
34494a53c9 Merge "Add group name into channel summary, if applicable." 2017-06-01 22:57:26 +00:00
Antony Sargent
ede1e7f16a Add strings to use in Bluetooth device forget confirmation
We're going to add a confirmation dialog for when the user chooses to
unpair with (or "forget") a Bluetooth device on the device details
page. These are the strings we'll use in the dialog.

Bug: 37955181
Bug: 35876580
Test: (should be covered by existing tests)
Change-Id: Iec08fcc2730129c0e9a8f54cc94ab8aad958f353
2017-06-01 15:55:42 -07:00
TreeHugger Robot
8da7a39697 Merge "Update strings for anomaly detection" 2017-06-01 22:46:12 +00:00
TreeHugger Robot
fbc9035bcd Merge "Add search bar to SearchActivity." into oc-dev 2017-06-01 22:02:32 +00:00
jackqdyulei
040c21bcb5 Add strings in battery usage page
Add prefix:
1. "Used for" for foreground time
2. "Active for" for background time

Bug: 37162357
Test: RunSettingsRoboTests
Change-Id: Ifd4762640bd5ad98ce64ab174f7a7f44dbb1aa27
2017-06-01 14:38:00 -07:00
Alison Cichowlas
8ad2fa6865 Add group name into channel summary, if applicable.
Bug: 36642898
Test: ran integration & robo tests (no new failures); verified manually with apps with channels & without.

Change-Id: I16a255b0e5d929f4485d3725bd18179e6f411c03
2017-06-01 17:04:36 -04:00
TreeHugger Robot
ee8ac88f82 Merge "Add search bar to SearchActivity." 2017-06-01 19:57:20 +00:00
Andrew Sapperstein
91fe76263f Merge "Initial search bar implementation." into oc-dev 2017-06-01 19:52:07 +00:00
TreeHugger Robot
21fc59464b Merge "Bluetooth string changes" 2017-06-01 19:04:07 +00:00
jackqdyulei
b2acbb72ac Update strings for anomaly detection
Bug: 62069270
Test: Build
Change-Id: I7f5a00cfd39d85a08054e334ace76ebf7898850c
2017-06-01 11:27:32 -07:00
Andrew Sapperstein
fac61b71e5 Add search bar to SearchActivity.
Styling doesn't look exactly right yet but there's a bar.
Creates an ItemDecoration to add a spacer above the first view.

Removes the action bar and replaces it with a SearchView
inside of a CardView.

Remaining work: pixel pushing

Bug: 37477506
Test: make RunSettingsRoboTests
Change-Id: Ibf38c3c2725551bc4cd90e98d0020ec49c2eab2b
Merged-In: I4a0f0c91c51ff5820b61a596520d80a3337c3466
2017-06-01 11:02:56 -07:00
Andrew Sapperstein
893cb0987a Add search bar to SearchActivity.
Styling doesn't look exactly right yet but there's a bar.
Creates an ItemDecoration to add a spacer above the first view.

Removes the action bar and replaces it with a SearchView
inside of a CardView.

Remaining work: pixel pushing

Bug: 37477506
Test: make RunSettingsRoboTests
Change-Id: I4a0f0c91c51ff5820b61a596520d80a3337c3466
2017-06-01 11:01:00 -07:00
Antony Sargent
e90f29bacf Bluetooth string changes
This includes:
-Title string for device details page
-MAC address string for device details page

Bug: 35876580
Test: make RunSettingsRoboTests
Change-Id: I360996915d1dfa59bbb12f33f42afc4aa0bde64b
2017-06-01 10:28:29 -07:00
TreeHugger Robot
181ea4509a Merge "Update bluetooth strings" 2017-06-01 07:25:59 +00:00
TreeHugger Robot
8306791889 Merge "Remove night display headers and change strings" 2017-06-01 06:45:14 +00:00
TreeHugger Robot
fca1b78d94 Merge "Initial search bar implementation." 2017-06-01 06:43:22 +00:00
Daniel Sheng
b01bf85a15 Merge "Added strings for gesture suggestions" 2017-06-01 05:39:02 +00:00
jackqdyulei
ab1df0bbd3 Update bluetooth strings
Update based on new change in doc:
1. revert "visible as" string
2. change "device mac" string

Bug: 35876580
Test: RunSettingsRoboTests
Change-Id: I8950ed3e2e9c000ab25ea0a3d0d15f69fc075fda
2017-05-31 16:41:33 -07:00
Matthew Fritze
3c666f0b27 Merge "Remove dynamic summary from Security Patch info" into oc-dev am: 564d90faf0
am: 6a50c4555c

Change-Id: Iaf810111f5c4d5e820a0d336eb3029b9474757f3
2017-05-31 22:52:58 +00:00
Doris Ling
a72775a47a Merge "Add new strings to highlight gestures in settings." 2017-05-31 22:47:55 +00:00
TreeHugger Robot
564d90faf0 Merge "Remove dynamic summary from Security Patch info" into oc-dev 2017-05-31 22:41:28 +00:00
Andrew Sapperstein
048f6fb8b3 Initial search bar implementation.
Replaces the default Toolbar in SettingsActivity with one that looks
like a search bar. It uses a Toolbar inside a CardView with some custom
styling.

Since the search bar is a floating element, the new toolbar lives in the
content frame of the dashboard. A FrameLayout is used to provide the
layering that is desired.

Since the search bar is on top, an additional spacer view is added to
the list of items in the dashboard. Its color changes based on what
the first view is so that it always matches.

Adds android-support-v7-cardview as a dependency (and reorders the
other deps to be in alphabetical order).

Remaining work (in future CLs):
- remove search menu option?
- clean up initial window
- remove the line between the header and the first condition
       when there's a condition

Bug: 37477506
Test: make RunSettingsRoboTests
Change-Id: Id7477b90fbaf30eb5cac1ee244c847bddb95b3fd
2017-05-31 15:24:25 -07:00
Maurice Lam
1a07ab4790 String update for setup wizard
Test: Manual
Bug: 38503505
Change-Id: Idc881e5288ab205dee0a85a02d1365f6c4901c88
2017-05-31 14:59:37 -07:00
TreeHugger Robot
23eca9a2c4 Merge "Update user string for battery" 2017-05-31 21:39:43 +00:00
TreeHugger Robot
10534456ed Merge "Update bluetooth strings in settings" 2017-05-31 21:14:31 +00:00
Daniel Sheng
f12376dda8 Added strings for gesture suggestions
Bug: 62225100
Test: N/A
Change-Id: I77a328746782a02df7a33c720b4d8f2a193419b3
2017-05-31 14:10:19 -07:00
Andrew Sapperstein
14934599dd Initial search bar implementation.
Replaces the default Toolbar in SettingsActivity with one that looks
like a search bar. It uses a Toolbar inside a CardView with some custom
styling.

Since the search bar is a floating element, the new toolbar lives in the
content frame of the dashboard. A FrameLayout is used to provide the
layering that is desired.

Since the search bar is on top, an additional spacer view is added to
the list of items in the dashboard. Its color changes based on what
the first view is so that it always matches.

Adds android-support-v7-cardview as a dependency (and reorders the
other deps to be in alphabetical order).

Remaining work (in future CLs):
- remove search menu option?
- clean up initial window
- remove the line between the header and the first condition
       when there's a condition

Change-Id: I627b406735c8e2280ac08f44ca32f7098621a830
Merged-In: Id7477b90fbaf30eb5cac1ee244c847bddb95b3fd
Bug: 37477506
Test: make RunSettingsRoboTests
2017-05-31 14:03:26 -07:00
Doris Ling
d3ba08d957 Add new strings to highlight gestures in settings.
- add new title and summary strings for language & input settings.

Bug: 62219660
Test: build
Change-Id: I52a62dad73e2468e7acd3ef47b241cfea6046ad8
2017-05-31 12:59:17 -07:00
jackqdyulei
58575a9803 Update bluetooth strings in settings
This cl contains strings used in bluetooth main page and
pairing page

Bug: 35876580
Test: RunSettingsRoboTests
Change-Id: Ied514e50fc2dcf4b5d9ece49159c9e13def1b0f3
2017-05-31 12:19:58 -07:00
Alison Cichowlas
2280afc54e Add group name into channel summary, if applicable.
Bug: 36642898
Test: ran integration & robo tests (no new failures); verified manually with apps with channels & without.

Change-Id: I16a255b0e5d929f4485d3725bd18179e6f411c03
2017-05-31 15:12:25 -04:00
TreeHugger Robot
6af679a4bf Merge "Update summary for Hotspot & Tethering." 2017-05-31 19:09:36 +00:00
Christine Franks
2935f3eb6d Remove night display headers and change strings
Bug: 38362741
Test: manual - looks like what was expected
Change-Id: Ied5ebd2b13a23e799488a476cc08d8f5db4c9ff5
2017-05-31 12:00:29 -07:00
Matthew Fritze
2b562f84b6 Remove dynamic summary from Security Patch info
Change-Id: I96b2e32a101077c58efd56115e70b63e4eb25049
Fixes: 36101902
Test: builds :)
2017-05-31 09:53:07 -07:00
TreeHugger Robot
edf845dc58 Merge "Add related assist-gesture keywords" 2017-05-31 14:55:32 +00:00
Adrian Roos
0e60489bf2 Merge "AOD: Ambient display settings to dedicated settings screen" 2017-05-31 04:25:39 +00:00
TreeHugger Robot
2945ffb76f Merge "Resize fingerprint added illustration to specs" 2017-05-31 03:35:36 +00:00
Doris Ling
1e914eb875 Update summary for Hotspot & Tethering.
- change summary for Bluetooth tethering and USB tethering to static
text.
- add strings for Wi-Fi hotspot settings page.

Bug: 62069132
Test: manual
Change-Id: Ibc550da33c192c604b65eb75d16c6c15a8b1ff7a
2017-05-30 17:28:06 -07:00
Adrian Roos
e349ec30d8 AOD: Ambient display settings to dedicated settings screen
Bug: 33279975
Test: make RunSettingsRoboTests
Change-Id: I5f3ddf3b3abfc989907293b4a47b78568c01cf9b
2017-05-30 16:42:37 -07:00
TreeHugger Robot
b713d16315 Merge "Add string needed by new device suggestion" 2017-05-30 23:12:19 +00:00
jackqdyulei
f7d07a6296 Update user string for battery
Bug: 37293179
Test: Build
Change-Id: I6589d51e12a59622a8773c808e1c365880921cae
2017-05-30 16:02:33 -07:00
Fan Zhang
66a3d72cf6 Add string needed by new device suggestion
Bug: 62034077
Test: builds
Change-Id: I9059d3507017a1f1ea5b7b0a412834194bffd309
2017-05-30 14:24:10 -07:00
TreeHugger Robot
cf162d1291 Merge "Extend single line summary preference to multi line." 2017-05-30 20:48:18 +00:00
Daniel Sheng
64c3677169 Merge "Tweaked camera lift trigger suggestion summary." 2017-05-30 20:36:31 +00:00
Matthew Fritze
36653892d4 Add related assist-gesture keywords
Wake squeeze and alarm gestures are for settings under
development.

Bug: 62191990
Test: string changes
Change-Id: Iac22a9ab9e63f1e3d97f62d3c470cf07b5da3636
2017-05-30 13:11:51 -07:00
TreeHugger Robot
5d2377f66a Merge "Disallow adding/editing dun APNs unless allowed by carrier." 2017-05-30 19:38:30 +00:00
Fan Zhang
d35f90c289 Extend single line summary preference to multi line.
also updated some strings char limit.

Change-Id: Ie068ecc410bb8211b4cd5e32a5539c824c48040f
Fix: 36413664
Fix: 62079108
Test: make RunSettingsRoboTests
2017-05-30 11:48:20 -07:00
Daniel Sheng
501963640a Tweaked camera lift trigger suggestion summary.
Bug: 62190621
Test: manual

Updating camera lift trigger strings based on dogfood feedback.

Change-Id: I27fe0f35db4f979c3bc5580f03d2c3c55dc54e67
2017-05-30 10:59:31 -07:00