OSDN Git Service

android-x86/packages-apps-Settings.git
9 years agoMerge "[WifiSetup] Use adjustResize for alert dialogs during Setup" into mnc-dev
Maurice Lam [Tue, 12 May 2015 18:03:34 +0000 (18:03 +0000)]
Merge "[WifiSetup] Use adjustResize for alert dialogs during Setup" into mnc-dev

9 years agoFix tuner key
Jason Monk [Tue, 12 May 2015 15:04:47 +0000 (11:04 -0400)]
Fix tuner key

Change-Id: I4bddf218dc34516134bd190ebf8c0f1c7b1a6544

9 years agoMerge "Add SystemUI Tuner Control" into mnc-dev
Jason Monk [Tue, 12 May 2015 15:03:40 +0000 (15:03 +0000)]
Merge "Add SystemUI Tuner Control" into mnc-dev

9 years agoAdd SystemUI Tuner Control
Jason Monk [Mon, 11 May 2015 20:58:34 +0000 (16:58 -0400)]
Add SystemUI Tuner Control

Change-Id: I321c3263612c752409beb46f4c96826954b96e26

9 years agoMerge "Add tap to wake setting" into mnc-dev
Jason Monk [Tue, 12 May 2015 14:35:12 +0000 (14:35 +0000)]
Merge "Add tap to wake setting" into mnc-dev

9 years agoAvoid SElinux denial accessing SIM card lock
Hemanth kumar B [Fri, 6 Feb 2015 10:13:26 +0000 (11:13 +0100)]
Avoid SElinux denial accessing SIM card lock

This change avoids the following SELinux denial:

  W/SharedPreferenc(28238): type=1400 audit(0.0:8): avc: denied\
  { search } for name="com.android.settings" dev="mmcblk0p25"\
  ino=8209 scontext=u:r:radio:s0 tcontext=u:object_r:system_app\
  _data_file:s0 tclass=dir op_res=-13 ppid=318 pcomm="main"\
  tgid=1850 tgcomm="m.android.phone"

When accessing Settings->Security->Set up SIM card lock.

There is really no need to store this information in
SharedPreferences anyway.

(cherrypicked from commit bef7221a7dc1a5827903e62bf3b02a42e52f5066)

Change-Id: I3ba30d5d5e2c5b3c379397fbb06325101acaf490

9 years agoMerge "Update strings for ignore optimizations control" into mnc-dev
Jason Monk [Mon, 11 May 2015 20:03:45 +0000 (20:03 +0000)]
Merge "Update strings for ignore optimizations control" into mnc-dev

9 years agoUpdate strings for ignore optimizations control
Jason Monk [Mon, 11 May 2015 19:48:11 +0000 (15:48 -0400)]
Update strings for ignore optimizations control

Bug: 19991702
Change-Id: Ie5b54fd70176cfceb8b88cf18a9974321ba84c28

9 years agoMerge "Simplify Zen mode voice activity." into mnc-dev
Barnaby James [Mon, 11 May 2015 18:15:02 +0000 (18:15 +0000)]
Merge "Simplify Zen mode voice activity." into mnc-dev

9 years agoSimplify Zen mode voice activity.
Barnaby James [Sun, 10 May 2015 23:24:05 +0000 (16:24 -0700)]
Simplify Zen mode voice activity.

Zen mode voice activity now only sets the notification mode to alarms mode
or off. A duration may be specified if it was in the original intent.

Change-Id: Ica472ca9c6dcbce473832f4f922baf225df4951b
Bug: 21024455

9 years agoMerge "Import translations. DO NOT MERGE" into mnc-dev
Geoff Mendal [Mon, 11 May 2015 16:10:12 +0000 (16:10 +0000)]
Merge "Import translations. DO NOT MERGE" into mnc-dev

9 years agoSettings: Migrate notification access screens to switch prefs.
John Spurlock [Mon, 11 May 2015 15:16:37 +0000 (11:16 -0400)]
Settings: Migrate notification access screens to switch prefs.

Bug: 20916418
Change-Id: I729bc3a6f853f15780f12e7d7c9f337447e399c4

9 years agoMerge "log more settings actions" into mnc-dev
Chris Wren [Mon, 11 May 2015 15:07:17 +0000 (15:07 +0000)]
Merge "log more settings actions" into mnc-dev

