OSDN Git Service

android-x86/packages-apps-Settings.git
9 years agoam 7e8b3541: am d7cba372: Merge "Fix Signal strength display issue in Settings."...
Sanket Padawe [Fri, 8 May 2015 23:47:47 +0000 (23:47 +0000)]
am 7e8b3541: am d7cba372: Merge "Fix Signal strength display issue in Settings." into mnc-dev

* commit '7e8b35411e80fd3a77d27e43233aa03a7c0fc89c':
  Fix Signal strength display issue in Settings.

9 years agoam d7cba372: Merge "Fix Signal strength display issue in Settings." into mnc-dev
Sanket Padawe [Fri, 8 May 2015 23:41:30 +0000 (23:41 +0000)]
am d7cba372: Merge "Fix Signal strength display issue in Settings." into mnc-dev

* commit 'd7cba372c6cdeeb8da74de0ae60a2b30ab5f4e25':
  Fix Signal strength display issue in Settings.

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 agoam ec811217: am 3c4bf826: Merge "Settings: Use new EventInfo.ANY_CALENDAR constant...
John Spurlock [Fri, 8 May 2015 22:46:29 +0000 (22:46 +0000)]
am ec811217: am 3c4bf826: Merge "Settings: Use new EventInfo.ANY_CALENDAR constant." into mnc-dev

* commit 'ec81121770aa89c18c0e114e4c47a399b2c016c9':
  Settings: Use new EventInfo.ANY_CALENDAR constant.

9 years agoam d068dba8: am 7b998977: Merge "Settings: New DND access settings page." into mnc-dev
John Spurlock [Fri, 8 May 2015 22:46:28 +0000 (22:46 +0000)]
am d068dba8: am 7b998977: Merge "Settings: New DND access settings page." into mnc-dev

* commit 'd068dba82a539dbc3b24ad31be3a192c7e4e2ff9':
  Settings: New DND access settings page.

9 years agoam 3c4bf826: Merge "Settings: Use new EventInfo.ANY_CALENDAR constant." into mnc-dev
John Spurlock [Fri, 8 May 2015 22:35:42 +0000 (22:35 +0000)]
am 3c4bf826: Merge "Settings: Use new EventInfo.ANY_CALENDAR constant." into mnc-dev

* commit '3c4bf826e704a42ce3d460537a0adf6263c2d503':
  Settings: Use new EventInfo.ANY_CALENDAR constant.

9 years agoam 7b998977: Merge "Settings: New DND access settings page." into mnc-dev
John Spurlock [Fri, 8 May 2015 22:35:41 +0000 (22:35 +0000)]
am 7b998977: Merge "Settings: New DND access settings page." into mnc-dev

* commit '7b9989773b1b6ffc415300c095bde51b5c90ff71':
  Settings: New DND access settings page.

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 agoam 1cfc32d1: am 69fb78e2: Merge "Track keystore password method changes" into mnc-dev
Chad Brubaker [Fri, 8 May 2015 22:22:03 +0000 (22:22 +0000)]
am 1cfc32d1: am 69fb78e2: Merge "Track keystore password method changes" into mnc-dev

* commit '1cfc32d1a59ab641bcb90425b6c5f2c221f14e23':
  Track keystore password method changes

9 years agoam 69fb78e2: Merge "Track keystore password method changes" into mnc-dev
Chad Brubaker [Fri, 8 May 2015 22:14:04 +0000 (22:14 +0000)]
am 69fb78e2: Merge "Track keystore password method changes" into mnc-dev

* commit '69fb78e27b61c91d98a9c90a4680e35e72d0e73c':
  Track keystore password method changes

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 agoam cf2814be: am 173d658b: Merge "Button that goes from app info details to app info...
Jason Monk [Fri, 8 May 2015 20:10:51 +0000 (20:10 +0000)]
am cf2814be: am 173d658b: Merge "Button that goes from app info details to app info" into mnc-dev

* commit 'cf2814bec405f61b5fa8d652a85e6d743734ecbb':
  Button that goes from app info details to app info

