Commit Graph

20062 Commits

Author SHA1 Message Date
John Spurlock
673db350c3 Merge "Settings: Add setting to mute wireless charging sound." into mnc-dev 2015-05-06 22:49:07 +00:00
Alan Viverette
9b2d47f445 Use theme colors in battery stats widget
Bug: 20633519
Change-Id: Ia83848ff506afbddf320fa0ed3d022f9a0e884dc
2015-05-06 15:17:27 -07:00
Sanket Padawe
39ac24df79 Merge "Fix SimStatus crash in Settings." into mnc-dev 2015-05-06 22:04:12 +00:00
John Spurlock
ae91c0a99a Settings: Add setting to mute wireless charging sound.
Bug: 19538553
Change-Id: I93228aee38f8eb035025409ce063f3050bf9bb9a
2015-05-06 17:42:30 -04:00
Sanket Padawe
b7a1b5c310 Merge "Saved networks summary strings." into mnc-dev 2015-05-06 20:59:13 +00:00
Jason Monk
20f464edde Fix app headers in settings
Use SettingsPreferenceFragment's method for pinned headers where
possible, and add a frame within the fragment for them to live in
otherwise so that this view doesn't end up on the activity.

Bug: 20886475
Change-Id: I985eb1497744ea50bfabed862e5088eb89df5b61
2015-05-06 16:00:25 -04:00
Sudheer Shanka
5a817c6bcc Forward ACTION_OTHER_SOUND_SETTINGS intent to primary profile.
Change-Id: I55c169b280d7302c9e387f80be82ef47132798c2
2015-05-06 16:35:22 +01:00
Sanket Padawe
5a3b91cdbb Fix SimStatus crash in Settings.
Bug: 20862873
Change-Id: I1ae60ceb64a8af8b3f875e50dd62dfe9796192ca
2015-05-05 19:00:39 -07:00
John Spurlock
0d2a8d204b Settings: Migrate calls & messages priority settings.
Bug: 18635172
Change-Id: Ib5fe3bc80590875bb4a1547013ac3444939ab6fd
2015-05-05 18:50:15 -04:00
Casper Bonde
faadcd60e7 Settings UI for SIM access profile (1/2)
Change-Id: Iff14295ac0eb65561a2097f25c70e8b5f8be5003
2015-05-05 16:59:17 +00:00
Robin Lee
3342d762e9 Merge "VPN: Convert current-context IPCs to user context" into mnc-dev 2015-05-05 15:34:41 +00:00
Brian Colonna
229d06a839 Removed some dead Face Unlock code.
I checked to see if any dead Face Unlock code remains in settings.  Most of it
has been removed, but I did find some strings and an xml file that can be
removed.

Bug: 16139545
Change-Id: I16d7b3a258c72d6788348d1fbe35a7f6bc12ee8e
2015-05-05 11:23:12 -04:00
John Spurlock
42ae11d4d5 Merge "Settings: Remove zenswitch from DND settings page." into mnc-dev 2015-05-05 14:42:16 +00:00
John Spurlock
a924f3d6bb Merge "Settings: Calendar event zen rule string updates." into mnc-dev 2015-05-05 14:42:05 +00:00
John Spurlock
4b43b72054 Settings: Calendar event zen rule string updates.
- Remove Attendance option.
 - Use new reply value, tweak wording and summaries.

Bug: 20064962
Change-Id: I6977b494e54752fa87ea08df0ed085129a09a3d3
2015-05-05 10:12:26 -04:00
John Spurlock
beff087b3a Settings: Remove zenswitch from DND settings page.
- Remove the ability to view/modify zen mode/condition from
   the Settings app.

Bug: 20064962
Change-Id: I8757780e5e9ef578e05203577871b9f513997798
2015-05-05 07:32:31 -04:00
Robin Lee
ab6a65c03b VPN: Convert current-context IPCs to user context
These fetch info for the wrong user, which may be either wrong or worse
wholly nonexistent.

Bug: 20747154
Change-Id: Ibd5f2e5d3c5dfd252a032ebdfe204de7166fa3a5
2015-05-05 10:54:24 +00:00
Zoltan Szatmary-Ban
aea57babc0 Merge "Forward WiFi settings intents to primary profile" into mnc-dev 2015-05-05 10:07:07 +00:00
Sanket Padawe
eb3ff59333 Saved networks summary strings.
Bug: 20667217
Change-Id: I13930f8d0d99bc874692568de713003798b98a87
2015-05-04 18:14:33 -07:00
Prerepa Viswanadham
f09497a2a7 Merge changes from topic 'mwd-merge-050415' into mnc-dev
* changes:
  Merge commit 'ab489de' into merge_try2
  Merge commit 'dd796e8' into merge_try2
2015-05-05 01:07:17 +00:00
Yorke Lee
3066f83243 Merge "Rename default dialer to default phone app" into mnc-dev 2015-05-05 00:22:13 +00:00
Jason Monk
0ab13b8326 Merge "Add high power whitelist for apps" into mnc-dev 2015-05-04 18:50:19 +00:00
Jason Monk
1eb54eb2ff Add high power whitelist for apps
- Strings not final!
 - New UX for power usage details (more preferency)
 - Add high power apps list shows on/off and screen to
   change (when possible)
 - Link from power usage summary to high power list
 - Link from advanced apps to high power list

Bug: 19991702
Change-Id: I97c927ed82d3b89041e4429b427508545763d66c
2015-05-04 14:38:01 -04:00
Geoff Mendal
32ba436b0b Import translations. DO NOT MERGE
Change-Id: I9fa131ac5fdd9b014c319fa72ede5aaca13eb24c
Auto-generated-cl: translation import
2015-05-04 06:18:18 -07:00
Prerepa Viswanadham
e42416a404 Merge commit 'ab489de' into merge_try2 2015-05-01 18:39:38 -07:00
Prerepa Viswanadham
27d4126fed Merge commit 'dd796e8' into merge_try2
Change-Id: I7237d936e2eea39f5d4401db06aed6cb3a3dc426
2015-05-01 18:39:00 -07: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
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
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
Fyodor Kupolov
729aa93255 Merge "Fixed an issue with back key behavior" into mnc-dev 2015-04-30 22:41:13 +00:00
Yorke Lee
628a98c1df Rename default dialer to default phone app
Change-Id: Ib6c147ba132ed5296de5e932e5dc378183ef92a3
2015-04-30 15:07:41 -07: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
Fyodor Kupolov
5654815695 Fixed an issue with back key behavior
Create mHeaderView and set it as a pinned header, each time onActivityCreated
is called.

Bug: 20652673
Change-Id: Ia0e174f0686ac0abb601c591f3774c9152b785fa
2015-04-30 12:02:47 -07: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
e0bf739ddf Merge "[WifiSettings] Add progress bar when scanning" into mnc-dev 2015-04-30 17:53:20 +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
5982d17a26 Merge "Settings: Do not disturb automatic rule updates." into mnc-dev 2015-04-30 15:45:57 +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
Zoltan Szatmary-Ban
e03d88621c Forward WiFi settings intents to primary profile
If an implicit WiFi settings intent is sent by a managed profile it is received
by the respective receiver in the primary profile.

Bug: 20005260
Change-Id: Ib46aafe1f5b5ef3acb8ed0d7e53898630ea2cb60
2015-04-30 14:35:54 +01:00