9 years agoImport translations. DO NOT MERGE
Geoff Mendal [Mon, 11 May 2015 14:50:14 +0000 (07:50 -0700)]
Import translations. DO NOT MERGE

Change-Id: I57e694a0f716f9c8a45493cd1b4a2ad9d6d4a7ef
Auto-generated-cl: translation import

9 years agoMerge "[LockScreenSetup] Fix "Choose Lock PIN" title" into mnc-dev
Maurice Lam [Sat, 9 May 2015 00:04:32 +0000 (00:04 +0000)]
Merge "[LockScreenSetup] Fix "Choose Lock PIN" title" into mnc-dev

9 years agoMerge "Fix Signal strength display issue in Settings." into mnc-dev
Sanket Padawe [Fri, 8 May 2015 23:32:48 +0000 (23:32 +0000)]
Merge "Fix Signal strength display issue in Settings." into mnc-dev

9 years agoFix Signal strength display issue in Settings.
Sanket Padawe [Fri, 8 May 2015 23:31:35 +0000 (16:31 -0700)]
Fix Signal strength display issue in Settings.

Bug: 20821065
Change-Id: Ib98e7b80f5ee331ef0adb8df706bb697f9fff008

9 years agolog more settings actions
Chris Wren [Fri, 8 May 2015 21:10:01 +0000 (17:10 -0400)]
log more settings actions

  airplane mode
  bluetooth
  cell data
  do not disturb

Bug: 20264417
Change-Id: I726033a126fba9f9dffc916806d636feea04033b

9 years agoMerge "Settings: Use new EventInfo.ANY_CALENDAR constant." into mnc-dev
John Spurlock [Fri, 8 May 2015 22:29:09 +0000 (22:29 +0000)]
Merge "Settings: Use new EventInfo.ANY_CALENDAR constant." into mnc-dev

9 years agoMerge "Settings: New DND access settings page." into mnc-dev
John Spurlock [Fri, 8 May 2015 22:28:49 +0000 (22:28 +0000)]
Merge "Settings: New DND access settings page." into mnc-dev

9 years ago[WifiSetup] Use adjustResize for alert dialogs during Setup
Maurice Lam [Fri, 8 May 2015 22:01:48 +0000 (15:01 -0700)]
[WifiSetup] Use adjustResize for alert dialogs during Setup

Created theme ThemeOverlay.AlertDialog that inherits from the default
ThemeOverlay.Material.Dialog.Alert and sets the windowSoftInputMode
to adjustResize.

Bug: 20953227
Change-Id: I20af124b6d92bff3a5807b2f8475acda92c90208

9 years agoMerge "Track keystore password method changes" into mnc-dev
Chad Brubaker [Fri, 8 May 2015 21:51:03 +0000 (21:51 +0000)]
Merge "Track keystore password method changes" into mnc-dev

9 years agoSettings: Use new EventInfo.ANY_CALENDAR constant.
John Spurlock [Fri, 8 May 2015 21:37:23 +0000 (17:37 -0400)]
Settings: Use new EventInfo.ANY_CALENDAR constant.

Bug: 20064962
Change-Id: I08a8c5feb61bfd440fc6a297d97de4abba5b19b3

9 years ago[LockScreenSetup] Fix "Choose Lock PIN" title
Maurice Lam [Fri, 8 May 2015 00:22:09 +0000 (17:22 -0700)]
[LockScreenSetup] Fix "Choose Lock PIN" title

Set the header text for SetupChooseLockPassword in onViewCreated
after the superclass has set the activity title.

Bug: 20861117
Change-Id: I27e4f06d16afd9a02647f8c10a76518f618bd6b8

9 years agoMerge "Button that goes from app info details to app info" into mnc-dev
Jason Monk [Fri, 8 May 2015 19:47:27 +0000 (19:47 +0000)]
Merge "Button that goes from app info details to app info" into mnc-dev

9 years agoButton that goes from app info details to app info
Jason Monk [Fri, 8 May 2015 19:03:14 +0000 (15:03 -0400)]
Button that goes from app info details to app info

This info button is shown on the header of all app detail pages.
This button is hidden when coming from app info, to avoid allowing
users to go in circles.

Since app notification details had a settings button where the new
info button goes, the app notification settings will move down to
be a preference (this matches the usage access screen UX).

