Commit Graph

7279 Commits

Author SHA1 Message Date
Maurice Lam
8585162ba3 am a283e6e3: Use curly quotes and apostrophes
* commit 'a283e6e325aeae794fb04e60c38431721742b622':
  Use curly quotes and apostrophes
2015-05-01 20:47:05 +00:00
Maurice Lam
a283e6e325 Use curly quotes and apostrophes
Per UX writing style guide, quotes and apostrophes should be curly
https://spec.googleplex.com/live/style/writing.html#writing-global-writing

Bug: 20706978
Change-Id: Idcbb9014c7c04f6f8336a58d2ff5a0ea9409110a
2015-05-01 10:29:05 -07:00
Amit Mahajan
30431a4dbd am 0255f595: Merge "ApnEditor changes to support bearer as a bitmask." into mnc-dev
* commit '0255f595bd5ffbf39601296ac708130fccfc02ed':
  ApnEditor changes to support bearer as a bitmask.
2015-05-01 16:52:08 +00:00
Sudheer Shanka
2a549b66b0 am 0488dc97: Add MDM app name under "Work" in Accounts section of Settings.
* commit '0488dc97686051d6cac744edb8a9d9c7ec477009':
  Add MDM app name under "Work" in Accounts section of Settings.
2015-05-01 16:52:07 +00:00
Amit Mahajan
0255f595bd Merge "ApnEditor changes to support bearer as a bitmask." into mnc-dev 2015-05-01 16:50:05 +00:00
Sudheer Shanka
0488dc9768 Add MDM app name under "Work" in Accounts section of Settings.
Bug: 20024761
Change-Id: I3fe3fd6be8a2d96b36c402ea9bde8cc782797262
2015-05-01 14:42:52 +01:00
Erik Kline
54861e124c Add settings for persisting the mobile data connection.
Change-Id: I9b92104893e860e2beb63ac86d417419699c085b
2015-05-01 19:27:33 +09:00
Amit Mahajan
7e28221640 ApnEditor changes to support bearer as a bitmask.
Change-Id: I8d97f7e789a6ab75f2c5931624fe9694589fc215
2015-04-30 18:03:17 -07:00
Jorim Jaggi
6ac9046d84 am e8d8af2b: Merge "Update fingerprint settings to spec" into mnc-dev
* commit 'e8d8af2b464df3815d1a02c370cf44a80cafd8e3':
  Update fingerprint settings to spec
2015-05-01 00:07:47 +00:00
Chris Craik
e391e9c237 am 3401a652: Merge "Increase clip debug string limit" into mnc-dev
* commit '3401a652efdaee1558a78659994df262975fd8b4':
  Increase clip debug string limit
2015-04-30 23:55:37 +00:00
Jorim Jaggi
e8d8af2b46 Merge "Update fingerprint settings to spec" into mnc-dev 2015-04-30 23:54:33 +00:00
Jorim Jaggi
4dfcb8208c Update fingerprint settings to spec
- Make it look like a sub settings activity, with back button
- Add disclaimer to describe what your fingerprint can be used for
- Update visuals and text for "Add fingerprint"
- Update related string

Bug: 20594955
Change-Id: I0adfcc743db386e0abf9cfdafff3d068ebc3b4bc
2015-04-30 16:54:02 -07:00
Chris Craik
3401a652ef Merge "Increase clip debug string limit" into mnc-dev 2015-04-30 23:46:45 +00:00
Chris Craik
b5607c10c3 Increase clip debug string limit
bug:19189024

Change-Id: I6c9969032d852c6724ceb977705169ec5b8d2a5b
2015-04-30 16:46:02 -07:00
Yorke Lee
628a98c1df Rename default dialer to default phone app
Change-Id: Ib6c147ba132ed5296de5e932e5dc378183ef92a3
2015-04-30 15:07:41 -07:00
Maurice Lam
d4933fa1c3 am 05a0336b: [WifiSetup] Use bullets in skip dialog
* commit '05a0336bde84489db2700b8adfb8b0e415dc0932':
  [WifiSetup] Use bullets in skip dialog
2015-04-30 22:04:32 +00:00
Maurice Lam
05a0336bde [WifiSetup] Use bullets in skip dialog
Use BulletSpan (<li>) to show bullets in the dialog when the user
skips Wi-Fi in setup wizard.

Bug: 20706978
Change-Id: If81bdfad39dd9ffff7543cf531db40d813b57ec8
2015-04-30 14:29:28 -07:00
Maurice Lam
6327c3500b am c5310446: Merge "[WifiSettings] Align text in Wi-Fi dialog" into mnc-dev
* commit 'c531044671ee80a1615013518778ddbf2793137a':
  [WifiSettings] Align text in Wi-Fi dialog
