OSDN Git Service

android-x86/packages-apps-Settings.git
9 years agoam d4c613e9: am cea2cf43: am 9331b9fa: Merge "Simplify Zen mode voice activity."...
Barnaby James [Mon, 11 May 2015 19:23:44 +0000 (19:23 +0000)]
am d4c613e9: am cea2cf43: am 9331b9fa: Merge "Simplify Zen mode voice activity." into mnc-dev

* commit 'd4c613e9970b174d0295b177c23033bab413034c':
  Simplify Zen mode voice activity.

9 years agoam cea2cf43: am 9331b9fa: Merge "Simplify Zen mode voice activity." into mnc-dev
Barnaby James [Mon, 11 May 2015 18:41:50 +0000 (18:41 +0000)]
am cea2cf43: am 9331b9fa: Merge "Simplify Zen mode voice activity." into mnc-dev

* commit 'cea2cf43c49d858366c872b5e0696368fec2e9fd':
  Simplify Zen mode voice activity.

9 years agoam 9331b9fa: Merge "Simplify Zen mode voice activity." into mnc-dev
Barnaby James [Mon, 11 May 2015 18:26:36 +0000 (18:26 +0000)]
am 9331b9fa: Merge "Simplify Zen mode voice activity." into mnc-dev

* commit '9331b9fa0d416b80423b1200a80349be77463c65':
  Simplify Zen mode voice activity.

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 agoam 1e14cff9: (-s ours) am 671371e5: (-s ours) am bff0f290: (-s ours) Merge "Import...
Geoff Mendal [Mon, 11 May 2015 16:38:33 +0000 (16:38 +0000)]
am 1e14cff9: (-s ours) am 671371e5: (-s ours) am bff0f290: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev

* commit '1e14cff96a363d7c36c606a0bb498cb5195093fd':
  Import translations. DO NOT MERGE

9 years agoam 671371e5: (-s ours) am bff0f290: (-s ours) Merge "Import translations. DO NOT...
Geoff Mendal [Mon, 11 May 2015 16:28:33 +0000 (16:28 +0000)]
am 671371e5: (-s ours) am bff0f290: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev

* commit '671371e5b4e5ceadbca289bc260be31c67529957':
  Import translations. DO NOT MERGE

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 agoam 62fe0df1: am 88be59ea: am b8099f54: Settings: Migrate notification access screens...
John Spurlock [Mon, 11 May 2015 16:18:13 +0000 (16:18 +0000)]
am 62fe0df1: am 88be59ea: am b8099f54: Settings: Migrate notification access screens to switch prefs.

* commit '62fe0df138b9987f827e46254aebfc4561b55a2d':
  Settings: Migrate notification access screens to switch prefs.

9 years agoam bff0f290: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev
Geoff Mendal [Mon, 11 May 2015 16:14:58 +0000 (16:14 +0000)]
am bff0f290: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev

* commit 'bff0f2905fd8128f49ff78bd9f15e81e97281c91':
  Import translations. DO NOT MERGE

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 agoam 88be59ea: am b8099f54: Settings: Migrate notification access screens to switch...
John Spurlock [Mon, 11 May 2015 16:09:09 +0000 (16:09 +0000)]
am 88be59ea: am b8099f54: Settings: Migrate notification access screens to switch prefs.

* commit '88be59ea389d39891ab93a6426300ecce509a971':
  Settings: Migrate notification access screens to switch prefs.

9 years agoam b8099f54: Settings: Migrate notification access screens to switch prefs.
John Spurlock [Mon, 11 May 2015 15:58:51 +0000 (15:58 +0000)]
am b8099f54: Settings: Migrate notification access screens to switch prefs.

* commit 'b8099f542c21e3ac57d250837e60ec65653ab55c':
  Settings: Migrate notification access screens to switch prefs.

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 agoam 57228e26: am cf3b4e2e: am 46c8f759: Merge "log more settings actions" into mnc-dev
Chris Wren [Mon, 11 May 2015 15:40:05 +0000 (15:40 +0000)]
am 57228e26: am cf3b4e2e: am 46c8f759: Merge "log more settings actions" into mnc-dev

* commit '57228e2639fb9c48f6763521ae358da4cf0254fc':
  log more settings actions