9 years agoam 173d658b: Merge "Button that goes from app info details to app info" into mnc-dev
Jason Monk [Fri, 8 May 2015 19:58:26 +0000 (19:58 +0000)]
am 173d658b: Merge "Button that goes from app info details to app info" into mnc-dev

* commit '173d658babe0bcb6add829d1621550cebeed2296':
  Button that goes from app info details to app info

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 agoam b8555ea9: am 9e1ea4b1: Merge "Choose correct network template for data history...
Jason Monk [Fri, 8 May 2015 18:32:10 +0000 (18:32 +0000)]
am b8555ea9: am 9e1ea4b1: Merge "Choose correct network template for data history" into mnc-dev

* commit 'b8555ea90afb2ff1271f9a1a396eeb7d54211e71':
  Choose correct network template for data history

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

* commit '9e1ea4b121d200e4338bf271e832c3f2e3613b20':
  Choose correct network template for data history

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 agoam 59687613: am 4d1efa0e: Merge "Fix crash on unistalling app" into mnc-dev
Jason Monk [Fri, 8 May 2015 17:37:11 +0000 (17:37 +0000)]
am 59687613: am 4d1efa0e: Merge "Fix crash on unistalling app" into mnc-dev

* commit '59687613049588d4d09af0a8f5e5da5287a14657':
  Fix crash on unistalling app

9 years agoam 4d1efa0e: Merge "Fix crash on unistalling app" into mnc-dev
Jason Monk [Fri, 8 May 2015 17:24:09 +0000 (17:24 +0000)]
am 4d1efa0e: Merge "Fix crash on unistalling app" into mnc-dev

* commit '4d1efa0e6da65f20f1baf827abee97df6551c277':
  Fix crash on unistalling app

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 agoam 4ba24b92: am 7ef58584: Merge "Fix crash in settings -> apps after adding profile...
Jason Monk [Fri, 8 May 2015 16:40:37 +0000 (16:40 +0000)]
am 4ba24b92: am 7ef58584: Merge "Fix crash in settings -> apps after adding profile" into mnc-dev

* commit '4ba24b92c75d80847247432044bd3a86c3154641':
  Fix crash in settings -> apps after adding profile

9 years agoam 3704367e: am c0df6623: Merge "Add settings for persisting the mobile data connecti...
Erik Kline [Fri, 8 May 2015 16:40:22 +0000 (16:40 +0000)]
am 3704367e: am c0df6623: Merge "Add settings for persisting the mobile data connection." into mnc-dev

* commit '3704367ec32a3d80014e20ff372fd24d937c118c':
  Add settings for persisting the mobile data connection.

9 years agoam 4053c047: am 6a03d113: Merge "Making the behavior deterministic when the IME picke...
Yohei Yukawa [Fri, 8 May 2015 16:38:40 +0000 (16:38 +0000)]
am 4053c047: am 6a03d113: Merge "Making the behavior deterministic when the IME picker is shown." into mnc-dev

* commit '4053c047f2dd818a663f8938fa896a6c4f933ec7':
  Making the behavior deterministic when the IME picker is shown.

9 years agoam 76215816: am 99245d13: Merge "Add user selectable Default Browser feature - part...
Fabrice Di Meglio [Fri, 8 May 2015 16:38:11 +0000 (16:38 +0000)]
am 76215816: am 99245d13: Merge "Add user selectable Default Browser feature - part 4" into mnc-dev

* commit '7621581682e595ce610d8a3a7e70ce7c483ad01b':
  Add user selectable Default Browser feature - part 4

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 agoam 7ef58584: Merge "Fix crash in settings -> apps after adding profile" into mnc-dev
Jason Monk [Fri, 8 May 2015 14:59:42 +0000 (14:59 +0000)]
am 7ef58584: Merge "Fix crash in settings -> apps after adding profile" into mnc-dev

* commit '7ef58584e66e077ee7930ae100cc1a1915cd7b1a':
  Fix crash in settings -> apps after adding profile

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 agoam c0df6623: Merge "Add settings for persisting the mobile data connection." into...
Erik Kline [Fri, 8 May 2015 09:23:38 +0000 (09:23 +0000)]
am c0df6623: Merge "Add settings for persisting the mobile data connection." into mnc-dev