Also fix a bug in launching app notification settings for managed
profiles.

Bug: 20633669
Change-Id: Idbb4f7c3326b4c6b0a19559b722ee0406eaba6c0

9 years agoMerge "Choose correct network template for data history" into mnc-dev
Jason Monk [Fri, 8 May 2015 18:13:13 +0000 (18:13 +0000)]
Merge "Choose correct network template for data history" into mnc-dev

9 years agoSettings: New DND access settings page.
John Spurlock [Thu, 7 May 2015 21:45:43 +0000 (17:45 -0400)]
Settings: New DND access settings page.

 - New advanced notification settings subpage for managing apps
   that have requested the ability to manage notification policy.
 - Create new "Advanced" section at the bottom of notification settings
   for this and the existing Notification access settings page.

Bug: 18298798
Change-Id: Ib415e634980d37d6492799f67a6619700ee2a01c

9 years agoMerge "Fix crash on unistalling app" into mnc-dev
Jason Monk [Fri, 8 May 2015 17:16:41 +0000 (17:16 +0000)]
Merge "Fix crash on unistalling app" into mnc-dev

9 years agoFix crash on unistalling app
Jason Monk [Fri, 8 May 2015 15:37:01 +0000 (11:37 -0400)]
Fix crash on unistalling app

Only update the battery info if the app exists.

Bug: 20918104
Change-Id: I61481be53cfc72d49868f14a940a09c83f7a5cc2

9 years agoChoose correct network template for data history
Jason Monk [Fri, 8 May 2015 15:24:03 +0000 (11:24 -0400)]
Choose correct network template for data history

Bug: 19921796
Change-Id: I90376ed0314c47fcbee21c81b85f60d3cc3312a6

9 years agoMerge "Fix crash in settings -> apps after adding profile" into mnc-dev
Jason Monk [Fri, 8 May 2015 14:48:54 +0000 (14:48 +0000)]
Merge "Fix crash in settings -> apps after adding profile" into mnc-dev

9 years agoFix crash in settings -> apps after adding profile
Jason Monk [Fri, 8 May 2015 14:18:48 +0000 (10:18 -0400)]
Fix crash in settings -> apps after adding profile

Bug: 20652411
Change-Id: I766f99ee520ab106ec2765c77057042ed14e8fed

9 years agoMerge "Add settings for persisting the mobile data connection." into mnc-dev
Erik Kline [Fri, 8 May 2015 08:12:19 +0000 (08:12 +0000)]
Merge "Add settings for persisting the mobile data connection." into mnc-dev

9 years agoMerge "Making the behavior deterministic when the IME picker is shown." into mnc-dev
Yohei Yukawa [Thu, 7 May 2015 23:20:26 +0000 (23:20 +0000)]
Merge "Making the behavior deterministic when the IME picker is shown." into mnc-dev

9 years agoMaking the behavior deterministic when the IME picker is shown.
Seigo Nonaka [Tue, 5 May 2015 00:31:00 +0000 (17:31 -0700)]
Making the behavior deterministic when the IME picker is shown.

In the language & input settings, the auxiliary IME subtypes have been
hidden since they should not be a default.  With Id156c85535a22, now we
can explicitly control the behavior of input method picker.
Note the this CL should not change any user visible behaviors.

Bug: 20763994
Change-Id: I9f797d07ba02363fab58ceb9aecb3cc11fbc407e

9 years agoTrack keystore password method changes
Chad Brubaker [Thu, 7 May 2015 17:29:18 +0000 (10:29 -0700)]
Track keystore password method changes

Change-Id: I324914c00195d762cbaa8c63084e41fa796b7df8

9 years agoMerge "Add user selectable Default Browser feature - part 4" into mnc-dev
Fabrice Di Meglio [Thu, 7 May 2015 22:37:05 +0000 (22:37 +0000)]
Merge "Add user selectable Default Browser feature - part 4" into mnc-dev

9 years agoAdd user selectable Default Browser feature - part 4
Fabrice Di Meglio [Thu, 7 May 2015 18:52:04 +0000 (11:52 -0700)]
Add user selectable Default Browser feature - part 4

- refresh Browser list depending on package installation / removal

See bug #20144393

Change-Id: I529f6e0bd8b5bd4cae1dea9479acfca9cf9a6b26