9 years agoam cf3b4e2e: am 46c8f759: Merge "log more settings actions" into mnc-dev
Chris Wren [Mon, 11 May 2015 15:28:04 +0000 (15:28 +0000)]
am cf3b4e2e: am 46c8f759: Merge "log more settings actions" into mnc-dev

* commit 'cf3b4e2edcafae8918392497a323f561ca94f76f':
  log more settings actions

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

* commit '46c8f759fdad71380504ad61a49031331ea39004':
  log more settings actions

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 agoImport translations. DO NOT MERGE
Geoff Mendal [Mon, 11 May 2015 14:13:25 +0000 (07:13 -0700)]
Import translations. DO NOT MERGE

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

9 years agoam 1008c12b: am 0d0d8e25: am 69a03f75: Merge "[LockScreenSetup] Fix "Choose Lock...
Maurice Lam [Sat, 9 May 2015 00:28:00 +0000 (00:28 +0000)]
am 1008c12b: am 0d0d8e25: am 69a03f75: Merge "[LockScreenSetup] Fix "Choose Lock PIN" title" into mnc-dev

* commit '1008c12b365b2bfa54e896c859e8bac2fb686d23':
  [LockScreenSetup] Fix "Choose Lock PIN" title

9 years agoam 0d0d8e25: am 69a03f75: Merge "[LockScreenSetup] Fix "Choose Lock PIN" title" into...
Maurice Lam [Sat, 9 May 2015 00:21:31 +0000 (00:21 +0000)]
am 0d0d8e25: am 69a03f75: Merge "[LockScreenSetup] Fix "Choose Lock PIN" title" into mnc-dev

* commit '0d0d8e25916f5765cc37c28332a8a1e341dbd518':
  [LockScreenSetup] Fix "Choose Lock PIN" title

9 years agoam 69a03f75: Merge "[LockScreenSetup] Fix "Choose Lock PIN" title" into mnc-dev
Maurice Lam [Sat, 9 May 2015 00:10:53 +0000 (00:10 +0000)]
am 69a03f75: Merge "[LockScreenSetup] Fix "Choose Lock PIN" title" into mnc-dev

* commit '69a03f75171c9f21ee4517f8e6d02cfa955c6a84':
  [LockScreenSetup] Fix "Choose Lock PIN" title

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 agoam bb575513: am 7e8b3541: am d7cba372: Merge "Fix Signal strength display issue in...
Sanket Padawe [Fri, 8 May 2015 23:55:41 +0000 (23:55 +0000)]
am bb575513: am 7e8b3541: am d7cba372: Merge "Fix Signal strength display issue in Settings." into mnc-dev

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

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

* commit '2d532ec36fa10752e5dda766543865ff537e1351':
  Settings: Use new EventInfo.ANY_CALENDAR constant.

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

* commit '752acc16112502ed2011d0236d516d655539278e':
  Settings: New DND access settings page.

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

* commit '2f23695ad523d0577e11e13d52d484f548db4465':
  Track keystore password method changes

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

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

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

* commit '8049bfae3f8c0fffb1217e782a1ea5b6755e971f':
  Choose correct network template for data history

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

* commit '096d75f7b3ad16fb7bf4da4b4249e4e91a069d22':
  Fix crash on unistalling app

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

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

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

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

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

* commit '876dd465fb7060e17cd0674159e3d32d5e8dda43':
  Making the behavior deterministic when the IME picker is shown.

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

* commit '3d758c0ab0ffc50837ab493d3d4a1cbb772b73fd':
  Add user selectable Default Browser feature - part 4

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

* commit '85472aa039c4b4b355c7da217451cbfd54b7fa52':
  Avoid SElinux denial accessing IMEI information

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

* commit 'f86cddb3efea728c1464c1a04b0a7425d1546821':
  Detect uninstalled apps during resume

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

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

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

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

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

* commit '782b0e82104ac132559a9ac18b4eb981841f5972':
  Always start storage list sorting by size

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 d273dd26: am a6867f55: Merge "Avoid SElinux denial accessing IMEI information"
Nick Kralevich [Thu, 7 May 2015 19:00:13 +0000 (19:00 +0000)]
am d273dd26: am a6867f55: Merge "Avoid SElinux denial accessing IMEI information"

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

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