2015-04-30 18:40:26 +00:00
Maurice Lam
d74b5e027d am 0063d51c: Merge "[WifiSetup] Show MAC address in footer" into mnc-dev
* commit '0063d51ca5c69479cc49467f88bbf0072e0409db':
  [WifiSetup] Show MAC address in footer
2015-04-30 18:40:25 +00:00
Maurice Lam
c531044671 Merge "[WifiSettings] Align text in Wi-Fi dialog" into mnc-dev 2015-04-30 18:25:20 +00:00
Maurice Lam
0063d51ca5 Merge "[WifiSetup] Show MAC address in footer" into mnc-dev 2015-04-30 18:24:25 +00:00
Maurice Lam
40626ede38 am e0bf739d: Merge "[WifiSettings] Add progress bar when scanning" into mnc-dev
* commit 'e0bf739ddf8781024578a879fa94bb5e6a71303b':
  [WifiSettings] Add progress bar when scanning
2015-04-30 18:06:04 +00:00
Maurice Lam
e0bf739ddf Merge "[WifiSettings] Add progress bar when scanning" into mnc-dev 2015-04-30 17:53:20 +00:00
Sudheer Shanka
c50b0424e0 am 48b1884a: Merge "Add MDM app label string." into mnc-dev
* commit '48b1884a4ae458b5861b4a063d723ed60edd157c':
  Add MDM app label string.
2015-04-30 17:25:05 +00:00
Maurice Lam
572eb42e1d [WifiSetup] Show MAC address in footer
Show the MAC address in footer so that advanced users can configure
their router whitelist etc.

Bug: 6939795
Change-Id: I858d21fb68f67f74e5b7e3a1960ea4d7966acb29
2015-04-30 10:22:40 -07:00
Sudheer Shanka
48b1884a4a Merge "Add MDM app label string." into mnc-dev 2015-04-30 17:08:50 +00:00
John Spurlock
8d4117fd2f am 5982d17a: Merge "Settings: Do not disturb automatic rule updates." into mnc-dev
* commit '5982d17a2623aa6ef7597acb43738d92803c7b43':
  Settings: Do not disturb automatic rule updates.
2015-04-30 16:03:28 +00:00
John Spurlock
5982d17a26 Merge "Settings: Do not disturb automatic rule updates." into mnc-dev 2015-04-30 15:45:57 +00:00
Jason Monk
f1039a7902 am d527f420: Merge "Handle no peeking in app info pages" into mnc-dev
* commit 'd527f420860e8dfaa7fd87d0c53220fcd87ec5b6':
  Handle no peeking in app info pages
2015-04-30 15:45:30 +00:00
Jason Monk
d527f42086 Merge "Handle no peeking in app info pages" into mnc-dev 2015-04-30 15:33:39 +00:00
John Spurlock
f57bad7d5b Settings: Do not disturb automatic rule updates.
- Remove FAB for adding rules, move to last preference.
 - Add first-class event condition type and config sub-page.
 - Always show radio buttons when adding rules.
 - Add new data model for event rules.
 - Add stub condition provider for event rules (always false for now).
 - Add rule-type icons to rule preference rows.

Bug: 20064962
Change-Id: Id5acde371eb2e7d22b1f195459897614db5ba80a
2015-04-30 11:28:27 -04:00
Jason Monk
25f9e326ab Handle no peeking in app info pages
Bug: 20496400
Change-Id: Icdcb997f35497c7664af948ad7ada722835e42b4
2015-04-30 11:27:27 -04:00
Sudheer Shanka
507abf8fc7 Add MDM app label string.
Bug: 20024761
Change-Id: I05480d36a99864653ba2eceb3561b5da242898e6
2015-04-30 15:14:30 +01:00
Maurice Lam
28c3f6bb71 [WifiSettings] Add progress bar when scanning
Add a progress bar when the Wi-Fi screen is in a transient state,
like enabling, disabling Wi-Fi and scanning for network. This change
sets the progress bar as a pinned header at the top of the activity.

The pinned header container needs to be match parent so that the
progress bar can occupy the full width of the screen. If the header
view doesn't want to fill the width, then the header view *inside*
the container should be wrap_content.

Added an overloaded setPinnedHeader method that takes a layout
resource ID, and returns the view to the caller. This way the
inflater can set the parent property so that layout params will not
be ignored.