* commit 'c0df6623a0eb0ebbdb965111269b96d9f4a4b976':
  Add settings for persisting the mobile data connection.

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 agoam 6a03d113: Merge "Making the behavior deterministic when the IME picker is shown...
Yohei Yukawa [Thu, 7 May 2015 23:28:11 +0000 (23:28 +0000)]
am 6a03d113: Merge "Making the behavior deterministic when the IME picker is shown." into mnc-dev

* commit '6a03d11328da5f2ce7c685f613d706fbfa589fdd':
  Making the behavior deterministic when the IME picker is shown.

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 agoam 99245d13: Merge "Add user selectable Default Browser feature - part 4" into mnc-dev
Fabrice Di Meglio [Thu, 7 May 2015 22:47:47 +0000 (22:47 +0000)]
am 99245d13: Merge "Add user selectable Default Browser feature - part 4" into mnc-dev

* commit '99245d13e9ac2fabe1300929a3a669f1d186070e':
  Add user selectable Default Browser feature - part 4

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 agoam 787f00f9: am 92331e51: Avoid SElinux denial accessing IMEI information
Raju Yadav [Thu, 7 May 2015 21:21:15 +0000 (21:21 +0000)]
am 787f00f9: am 92331e51: Avoid SElinux denial accessing IMEI information

* commit '787f00f99255b63176f599b3e6c5ff13b48cf884':
  Avoid SElinux denial accessing IMEI information

9 years agoam 92331e51: Avoid SElinux denial accessing IMEI information
Raju Yadav [Thu, 7 May 2015 21:09:22 +0000 (21:09 +0000)]
am 92331e51: Avoid SElinux denial accessing IMEI information

* commit '92331e51eadb717a15626083b52a820c236dc1cd':
  Avoid SElinux denial accessing IMEI information

9 years agoam 62b8ffae: am 97cebec1: Merge "Detect uninstalled apps during resume" into mnc-dev
Jason Monk [Thu, 7 May 2015 20:59:36 +0000 (20:59 +0000)]
am 62b8ffae: am 97cebec1: Merge "Detect uninstalled apps during resume" into mnc-dev

* commit '62b8ffaec80eef1c2b0060cc2128b45dfc0bea28':
  Detect uninstalled apps during resume

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 agoam 97cebec1: Merge "Detect uninstalled apps during resume" into mnc-dev
Jason Monk [Thu, 7 May 2015 20:45:40 +0000 (20:45 +0000)]
am 97cebec1: Merge "Detect uninstalled apps during resume" into mnc-dev

* commit '97cebec1a0975e1a85a4bbb0024e403c655722a8':
  Detect uninstalled apps during resume

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 agoam c6f3d75d: am f4db340d: Consistently use weight to get average mem usage
Jason Monk [Thu, 7 May 2015 20:14:57 +0000 (20:14 +0000)]
am c6f3d75d: am f4db340d: Consistently use weight to get average mem usage

* commit 'c6f3d75d777bc0dd2f30b1cb98e8a434d96a3e7b':
  Consistently use weight to get average mem usage

9 years agoam f4db340d: Consistently use weight to get average mem usage
Jason Monk [Thu, 7 May 2015 20:07:46 +0000 (20:07 +0000)]
am f4db340d: Consistently use weight to get average mem usage

* commit 'f4db340daeb50572d7e0ab12f4745affae8b567f':
  Consistently use weight to get average mem usage

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 agoam 216d9bcb: am e2d63fef: Merge "Updates/fixes to memory settings" into mnc-dev
Jason Monk [Thu, 7 May 2015 19:11:27 +0000 (19:11 +0000)]
am 216d9bcb: am e2d63fef: Merge "Updates/fixes to memory settings" into mnc-dev

* commit '216d9bcb7f58e953d75d919153661e3d61af8109':
  Updates/fixes to memory settings

9 years agoam ad28b967: am 68d6d465: Merge "Always start storage list sorting by size" into...
Jason Monk [Thu, 7 May 2015 19:11:26 +0000 (19:11 +0000)]
am ad28b967: am 68d6d465: Merge "Always start storage list sorting by size" into mnc-dev