9 years agoAvoid SElinux denial accessing IMEI information
Raju Yadav [Tue, 5 May 2015 07:01:39 +0000 (09:01 +0200)]
Avoid SElinux denial accessing IMEI information

Set persistent attribute to false so preferences are not
stored in shared preferences, this avoids the SElinux
denial:

  W/SharedPreferenc( 6950): type=1400 audit(0.0:4): avc: \
  denied { search } for name="com.android.settings" \
  dev="mmcblk0p25" ino=48929 scontext=u:r:radio:s0 \
  tcontext=u:object_r:system_app_data_file:s0 tclass=dir\
  op_res=-13 ppid=319 pcomm="main" tgid=1589\
  tgcomm="m.android.phone"

Observed when entering IMEI information in:
Settings > About Phone > Status > IMEI information.

It makes no sense to store this information in shared
preferences anyway so no functinoality is lost with this
change.

(cherrypicked from commit b2ad5bb522e378a7ef63e5e9f6329217d8f2f0c2)

Change-Id: Id778bbadc8141167d679177b39e1d7a540d5752c

9 years agoMerge "Detect uninstalled apps during resume" into mnc-dev
Jason Monk [Thu, 7 May 2015 20:36:17 +0000 (20:36 +0000)]
Merge "Detect uninstalled apps during resume" into mnc-dev

9 years agoDetect uninstalled apps during resume
Jason Monk [Thu, 7 May 2015 17:41:28 +0000 (13:41 -0400)]
Detect uninstalled apps during resume

Also cleanup disabled apps check while here

Bug: 20651305
Change-Id: I5ba8f6e7aee817842bb2ae2ee825647089bcacd3

9 years agoConsistently use weight to get average mem usage
Jason Monk [Thu, 7 May 2015 19:06:48 +0000 (15:06 -0400)]
Consistently use weight to get average mem usage

Rather than just for the labels...

Also update bg mem to be converted to the same memory scale for
the bars.  Also undo some bad average calculations that only made
things worse.

Bug: 20694769
Change-Id: I676803bf76d336355441891e768ba3c228dbfbca

9 years agoMerge "Updates/fixes to memory settings" into mnc-dev
Jason Monk [Thu, 7 May 2015 17:45:39 +0000 (17:45 +0000)]
Merge "Updates/fixes to memory settings" into mnc-dev

9 years agoUpdates/fixes to memory settings
Jason Monk [Thu, 7 May 2015 16:44:09 +0000 (12:44 -0400)]
Updates/fixes to memory settings

 - Update memory states to be Good performance, Ok performance, etc.
 - Update header info to be based on history rather than
   instantaneous
 - Color memory bar differently based on state
 - Fix run frequency bucketing to be correct
 - Show dialog for selecting duration, and fix duration selection
 - Update process naming to:
      - If process name is "anything:xxxx" then show "Xxxx"
      - If process name is "com.app.package.interface" then show "Interface"
      - If process name is the package name then show the app name
      - Otherwise fallback to the process name string

Bug: 20694769
Change-Id: Ic1fab28bfd2422bde84dd10bd305a4cc34be98cf

9 years agoMerge "Always start storage list sorting by size" into mnc-dev
Jason Monk [Thu, 7 May 2015 17:35:38 +0000 (17:35 +0000)]
Merge "Always start storage list sorting by size" into mnc-dev

9 years agoAlways start storage list sorting by size
Jason Monk [Thu, 7 May 2015 17:09:48 +0000 (13:09 -0400)]
Always start storage list sorting by size

Bug: 20075068
Change-Id: I50a39decaa61bf7c3489243924c0d3928c4fe2ce

9 years agoMerge "Use theme colors in battery stats widget" into mnc-dev
Alan Viverette [Thu, 7 May 2015 16:57:09 +0000 (16:57 +0000)]
Merge "Use theme colors in battery stats widget" into mnc-dev

9 years agoMerge "Fix app headers in settings" into mnc-dev
Jason Monk [Thu, 7 May 2015 13:08:28 +0000 (13:08 +0000)]
Merge "Fix app headers in settings" into mnc-dev

9 years agoReplace WIFI_DISPLAY_SETTINGS with CAST_SETTINGS.
Jeff Brown [Tue, 5 May 2015 20:48:46 +0000 (13:48 -0700)]
Replace WIFI_DISPLAY_SETTINGS with CAST_SETTINGS.