Bug: 17389577
Change-Id: I18d0eb7c72ad31d1c4b35a54789016c32c81fb93
2015-04-29 22:38:22 -07:00
Maurice Lam
a81f9e4be2 [WifiSettings] Align text in Wi-Fi dialog
The themes for Wi-Fi dialog in sw600dp is outdated and causing the
labels and text fields to be misaligned. This CL removes all the
related styles except for the one in value/styles.xml, so that all
screens use the same styles (the items and values in the styles were
all the same except for sw600dp which this CL fixes).

Bug: 20663443
Change-Id: I59a079c1a4cc1ae3e99d863cb24816e609e98109
2015-04-29 17:49:52 -07:00
Jeff Sharkey
0b10650ce5 am e77f0687: Returning to wizard, enable migration.
* commit 'e77f0687dd424ccfdc2b1061221c6c8ba4d6ac8d':
  Returning to wizard, enable migration.
2015-04-30 00:48:17 +00:00
Jeff Sharkey
e77f0687dd Returning to wizard, enable migration.
Bring primary storage migration back into the adoption flow, and
provide a path for long-lived notifications to re-launch into the
Settings app.  Also provide option to initiate migration if skipped
during wizard.  For now, estmiate migration size and time based on
a Class 10 card.

Follow other callback refactoring.

Bug: 19993667
Change-Id: Ia0c28eb114bc6c8066c17b3142ed74f962140c91
2015-04-29 17:24:12 -07:00
Maurice Lam
afbcbf7634 am 2add7d0d: Merge "[WifiSetup] Use default theme for Wi-Fi dialogs" into mnc-dev
* commit '2add7d0d0528fd5823471dbe338f4b5b20773efb':
  [WifiSetup] Use default theme for Wi-Fi dialogs
2015-04-29 18:25:45 +00:00
Maurice Lam
2add7d0d05 Merge "[WifiSetup] Use default theme for Wi-Fi dialogs" into mnc-dev 2015-04-29 18:17:16 +00:00
John Spurlock
1e8a9f5fd3 am 0423aed7: Merge "Settings: "No interruptions" -> "Total silence"" into mnc-dev
* commit '0423aed775d0b00cbdf6cc1b422ede704830d43a':
  Settings: "No interruptions" -> "Total silence"
2015-04-29 14:16:12 +00:00
Geoff Mendal
623cd8c293 Merge "Import translations. DO NOT MERGE" into mnc-dev 2015-04-29 14:07:34 +00:00
John Spurlock
0423aed775 Merge "Settings: "No interruptions" -> "Total silence"" into mnc-dev 2015-04-29 14:02:55 +00:00
Geoff Mendal
185c8fd6da Import translations. DO NOT MERGE
Change-Id: Ibbdc2e71ca955cc4cfc648b2f54d592cf5285725
Auto-generated-cl: translation import
2015-04-29 09:01:14 -05:00
Martijn Coenen
a0ee97f196 am 01d13c04: Merge "New Tap & Pay UX." into mnc-dev
* commit '01d13c043a7d9f2aef357e17f2d6a36c678006e6':
  New Tap & Pay UX.
2015-04-29 07:41:50 +00:00
Martijn Coenen
01d13c043a Merge "New Tap & Pay UX." into mnc-dev 2015-04-29 07:29:32 +00:00
Jeff Sharkey
6e86616df7 am a16257db: Format as public/private; follow refactoring.
* commit 'a16257dbd5599135320f4263a2cb438b7a469084':
  Format as public/private; follow refactoring.
2015-04-29 05:29:52 +00:00
Jeff Sharkey
a16257dbd5 Format as public/private; follow refactoring.
Offer to format an empty disk as public/private.

Bug: 19993667
Change-Id: I69fafaed524f3ef5e65d04a9e3a94789fcfc3087
2015-04-28 21:54:54 -07:00
Elliott Hughes
90f9bed6d4 am 28077b9c: Add Pacific/Noumea.
* commit '28077b9cc86388f9b5dfa29a79a5a42c3d545d29':
  Add Pacific/Noumea.
2015-04-29 01:43:09 +00:00
Jorim Jaggi
8f476cdace am 441ea80d: Add animation for fingerprint icon
* commit '441ea80d0ac874955ca7a83ddb8d140ccf87f7ab':
  Add animation for fingerprint icon
2015-04-29 01:41:14 +00:00
Maurice Lam
c36b61ea44 [WifiSetup] Use default theme for Wi-Fi dialogs
Just use the default theme as the dialog doesn't require any
additional attributes to be specified. (Theme.Settings is setting
alertDialogTheme to Theme.AlertDialog as well).

This will allow the correct accent colors (among other theme
attributes) to be propagated to the dialog.

Bug: 20663720
Change-Id: Ibb12c185e8104ccb8f3ddd01524127c748b47487
2015-04-28 18:33:50 -07:00