* commit 'ad28b9671664fb4468184a6cd293e0226015758e':
  Always start storage list sorting by size

9 years agoam e2d63fef: Merge "Updates/fixes to memory settings" into mnc-dev
Jason Monk [Thu, 7 May 2015 18:54:51 +0000 (18:54 +0000)]
am e2d63fef: Merge "Updates/fixes to memory settings" into mnc-dev

* commit 'e2d63fef3ccbfd3001b7e794b3ee1203fc1c77af':
  Updates/fixes to memory settings

9 years agoam 68d6d465: Merge "Always start storage list sorting by size" into mnc-dev
Jason Monk [Thu, 7 May 2015 18:54:50 +0000 (18:54 +0000)]
am 68d6d465: Merge "Always start storage list sorting by size" into mnc-dev

* commit '68d6d465746a6dcec6f7e0a44fadae19b886fa42':
  Always start storage list sorting by size

9 years agoam a6867f55: Merge "Avoid SElinux denial accessing IMEI information"
Nick Kralevich [Thu, 7 May 2015 18:44:41 +0000 (18:44 +0000)]
am a6867f55: Merge "Avoid SElinux denial accessing IMEI information"

* commit 'a6867f55e5a46eda1013e466a7bb5676fcebe67e':
  Avoid SElinux denial accessing IMEI information

9 years agoMerge "Avoid SElinux denial accessing IMEI information"
Nick Kralevich [Thu, 7 May 2015 18:21:18 +0000 (18:21 +0000)]
Merge "Avoid SElinux denial accessing IMEI information"

9 years agoam 38c88336: am 840002d6: Merge "Use theme colors in battery stats widget" into mnc-dev
Alan Viverette [Thu, 7 May 2015 17:48:37 +0000 (17:48 +0000)]
am 38c88336: am 840002d6: Merge "Use theme colors in battery stats widget" into mnc-dev

* commit '38c883363d6d3845dc5746f7dd5ebd9ba8b4a304':
  Use theme colors in battery stats widget

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 agoam 840002d6: Merge "Use theme colors in battery stats widget" into mnc-dev
Alan Viverette [Thu, 7 May 2015 17:30:02 +0000 (17:30 +0000)]
am 840002d6: Merge "Use theme colors in battery stats widget" into mnc-dev

* commit '840002d66c19af51618489850c7ccea465cd23f8':
  Use theme colors in battery stats widget

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.

Change-Id: Id778bbadc8141167d679177b39e1d7a540d5752c

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 agoam bb70e07f: am 59de14e2: Merge "Fix app headers in settings" into mnc-dev
Jason Monk [Thu, 7 May 2015 14:54:49 +0000 (14:54 +0000)]
am bb70e07f: am 59de14e2: Merge "Fix app headers in settings" into mnc-dev

* commit 'bb70e07f8354e3f466a7b93bf11669c5d91de9eb':
  Fix app headers in settings

9 years agoam 59de14e2: Merge "Fix app headers in settings" into mnc-dev
Jason Monk [Thu, 7 May 2015 13:17:43 +0000 (13:17 +0000)]
am 59de14e2: Merge "Fix app headers in settings" into mnc-dev

* commit '59de14e2197e84baf663fa700ee7b2323fbaef6b':
  Fix app headers in settings

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 agoam 1df96a42: am 92d6b09e: Replace WIFI_DISPLAY_SETTINGS with CAST_SETTINGS.
Jeff Brown [Thu, 7 May 2015 05:28:57 +0000 (05:28 +0000)]
am 1df96a42: am 92d6b09e: Replace WIFI_DISPLAY_SETTINGS with CAST_SETTINGS.

* commit '1df96a424c56ca502e6cafb6fc195a87f464f2de':
  Replace WIFI_DISPLAY_SETTINGS with CAST_SETTINGS.

9 years agoam d527aa0b: am 673db350: Merge "Settings: Add setting to mute wireless charging...
John Spurlock [Thu, 7 May 2015 05:27:55 +0000 (05:27 +0000)]
am d527aa0b: am 673db350: Merge "Settings:  Add setting to mute wireless charging sound." into mnc-dev