Bug: 20641986
Change-Id: Ief6c0d6048abc9411f1e9930cec1edde4a582cf9

9 years agoMerge "Settings: Add setting to mute wireless charging sound." into mnc-dev
John Spurlock [Wed, 6 May 2015 22:49:03 +0000 (22:49 +0000)]
Merge "Settings:  Add setting to mute wireless charging sound." into mnc-dev

9 years agoUse theme colors in battery stats widget
Alan Viverette [Wed, 6 May 2015 22:16:51 +0000 (15:16 -0700)]
Use theme colors in battery stats widget

Bug: 20633519
Change-Id: Ia83848ff506afbddf320fa0ed3d022f9a0e884dc

9 years agoMerge "Fix SimStatus crash in Settings." into mnc-dev
Sanket Padawe [Wed, 6 May 2015 22:04:11 +0000 (22:04 +0000)]
Merge "Fix SimStatus crash in Settings." into mnc-dev

9 years agoSettings: Add setting to mute wireless charging sound.
John Spurlock [Wed, 6 May 2015 21:42:30 +0000 (17:42 -0400)]
Settings:  Add setting to mute wireless charging sound.

Bug: 19538553
Change-Id: I93228aee38f8eb035025409ce063f3050bf9bb9a

9 years agoMerge "Saved networks summary strings." into mnc-dev
Sanket Padawe [Wed, 6 May 2015 20:59:10 +0000 (20:59 +0000)]
Merge "Saved networks summary strings." into mnc-dev

9 years agoFix app headers in settings
Jason Monk [Wed, 6 May 2015 20:00:25 +0000 (16:00 -0400)]
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

9 years agoForward ACTION_OTHER_SOUND_SETTINGS intent to primary profile.
Sudheer Shanka [Wed, 6 May 2015 15:35:22 +0000 (16:35 +0100)]
Forward ACTION_OTHER_SOUND_SETTINGS intent to primary profile.

Change-Id: I55c169b280d7302c9e387f80be82ef47132798c2

9 years agoFix SimStatus crash in Settings.
Sanket Padawe [Wed, 6 May 2015 02:00:39 +0000 (19:00 -0700)]
Fix SimStatus crash in Settings.

Bug: 20862873
Change-Id: I1ae60ceb64a8af8b3f875e50dd62dfe9796192ca

9 years agoSettings: Migrate calls & messages priority settings.
John Spurlock [Tue, 5 May 2015 22:31:27 +0000 (18:31 -0400)]
Settings: Migrate calls & messages priority settings.

Bug: 18635172
Change-Id: Ib5fe3bc80590875bb4a1547013ac3444939ab6fd

9 years agoSettings UI for SIM access profile (1/2)
Casper Bonde [Tue, 5 May 2015 05:04:29 +0000 (22:04 -0700)]
Settings UI for SIM access profile (1/2)

Change-Id: Iff14295ac0eb65561a2097f25c70e8b5f8be5003

9 years agoMerge "VPN: Convert current-context IPCs to user context" into mnc-dev
Robin Lee [Tue, 5 May 2015 15:34:41 +0000 (15:34 +0000)]
Merge "VPN: Convert current-context IPCs to user context" into mnc-dev

9 years agoRemoved some dead Face Unlock code.
Brian Colonna [Fri, 1 May 2015 16:18:30 +0000 (12:18 -0400)]
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

9 years agoMerge "Settings: Remove zenswitch from DND settings page." into mnc-dev
John Spurlock [Tue, 5 May 2015 14:42:15 +0000 (14:42 +0000)]
Merge "Settings: Remove zenswitch from DND settings page." into mnc-dev

9 years agoMerge "Settings: Calendar event zen rule string updates." into mnc-dev
John Spurlock [Tue, 5 May 2015 14:42:01 +0000 (14:42 +0000)]
Merge "Settings: Calendar event zen rule string updates." into mnc-dev

9 years agoSettings: Calendar event zen rule string updates.
John Spurlock [Tue, 5 May 2015 13:59:26 +0000 (09:59 -0400)]
Settings: Calendar event zen rule string updates.

 - Remove Attendance option.
 - Use new reply value, tweak wording and summaries.

Bug: 20064962
Change-Id: I6977b494e54752fa87ea08df0ed085129a09a3d3