* commit 'd527aa0bf55ab70d65c05836ee246302946a3b45':
  Settings:  Add setting to mute wireless charging sound.

9 years agoam 7ff3fbd0: am 39ac24df: Merge "Fix SimStatus crash in Settings." into mnc-dev
Sanket Padawe [Thu, 7 May 2015 05:26:47 +0000 (05:26 +0000)]
am 7ff3fbd0: am 39ac24df: Merge "Fix SimStatus crash in Settings." into mnc-dev

* commit '7ff3fbd01e972f5436c45b72633909fd5e73a46d':
  Fix SimStatus crash in Settings.

9 years agoam a19723b4: am b7a1b5c3: Merge "Saved networks summary strings." into mnc-dev
Sanket Padawe [Thu, 7 May 2015 05:25:30 +0000 (05:25 +0000)]
am a19723b4: am b7a1b5c3: Merge "Saved networks summary strings." into mnc-dev

* commit 'a19723b4a6c18e47f2126075967d20267c3190a2':
  Saved networks summary strings.

9 years agoam 92d6b09e: Replace WIFI_DISPLAY_SETTINGS with CAST_SETTINGS.
Jeff Brown [Thu, 7 May 2015 01:41:10 +0000 (01:41 +0000)]
am 92d6b09e: Replace WIFI_DISPLAY_SETTINGS with CAST_SETTINGS.

* commit '92d6b09ebbb7c810a52f1a69a376d06277820a4b':
  Replace WIFI_DISPLAY_SETTINGS with CAST_SETTINGS.

9 years agoam 673db350: Merge "Settings: Add setting to mute wireless charging sound." into...
John Spurlock [Thu, 7 May 2015 00:11:17 +0000 (00:11 +0000)]
am 673db350: Merge "Settings:  Add setting to mute wireless charging sound." into mnc-dev

* commit '673db350c3315df2c3a0ef70092a1d63fd8021c7':
  Settings:  Add setting to mute wireless charging sound.

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 agoam 39ac24df: Merge "Fix SimStatus crash in Settings." into mnc-dev
Sanket Padawe [Wed, 6 May 2015 22:14:28 +0000 (22:14 +0000)]
am 39ac24df: Merge "Fix SimStatus crash in Settings." into mnc-dev

* commit '39ac24df7913546d8f2db3f17bc3d3dca5638e4a':
  Fix SimStatus crash in Settings.

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 agoam b7a1b5c3: Merge "Saved networks summary strings." into mnc-dev
Sanket Padawe [Wed, 6 May 2015 21:07:20 +0000 (21:07 +0000)]
am b7a1b5c3: Merge "Saved networks summary strings." into mnc-dev

* commit 'b7a1b5c310ccb33b6999041f2ba1f99d98cc0282':
  Saved networks summary strings.

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 agoam 11710005: am 5a817c6b: Forward ACTION_OTHER_SOUND_SETTINGS intent to primary profile.
Sudheer Shanka [Wed, 6 May 2015 17:01:17 +0000 (17:01 +0000)]
am 11710005: am 5a817c6b: Forward ACTION_OTHER_SOUND_SETTINGS intent to primary profile.

* commit '11710005b8c257a1792117bdebf914e9cccecbb3':
  Forward ACTION_OTHER_SOUND_SETTINGS intent to primary profile.

9 years agoam 5a817c6b: Forward ACTION_OTHER_SOUND_SETTINGS intent to primary profile.
Sudheer Shanka [Wed, 6 May 2015 16:54:12 +0000 (16:54 +0000)]
am 5a817c6b: Forward ACTION_OTHER_SOUND_SETTINGS intent to primary profile.

* commit '5a817c6bcc14033b08ad8ddec10625e4352ef194':
  Forward ACTION_OTHER_SOUND_SETTINGS intent to primary profile.

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 agoam 496aff37: am 0d2a8d20: Settings: Migrate calls & messages priority settings.
John Spurlock [Wed, 6 May 2015 00:45:52 +0000 (00:45 +0000)]
am 496aff37: am 0d2a8d20: Settings: Migrate calls & messages priority settings.