9 years agoSettings: Remove zenswitch from DND settings page.
John Spurlock [Tue, 5 May 2015 11:32:31 +0000 (07:32 -0400)]
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

9 years agoVPN: Convert current-context IPCs to user context
Robin Lee [Fri, 1 May 2015 16:42:30 +0000 (17:42 +0100)]
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

9 years agoMerge "Forward WiFi settings intents to primary profile" into mnc-dev
Zoltan Szatmary-Ban [Tue, 5 May 2015 10:07:06 +0000 (10:07 +0000)]
Merge "Forward WiFi settings intents to primary profile" into mnc-dev

9 years agoSaved networks summary strings.
Sanket Padawe [Tue, 5 May 2015 01:14:33 +0000 (18:14 -0700)]
Saved networks summary strings.

Bug: 20667217
Change-Id: I13930f8d0d99bc874692568de713003798b98a87

9 years agoMerge changes from topic 'mwd-merge-050415' into mnc-dev
Prerepa Viswanadham [Tue, 5 May 2015 01:05:57 +0000 (01:05 +0000)]
Merge changes from topic 'mwd-merge-050415' into mnc-dev

* changes:
  Merge commit 'ab489de' into merge_try2
  Merge commit 'dd796e8' into merge_try2

9 years agoMerge "Rename default dialer to default phone app" into mnc-dev
Yorke Lee [Tue, 5 May 2015 00:22:12 +0000 (00:22 +0000)]
Merge "Rename default dialer to default phone app" into mnc-dev

9 years agoMerge "Add high power whitelist for apps" into mnc-dev
Jason Monk [Mon, 4 May 2015 18:50:19 +0000 (18:50 +0000)]
Merge "Add high power whitelist for apps" into mnc-dev

9 years agoAdd high power whitelist for apps
Jason Monk [Wed, 29 Apr 2015 16:46:42 +0000 (12:46 -0400)]
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

9 years agoImport translations. DO NOT MERGE
Geoff Mendal [Mon, 4 May 2015 13:18:18 +0000 (06:18 -0700)]
Import translations. DO NOT MERGE

Change-Id: I9fa131ac5fdd9b014c319fa72ede5aaca13eb24c
Auto-generated-cl: translation import

9 years agoMerge commit 'ab489de' into merge_try2
Prerepa Viswanadham [Sat, 2 May 2015 01:39:38 +0000 (18:39 -0700)]
Merge commit 'ab489de' into merge_try2

9 years agoMerge commit 'dd796e8' into merge_try2
Prerepa Viswanadham [Sat, 2 May 2015 01:39:00 +0000 (18:39 -0700)]
Merge commit 'dd796e8' into merge_try2

Change-Id: I7237d936e2eea39f5d4401db06aed6cb3a3dc426

9 years agoUse curly quotes and apostrophes
Maurice Lam [Thu, 30 Apr 2015 19:26:39 +0000 (12:26 -0700)]
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

9 years agoMerge "ApnEditor changes to support bearer as a bitmask." into mnc-dev
Amit Mahajan [Fri, 1 May 2015 16:49:41 +0000 (16:49 +0000)]
Merge "ApnEditor changes to support bearer as a bitmask." into mnc-dev

9 years agoAdd MDM app name under "Work" in Accounts section of Settings.
Sudheer Shanka [Thu, 30 Apr 2015 11:18:19 +0000 (12:18 +0100)]
Add MDM app name under "Work" in Accounts section of Settings.

Bug: 20024761
Change-Id: I3fe3fd6be8a2d96b36c402ea9bde8cc782797262

9 years agoAdd settings for persisting the mobile data connection.
Erik Kline [Thu, 30 Apr 2015 03:58:08 +0000 (12:58 +0900)]
Add settings for persisting the mobile data connection.

Change-Id: I9b92104893e860e2beb63ac86d417419699c085b

9 years agoApnEditor changes to support bearer as a bitmask.
Amit Mahajan [Thu, 16 Apr 2015 17:01:25 +0000 (10:01 -0700)]
ApnEditor changes to support bearer as a bitmask.

Change-Id: I8d97f7e789a6ab75f2c5931624fe9694589fc215

9 years agoMerge "Update fingerprint settings to spec" into mnc-dev
Jorim Jaggi [Thu, 30 Apr 2015 23:54:33 +0000 (23:54 +0000)]
Merge "Update fingerprint settings to spec" into mnc-dev