* commit '496aff371ed5cf5b73b5031e0fae809891155b18':
  Settings: Migrate calls & messages priority settings.

9 years agoam 0d2a8d20: Settings: Migrate calls & messages priority settings.
John Spurlock [Wed, 6 May 2015 00:39:41 +0000 (00:39 +0000)]
am 0d2a8d20: Settings: Migrate calls & messages priority settings.

* commit '0d2a8d204bb7d62834d51393a1d4a6ddaa7753f8':
  Settings: Migrate calls & messages priority settings.

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 agoam 5aa17988: am faadcd60: Settings UI for SIM access profile (1/2)
Casper Bonde [Tue, 5 May 2015 19:00:58 +0000 (19:00 +0000)]
am 5aa17988: am faadcd60: Settings UI for SIM access profile (1/2)

* commit '5aa179886c0379ac6647cdaeb1c16634c827f840':
  Settings UI for SIM access profile (1/2)

9 years agoam efe5a5c2: am 3342d762: Merge "VPN: Convert current-context IPCs to user context...
Robin Lee [Tue, 5 May 2015 19:00:57 +0000 (19:00 +0000)]
am efe5a5c2: am 3342d762: Merge "VPN: Convert current-context IPCs to user context" into mnc-dev

* commit 'efe5a5c2d29cec37cb16bec4511a6f7cf8562ff9':
  VPN: Convert current-context IPCs to user context

9 years agoam 5e8ce3d9: am 229d06a8: Removed some dead Face Unlock code.
Brian Colonna [Tue, 5 May 2015 19:00:56 +0000 (19:00 +0000)]
am 5e8ce3d9: am 229d06a8: Removed some dead Face Unlock code.

* commit '5e8ce3d9a38e9e6efd6c69915ce5f87aed049252':
  Removed some dead Face Unlock code.

9 years agoam 604f4b88: am 42ae11d4: Merge "Settings: Remove zenswitch from DND settings page...
John Spurlock [Tue, 5 May 2015 19:00:55 +0000 (19:00 +0000)]
am 604f4b88: am 42ae11d4: Merge "Settings: Remove zenswitch from DND settings page." into mnc-dev

* commit '604f4b8872a8809b46f944206ec305ad2bd938ec':
  Settings: Remove zenswitch from DND settings page.

9 years agoam 7c84eecc: am a924f3d6: Merge "Settings: Calendar event zen rule string updates...
John Spurlock [Tue, 5 May 2015 19:00:53 +0000 (19:00 +0000)]
am 7c84eecc: am a924f3d6: Merge "Settings: Calendar event zen rule string updates." into mnc-dev

* commit '7c84eecc31972a7366efd4a02741ca29328802a2':
  Settings: Calendar event zen rule string updates.

9 years agoam ffce3b4e: am aea57bab: Merge "Forward WiFi settings intents to primary profile...
Zoltan Szatmary-Ban [Tue, 5 May 2015 19:00:52 +0000 (19:00 +0000)]
am ffce3b4e: am aea57bab: Merge "Forward WiFi settings intents to primary profile" into mnc-dev

* commit 'ffce3b4eaa55c69710911e0898517f884f3edbff':
  Forward WiFi settings intents to primary profile

9 years agoam faadcd60: Settings UI for SIM access profile (1/2)
Casper Bonde [Tue, 5 May 2015 18:46:43 +0000 (18:46 +0000)]
am faadcd60: Settings UI for SIM access profile (1/2)

* commit 'faadcd60e7ab8fa6eb9b5be7be907129bd3f8575':
  Settings UI for SIM access profile (1/2)

9 years agoam 3342d762: Merge "VPN: Convert current-context IPCs to user context" into mnc-dev
Robin Lee [Tue, 5 May 2015 18:45:57 +0000 (18:45 +0000)]
am 3342d762: Merge "VPN: Convert current-context IPCs to user context" into mnc-dev

* commit '3342d762e98996549aa5cae02ccdc3238eb3a33d':
  VPN: Convert current-context IPCs to user context