9 years agoUpdate fingerprint settings to spec
Jorim Jaggi [Thu, 30 Apr 2015 00:21:32 +0000 (17:21 -0700)]
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

9 years agoMerge "Increase clip debug string limit" into mnc-dev
Chris Craik [Thu, 30 Apr 2015 23:46:45 +0000 (23:46 +0000)]
Merge "Increase clip debug string limit" into mnc-dev

9 years agoIncrease clip debug string limit
Chris Craik [Thu, 30 Apr 2015 23:45:15 +0000 (16:45 -0700)]
Increase clip debug string limit

bug:19189024

Change-Id: I6c9969032d852c6724ceb977705169ec5b8d2a5b

9 years agoMerge "Fixed an issue with back key behavior" into mnc-dev
Fyodor Kupolov [Thu, 30 Apr 2015 22:41:13 +0000 (22:41 +0000)]
Merge "Fixed an issue with back key behavior" into mnc-dev

9 years agoRename default dialer to default phone app
Yorke Lee [Thu, 30 Apr 2015 22:07:41 +0000 (15:07 -0700)]
Rename default dialer to default phone app

Change-Id: Ib6c147ba132ed5296de5e932e5dc378183ef92a3

9 years ago[WifiSetup] Use bullets in skip dialog
Maurice Lam [Thu, 30 Apr 2015 21:29:28 +0000 (14:29 -0700)]
[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

9 years agoFixed an issue with back key behavior
Fyodor Kupolov [Thu, 30 Apr 2015 00:36:36 +0000 (17:36 -0700)]
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

9 years agoMerge "[WifiSettings] Align text in Wi-Fi dialog" into mnc-dev
Maurice Lam [Thu, 30 Apr 2015 18:25:20 +0000 (18:25 +0000)]
Merge "[WifiSettings] Align text in Wi-Fi dialog" into mnc-dev

9 years agoMerge "[WifiSetup] Show MAC address in footer" into mnc-dev
Maurice Lam [Thu, 30 Apr 2015 18:24:25 +0000 (18:24 +0000)]
Merge "[WifiSetup] Show MAC address in footer" into mnc-dev

9 years agoMerge "[WifiSettings] Add progress bar when scanning" into mnc-dev
Maurice Lam [Thu, 30 Apr 2015 17:53:19 +0000 (17:53 +0000)]
Merge "[WifiSettings] Add progress bar when scanning" into mnc-dev

9 years ago[WifiSetup] Show MAC address in footer
Maurice Lam [Tue, 28 Apr 2015 01:24:16 +0000 (18:24 -0700)]
[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

9 years agoMerge "Add MDM app label string." into mnc-dev
Sudheer Shanka [Thu, 30 Apr 2015 17:08:49 +0000 (17:08 +0000)]
Merge "Add MDM app label string." into mnc-dev

9 years agoMerge "Settings: Do not disturb automatic rule updates." into mnc-dev
John Spurlock [Thu, 30 Apr 2015 15:45:53 +0000 (15:45 +0000)]
Merge "Settings: Do not disturb automatic rule updates." into mnc-dev

9 years agoMerge "Handle no peeking in app info pages" into mnc-dev
Jason Monk [Thu, 30 Apr 2015 15:33:39 +0000 (15:33 +0000)]
Merge "Handle no peeking in app info pages" into mnc-dev

9 years agoSettings: Do not disturb automatic rule updates.
John Spurlock [Thu, 30 Apr 2015 13:26:15 +0000 (09:26 -0400)]
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

9 years agoHandle no peeking in app info pages
Jason Monk [Thu, 30 Apr 2015 15:16:06 +0000 (11:16 -0400)]
Handle no peeking in app info pages

Bug: 20496400
Change-Id: Icdcb997f35497c7664af948ad7ada722835e42b4

9 years agoAdd MDM app label string.
Sudheer Shanka [Thu, 30 Apr 2015 09:51:26 +0000 (10:51 +0100)]
Add MDM app label string.

Bug: 20024761
Change-Id: I05480d36a99864653ba2eceb3561b5da242898e6

9 years agoForward WiFi settings intents to primary profile
Zoltan Szatmary-Ban [Thu, 30 Apr 2015 13:35:54 +0000 (14:35 +0100)]
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