OSDN Git Service

android-x86/packages-apps-Settings.git
11 years agoam 8882ccdd: Load user photos through system_server.
Jeff Sharkey [Wed, 19 Sep 2012 18:23:50 +0000 (11:23 -0700)]
am 8882ccdd: Load user photos through system_server.

* commit '8882ccdd3eafc338213b312f1b73fb4de1776a60':
  Load user photos through system_server.

11 years agoam f5de1db2: Omit PPTP VPNs from lockdown list.
Jeff Sharkey [Wed, 19 Sep 2012 18:23:49 +0000 (11:23 -0700)]
am f5de1db2: Omit PPTP VPNs from lockdown list.

* commit 'f5de1db28a61d159e62ef42f64a2cdcb316d0c2c':
  Omit PPTP VPNs from lockdown list.

11 years agoam b92e9afe: Merge "Fix a crash in InstalledAppDetails" into jb-mr1-dev
Amith Yamasani [Wed, 19 Sep 2012 18:16:52 +0000 (11:16 -0700)]
am b92e9afe: Merge "Fix a crash in InstalledAppDetails" into jb-mr1-dev

* commit 'b92e9afe4d056ca69a43450dc5be6ffb7efa1ea1':
  Fix a crash in InstalledAppDetails

11 years agoLoad user photos through system_server.
Jeff Sharkey [Wed, 19 Sep 2012 18:15:45 +0000 (11:15 -0700)]
Load user photos through system_server.

Bug: 7194137
Change-Id: Ie36ca40c48fb06d55d120bfcf3db69aea9d83829

11 years agoOmit PPTP VPNs from lockdown list.
Jeff Sharkey [Tue, 18 Sep 2012 22:35:35 +0000 (15:35 -0700)]
Omit PPTP VPNs from lockdown list.

Bug: 7064069
Change-Id: Ie4261828ef2dc5af32db3b327ca7ec00451e65d9

11 years agoMerge "Fix a crash in InstalledAppDetails" into jb-mr1-dev
Amith Yamasani [Wed, 19 Sep 2012 18:14:45 +0000 (11:14 -0700)]
Merge "Fix a crash in InstalledAppDetails" into jb-mr1-dev

11 years agoFix a crash in InstalledAppDetails
Amith Yamasani [Wed, 19 Sep 2012 17:58:32 +0000 (10:58 -0700)]
Fix a crash in InstalledAppDetails

Initialize mPackageInfo in onCreate

Bug: 7194755
Change-Id: Ic82351591bd38c4c161bbb23c4033038d1d7fa85

11 years agoam 9fc59c99: Merge "Fix strings" into jb-mr1-dev
Irfan Sheriff [Wed, 19 Sep 2012 05:04:55 +0000 (22:04 -0700)]
am 9fc59c99: Merge "Fix strings" into jb-mr1-dev

* commit '9fc59c99efc9413546aa4a60a740f617730a08b0':
  Fix strings

11 years agoMerge "Fix strings" into jb-mr1-dev
Irfan Sheriff [Wed, 19 Sep 2012 05:03:13 +0000 (22:03 -0700)]
Merge "Fix strings" into jb-mr1-dev

11 years agoFix strings
Irfan Sheriff [Wed, 19 Sep 2012 04:03:42 +0000 (21:03 -0700)]
Fix strings

Bug: 7182012
Bug: 7071211
Change-Id: I34aa508d5e4151ffdc538a3ab9ae1ddf3749b345

11 years agoam 27f155a4: Merge "Rename file to satisfy strict Java requirement" into jb-mr1-dev
Andy Stadler [Tue, 18 Sep 2012 23:54:51 +0000 (16:54 -0700)]
am 27f155a4: Merge "Rename file to satisfy strict Java requirement" into jb-mr1-dev

* commit '27f155a4012aece82d58f7142960aec6414ade4d':
  Rename file to satisfy strict Java requirement

11 years agoam dddef157: Merge "Fix bug: allow users to select "none" for lockscreen widget"...
Michael Jurka [Tue, 18 Sep 2012 23:54:43 +0000 (16:54 -0700)]
am dddef157: Merge "Fix bug: allow users to select "none" for lockscreen widget" into jb-mr1-dev

* commit 'dddef157b79818cb20321e2a3b715e88457fba44':
  Fix bug: allow users to select "none" for lockscreen widget

11 years agoMerge "Rename file to satisfy strict Java requirement" into jb-mr1-dev
Andy Stadler [Tue, 18 Sep 2012 23:26:19 +0000 (16:26 -0700)]
Merge "Rename file to satisfy strict Java requirement" into jb-mr1-dev

11 years agoMerge "Fix bug: allow users to select "none" for lockscreen widget" into jb-mr1-dev
Michael Jurka [Tue, 18 Sep 2012 23:11:29 +0000 (16:11 -0700)]
Merge "Fix bug: allow users to select "none" for lockscreen widget" into jb-mr1-dev

11 years agoam 220b06b1: Merge "Always show auto-sync; user-specific storage." into jb-mr1-dev
Jeff Sharkey [Tue, 18 Sep 2012 22:23:33 +0000 (15:23 -0700)]
am 220b06b1: Merge "Always show auto-sync; user-specific storage." into jb-mr1-dev

* commit '220b06b1bb8cb2ac947f7fe6b911b8160f1186cd':
  Always show auto-sync; user-specific storage.

11 years agoFix bug: allow users to select "none" for lockscreen widget
Michael Jurka [Tue, 18 Sep 2012 22:17:58 +0000 (15:17 -0700)]
Fix bug: allow users to select "none" for lockscreen widget

Change-Id: Ibd0449899ce7c340a6f838c56de58b70538400fc

11 years agoMerge "Always show auto-sync; user-specific storage." into jb-mr1-dev
Jeff Sharkey [Tue, 18 Sep 2012 22:15:31 +0000 (15:15 -0700)]
Merge "Always show auto-sync; user-specific storage." into jb-mr1-dev

11 years agoam a6c1b346: Merge "Add optional regulatory info page" into jb-mr1-dev
Brian Muramatsu [Tue, 18 Sep 2012 22:14:31 +0000 (15:14 -0700)]
am a6c1b346: Merge "Add optional regulatory info page" into jb-mr1-dev

* commit 'a6c1b346ae0fc92170eb09f90c71b9c3d25d53eb':
  Add optional regulatory info page

11 years agoAlways show auto-sync; user-specific storage.
Jeff Sharkey [Tue, 18 Sep 2012 22:03:47 +0000 (15:03 -0700)]
Always show auto-sync; user-specific storage.

Auto-sync is per-user, so show it to all users.  Also create user-
specific path when showing misc storage items.

Bug: 71794857177335
Change-Id: I9f6029e22d519a5516a0f1a76e6aa55db3c2832c

11 years agoMerge "Add optional regulatory info page" into jb-mr1-dev
Brian Muramatsu [Tue, 18 Sep 2012 21:59:35 +0000 (14:59 -0700)]
Merge "Add optional regulatory info page" into jb-mr1-dev

11 years agoam 7956e726: Merge "Tweaking mechanism for adding keyguard widgets" into jb-mr1-dev
Adam Cohen [Tue, 18 Sep 2012 21:54:09 +0000 (14:54 -0700)]
am 7956e726: Merge "Tweaking mechanism for adding keyguard widgets" into jb-mr1-dev

* commit '7956e7263afd2007dc4262dc3c79dc74b14e8bf6':
  Tweaking mechanism for adding keyguard widgets

11 years agoam 9ba3d227: Merge "Fix issue #7050530: NPE in Settings : settings.applications.Runni...
Dianne Hackborn [Tue, 18 Sep 2012 21:51:45 +0000 (14:51 -0700)]
am 9ba3d227: Merge "Fix issue #7050530: NPE in Settings : settings.applications.RunningServiceDetails..." into jb-mr1-dev

* commit '9ba3d227e37b49412fe146b43f15aabb1da0d008':
  Fix issue #7050530: NPE in Settings : settings.applications.RunningServiceDetails...

11 years agoMerge "Tweaking mechanism for adding keyguard widgets" into jb-mr1-dev
Adam Cohen [Tue, 18 Sep 2012 21:47:08 +0000 (14:47 -0700)]
Merge "Tweaking mechanism for adding keyguard widgets" into jb-mr1-dev

11 years agoRename file to satisfy strict Java requirement
Andy Stadler [Tue, 18 Sep 2012 21:43:42 +0000 (14:43 -0700)]
Rename file to satisfy strict Java requirement

There is no code change, the classname is OK, it was just the
filename that needed a tweak.

Original code was Change-Id: I381ed96f6b57f414bbaccd694f55d2b992e330a4

Change-Id: I14f2009cff186647a736b1183acf815713234dd5

11 years agoTweaking mechanism for adding keyguard widgets
Adam Cohen [Tue, 18 Sep 2012 20:26:29 +0000 (13:26 -0700)]
Tweaking mechanism for adding keyguard widgets

-> Fix for issue 7173877
-> Fix for issue 7173587

Change-Id: I266cafcf175c98e0c8a8401e11faa5dd2e2fa885

11 years agoMerge "Fix issue #7050530: NPE in Settings : settings.applications.RunningServiceDeta...
Dianne Hackborn [Tue, 18 Sep 2012 21:19:27 +0000 (14:19 -0700)]
Merge "Fix issue #7050530: NPE in Settings : settings.applications.RunningServiceDetails..." into jb-mr1-dev

11 years agoFix issue #7050530: NPE in Settings : settings.applications.RunningServiceDetails...
Dianne Hackborn [Tue, 18 Sep 2012 21:17:36 +0000 (14:17 -0700)]
Fix issue #7050530: NPE in Settings : settings.applications.RunningServiceDetails...

...addDetailViews(RunningServiceDetails.java:439)

Change-Id: Id4a110bacf4da1bec07272b3b75e8bf0986cab92

11 years agoam 221e4356: Merge "Fix cases where app widget ids were not being cleaned up" into...
Michael Jurka [Tue, 18 Sep 2012 20:27:25 +0000 (13:27 -0700)]
am 221e4356: Merge "Fix cases where app widget ids were not being cleaned up" into jb-mr1-dev

* commit '221e4356e1cbf24dd32037800601df91c3b85c6d':
  Fix cases where app widget ids were not being cleaned up

11 years agoMerge "Fix cases where app widget ids were not being cleaned up" into jb-mr1-dev
Michael Jurka [Tue, 18 Sep 2012 20:25:57 +0000 (13:25 -0700)]
Merge "Fix cases where app widget ids were not being cleaned up" into jb-mr1-dev

11 years agoam ba088af9: Merge "Fix issue #7178865: Selecting an app from Settings > Apps>.....
Dianne Hackborn [Tue, 18 Sep 2012 19:15:28 +0000 (12:15 -0700)]
am ba088af9: Merge "Fix issue #7178865: Selecting an app from Settings > Apps>..." into jb-mr1-dev

* commit 'ba088af9af1d874adebf78273432d0f079960249':
  Fix issue #7178865: Selecting an app from Settings > Apps>...

11 years agoMerge "Fix issue #7178865: Selecting an app from Settings > Apps>..." into jb-mr1-dev
Dianne Hackborn [Tue, 18 Sep 2012 19:07:19 +0000 (12:07 -0700)]
Merge "Fix issue #7178865: Selecting an app from Settings > Apps>..." into jb-mr1-dev

11 years agoFix issue #7178865: Selecting an app from Settings > Apps>...
Dianne Hackborn [Tue, 18 Sep 2012 19:04:00 +0000 (12:04 -0700)]
Fix issue #7178865: Selecting an app from Settings > Apps>...

...all crashes on a secondary user

Change-Id: I977932bce3ea2816e4c9d1002488b658a96e3986

11 years agoAdd optional regulatory info page
Brian Muramatsu [Tue, 18 Sep 2012 06:09:35 +0000 (23:09 -0700)]
Add optional regulatory info page

Bug 7081675

If R.bools.config_show_regulatory_info is true, then show a "Regulatory
information" item on the "About phone" page. Show a DialogFragment
displaying the regulatory_info drawable if the item is clicked. Add a
1x1 blank regulatory_info drawable for devices that won't show this.

Change-Id: I5823d8969de038becf4911dce893dab5dbb23537

11 years agoam 3e3b75f2: Merge "Add help menu for Users and Location access" into jb-mr1-dev
Amith Yamasani [Tue, 18 Sep 2012 17:10:41 +0000 (10:10 -0700)]
am 3e3b75f2: Merge "Add help menu for Users and Location access" into jb-mr1-dev

* commit '3e3b75f26f2ad91c40ba28d13af2838331113bca':
  Add help menu for Users and Location access

11 years agoam 05bf34c2: Merge "Revert "Import translations. DO NOT MERGE"" into jb-mr1-dev
Baligh Uddin [Tue, 18 Sep 2012 17:10:06 +0000 (10:10 -0700)]
am 05bf34c2: Merge "Revert "Import translations. DO NOT MERGE"" into jb-mr1-dev

* commit '05bf34c2559a8d800da18eabeb0214f559d4aeef':
  Revert "Import translations. DO NOT MERGE"

11 years agoam fa69d3ed: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
Baligh Uddin [Tue, 18 Sep 2012 17:10:03 +0000 (10:10 -0700)]
am fa69d3ed: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev

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

11 years agoMerge "Add help menu for Users and Location access" into jb-mr1-dev
Amith Yamasani [Tue, 18 Sep 2012 16:55:20 +0000 (09:55 -0700)]
Merge "Add help menu for Users and Location access" into jb-mr1-dev

11 years agoAdd help menu for Users and Location access
Amith Yamasani [Tue, 18 Sep 2012 16:51:07 +0000 (09:51 -0700)]
Add help menu for Users and Location access

Bug: 7093415
Bug: 7130812
Change-Id: I44c68e846dcc5d98fc8b152f79d75140e151323a

11 years agoMerge "Revert "Import translations. DO NOT MERGE"" into jb-mr1-dev
Baligh Uddin [Tue, 18 Sep 2012 14:24:52 +0000 (07:24 -0700)]
Merge "Revert "Import translations. DO NOT MERGE"" into jb-mr1-dev

11 years agoRevert "Import translations. DO NOT MERGE"
Baligh Uddin [Tue, 18 Sep 2012 14:24:16 +0000 (07:24 -0700)]
Revert "Import translations. DO NOT MERGE"

Broke the build.

This reverts commit b4b2857236e09cbca0faeba07a879e49ad5a9bb4

Change-Id: I51f5f569d717bf0973e5e5a868e9fdc53ca80f99

11 years agoMerge "Import translations. DO NOT MERGE" into jb-mr1-dev
Baligh Uddin [Tue, 18 Sep 2012 14:03:36 +0000 (07:03 -0700)]
Merge "Import translations. DO NOT MERGE" into jb-mr1-dev

11 years agoam 766a0683: Merge "Use Bitmap instead of ParcelFileDescriptor to get the user\'s...
Amith Yamasani [Tue, 18 Sep 2012 07:05:16 +0000 (00:05 -0700)]
am 766a0683: Merge "Use Bitmap instead of ParcelFileDescriptor to get the user\'s icon." into jb-mr1-dev

* commit '766a0683cf2dda8fb3dee51fcd2111d6ce81e774':
  Use Bitmap instead of ParcelFileDescriptor to get the user's icon.

11 years agoam b9e1ff15: Merge "Add flag to allow testing launcher widgets in keyguard." into...
Jim Miller [Tue, 18 Sep 2012 07:05:07 +0000 (00:05 -0700)]
am b9e1ff15: Merge "Add flag to allow testing launcher widgets in keyguard." into jb-mr1-dev

* commit 'b9e1ff15f5483513fc8ab8026cc461e9f97d5e73':
  Add flag to allow testing launcher widgets in keyguard.

11 years agoam 64c6ee20: Merge "Use UserManager.getUserIcon() to get the user\'s avatar." into...
Amith Yamasani [Tue, 18 Sep 2012 07:04:22 +0000 (00:04 -0700)]
am 64c6ee20: Merge "Use UserManager.getUserIcon() to get the user\'s avatar." into jb-mr1-dev

* commit '64c6ee20bae6cbf868ec4a0a3ffc7ce6fd10bdd6':
  Use UserManager.getUserIcon() to get the user's avatar.

11 years agoMerge "Use Bitmap instead of ParcelFileDescriptor to get the user's icon." into jb...
Amith Yamasani [Tue, 18 Sep 2012 05:53:37 +0000 (22:53 -0700)]
Merge "Use Bitmap instead of ParcelFileDescriptor to get the user's icon." into jb-mr1-dev

11 years agoUse Bitmap instead of ParcelFileDescriptor to get the user's icon.
Amith Yamasani [Tue, 18 Sep 2012 01:31:45 +0000 (18:31 -0700)]
Use Bitmap instead of ParcelFileDescriptor to get the user's icon.

Change-Id: I1dd7261b47ba98a2a0834dbfb8c22de369e6cc58

11 years agoMerge "Add flag to allow testing launcher widgets in keyguard." into jb-mr1-dev
Jim Miller [Tue, 18 Sep 2012 05:30:06 +0000 (22:30 -0700)]
Merge "Add flag to allow testing launcher widgets in keyguard." into jb-mr1-dev

11 years agoAdd flag to allow testing launcher widgets in keyguard.
Jim Miller [Tue, 18 Sep 2012 04:02:25 +0000 (21:02 -0700)]
Add flag to allow testing launcher widgets in keyguard.

Change-Id: I10fc3f6557dba9261b898d7b123d1391c1afdf06

11 years agoMerge "Use UserManager.getUserIcon() to get the user's avatar." into jb-mr1-dev
Amith Yamasani [Tue, 18 Sep 2012 01:34:33 +0000 (18:34 -0700)]
Merge "Use UserManager.getUserIcon() to get the user's avatar." into jb-mr1-dev

11 years agoFix cases where app widget ids were not being cleaned up
Michael Jurka [Tue, 18 Sep 2012 00:46:49 +0000 (17:46 -0700)]
Fix cases where app widget ids were not being cleaned up

Change-Id: Ie3f1ba0cc0fe459ae9fff2665c2ff4aa76e95994

11 years agoImport translations. DO NOT MERGE
Baligh Uddin [Mon, 17 Sep 2012 22:27:01 +0000 (15:27 -0700)]
Import translations. DO NOT MERGE

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

11 years agoUse UserManager.getUserIcon() to get the user's avatar.
Amith Yamasani [Mon, 17 Sep 2012 17:21:27 +0000 (10:21 -0700)]
Use UserManager.getUserIcon() to get the user's avatar.

Change-Id: I035a5e2a518eb827a2e44910471ed04923921aa3

11 years agoam d0d925d9: Merge "Revert "Import translations. DO NOT MERGE"" into jb-mr1-dev
Baligh Uddin [Mon, 17 Sep 2012 17:23:41 +0000 (10:23 -0700)]
am d0d925d9: Merge "Revert "Import translations. DO NOT MERGE"" into jb-mr1-dev

* commit 'd0d925d96bf0c532cec203fdd2cb35464d247ad5':
  Revert "Import translations. DO NOT MERGE"

11 years agoMerge "Revert "Import translations. DO NOT MERGE"" into jb-mr1-dev
Baligh Uddin [Mon, 17 Sep 2012 17:21:20 +0000 (10:21 -0700)]
Merge "Revert "Import translations. DO NOT MERGE"" into jb-mr1-dev

11 years agoRevert "Import translations. DO NOT MERGE"
Baligh Uddin [Mon, 17 Sep 2012 17:18:44 +0000 (10:18 -0700)]
Revert "Import translations. DO NOT MERGE"

Build Broken.

This reverts commit 4a44ed7bd7a692780e855eb44d7dd86d0bbf78e5

Change-Id: Ie61c8d7b1e5eb46fe8aed1836f8d63f989d23db4

11 years agoam 0cbc30f0: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
Baligh Uddin [Mon, 17 Sep 2012 17:03:03 +0000 (10:03 -0700)]
am 0cbc30f0: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev

* commit '0cbc30f0b7da22454d1fdc57851f316adbf6aa09':
  Import translations. DO NOT MERGE

11 years agoMerge "Import translations. DO NOT MERGE" into jb-mr1-dev
Baligh Uddin [Mon, 17 Sep 2012 17:00:38 +0000 (10:00 -0700)]
Merge "Import translations. DO NOT MERGE" into jb-mr1-dev

11 years agoam bdb9fc86: Merge "Must initialize the new atomic.." into jb-mr1-dev
Robert Greenwalt [Mon, 17 Sep 2012 15:15:06 +0000 (08:15 -0700)]
am bdb9fc86: Merge "Must initialize the new atomic.." into jb-mr1-dev

* commit 'bdb9fc8687fe6fbe7ed9d1222dba21794206c415':
  Must initialize the new atomic..

11 years agoMerge "Must initialize the new atomic.." into jb-mr1-dev
Robert Greenwalt [Mon, 17 Sep 2012 15:14:07 +0000 (08:14 -0700)]
Merge "Must initialize the new atomic.." into jb-mr1-dev

11 years agoam 582ab169: Merge "More user management ui work" into jb-mr1-dev
Amith Yamasani [Mon, 17 Sep 2012 06:28:39 +0000 (23:28 -0700)]
am 582ab169: Merge "More user management ui work" into jb-mr1-dev

* commit '582ab1696f1f11b754b0de72b1c8817fea6dae2a':
  More user management ui work

11 years agoMerge "More user management ui work" into jb-mr1-dev
Amith Yamasani [Mon, 17 Sep 2012 06:26:48 +0000 (23:26 -0700)]
Merge "More user management ui work" into jb-mr1-dev

11 years agoMore user management ui work
Amith Yamasani [Mon, 17 Sep 2012 00:53:35 +0000 (17:53 -0700)]
More user management ui work

Show setup dialog after adding user.
Write user profile to nickname on setup.
Remove self.
Correct dialog text for user creation.

Bug: 7104261
Bug: 7174751
Bug: 7174685

Change-Id: I0ecd688f3edaef61332f974012454ceb87762e9f

11 years agoam 3db54cb9: Add app details menu item to uninstall an app for all users.
Dianne Hackborn [Mon, 17 Sep 2012 01:33:44 +0000 (18:33 -0700)]
am 3db54cb9: Add app details menu item to uninstall an app for all users.

* commit '3db54cb97630fe83342c2ca189d13ff5a1a598d3':
  Add app details menu item to uninstall an app for all users.

11 years agoAdd app details menu item to uninstall an app for all users.
Dianne Hackborn [Mon, 17 Sep 2012 01:27:14 +0000 (18:27 -0700)]
Add app details menu item to uninstall an app for all users.

Also some fixes: uninstalled apps are now marked as such in the
all apps lists, and sorted to the bottom like disabled apps.  We
don't immediately close the installed app details screen when
launching the uninstall UI.

Change-Id: Id22b749c20fc2441733c604d1de8889269217c5c

11 years agoMust initialize the new atomic..
Robert Greenwalt [Mon, 17 Sep 2012 00:03:08 +0000 (17:03 -0700)]
Must initialize the new atomic..

bug:7172859
Change-Id: Ibaf390683fa36771215b463fb6b088f7430c0462

11 years agoam d41fd604: Merge "Ability to hide verification settings" into jb-mr1-dev
rich cannings [Sun, 16 Sep 2012 22:52:15 +0000 (15:52 -0700)]
am d41fd604: Merge "Ability to hide verification settings" into jb-mr1-dev

* commit 'd41fd604cbf557d961f48a05fa40a9afc7b7cac6':
  Ability to hide verification settings

11 years agoMerge "Ability to hide verification settings" into jb-mr1-dev
rich cannings [Sun, 16 Sep 2012 22:50:08 +0000 (15:50 -0700)]
Merge "Ability to hide verification settings" into jb-mr1-dev

11 years agoam 70c6e0fb: Merge "Add support for per-package policy for sending premium SMS."...
John Huang [Sun, 16 Sep 2012 21:33:14 +0000 (14:33 -0700)]
am 70c6e0fb: Merge "Add support for per-package policy for sending premium SMS." into jb-mr1-dev

* commit '70c6e0fb33efd3ccedc5bac654296e6d556b5fd0':
  Add support for per-package policy for sending premium SMS.

11 years agoMerge "Add support for per-package policy for sending premium SMS." into jb-mr1-dev
John Huang [Sun, 16 Sep 2012 21:31:18 +0000 (14:31 -0700)]
Merge "Add support for per-package policy for sending premium SMS." into jb-mr1-dev

11 years agoam 260d930e: Merge "Updating the screen magnification description." into jb-mr1-dev
Svetoslav Ganov [Sun, 16 Sep 2012 21:22:17 +0000 (14:22 -0700)]
am 260d930e: Merge "Updating the screen magnification description." into jb-mr1-dev

* commit '260d930e304b768c31694521375876f11b8367f3':
  Updating the screen magnification description.

11 years agoMerge "Updating the screen magnification description." into jb-mr1-dev
Svetoslav Ganov [Sun, 16 Sep 2012 21:20:36 +0000 (14:20 -0700)]
Merge "Updating the screen magnification description." into jb-mr1-dev

11 years agoam cf008c28: Do not allow non-primary user to install certs
Kenny Root [Sun, 16 Sep 2012 21:08:29 +0000 (14:08 -0700)]
am cf008c28: Do not allow non-primary user to install certs

* commit 'cf008c28b871d4167e5aa19191ca691fb988f8fd':
  Do not allow non-primary user to install certs

11 years agoDo not allow non-primary user to install certs
Kenny Root [Sun, 16 Sep 2012 21:01:43 +0000 (14:01 -0700)]
Do not allow non-primary user to install certs

Change-Id: Iefc2970ae23d8ce7d30717add211c01cde251c8d

11 years agoAbility to hide verification settings
rich cannings [Sun, 16 Sep 2012 20:58:07 +0000 (13:58 -0700)]
Ability to hide verification settings

Add a setting that controls the visibility of the package verification
setting in the Settings app.

Bug:7022814
Change-Id: I6e503924adc112b4528d94b1e533baae6079e85e

11 years agoam 38305fb1: Data usage multi-user support.
Jeff Sharkey [Sat, 15 Sep 2012 23:10:56 +0000 (16:10 -0700)]
am 38305fb1: Data usage multi-user support.

* commit '38305fb1777147cbcb86774c466e88434daff141':
  Data usage multi-user support.

11 years agoData usage multi-user support.
Jeff Sharkey [Fri, 14 Sep 2012 23:26:51 +0000 (16:26 -0700)]
Data usage multi-user support.

Switch to storing policy per-user instead of per-app, meaning each
user has control over their own set of apps.  Summarize the usage of
non-current users.  Only allow owner to make changes to overall
network policy.

Hide auto-sync menu when viewing app details.  Search for
MANAGE_NETWORK_USAGE intent across all package names sharing a UID.

Bug: 712127954195946978663
Change-Id: Ia70f04df70d27da27faccb947cd27021c628a41a

11 years agoUpdating the screen magnification description.
Svetoslav Ganov [Sat, 15 Sep 2012 02:41:05 +0000 (19:41 -0700)]
Updating the screen magnification description.

bug:7054266

Change-Id: I59466d1e5c70a884badcfd0fdb01ffa3b920b7b7

11 years agoAdd support for per-package policy for sending premium SMS.
Jake Hamby [Fri, 7 Sep 2012 00:41:34 +0000 (17:41 -0700)]
Add support for per-package policy for sending premium SMS.

The default behavior for sending a message to a premium SMS
short code (or suspected premium SMS number) is to ask the user for
confirmation. Enable the user to set a default policy ("remember this
choice" checkbox) to always/never allow the app to send SMS to
premium short codes in the future. The policy can be changed by
the Settings app in the app info screen.

Bug: 5513975
Change-Id: I93053fef1524ee7772cc87364c760cb3dbf01ad7

11 years agoam b2f4efb7: Correct strings for Plaform Anti-malware
rich cannings [Fri, 14 Sep 2012 23:06:14 +0000 (16:06 -0700)]
am b2f4efb7: Correct strings for Plaform Anti-malware

* commit 'b2f4efb7a8bacabecaa886cb6b561019630871d9':
  Correct strings for Plaform Anti-malware

11 years agoCorrect strings for Plaform Anti-malware
rich cannings [Fri, 14 Sep 2012 21:35:18 +0000 (14:35 -0700)]
Correct strings for Plaform Anti-malware

Set strings to:

  Verify apps
  Disallow or warn before installation of apps that may cause harm

Bug: 7168682
Change-Id: Ic0102dd82ec26dd7239eaeaa7daa2b2f47fd6365

11 years agoam bc7f678c: Merge "Fix crash in Settings > Security" into jb-mr1-dev
Michael Jurka [Fri, 14 Sep 2012 21:13:55 +0000 (14:13 -0700)]
am bc7f678c: Merge "Fix crash in Settings > Security" into jb-mr1-dev

* commit 'bc7f678cc9334ef9d45a220fd0ef2db9c31019dc':
  Fix crash in Settings > Security

11 years agoMerge "Fix crash in Settings > Security" into jb-mr1-dev
Michael Jurka [Fri, 14 Sep 2012 21:12:14 +0000 (14:12 -0700)]
Merge "Fix crash in Settings > Security" into jb-mr1-dev

11 years agoFix crash in Settings > Security
Michael Jurka [Fri, 14 Sep 2012 21:09:16 +0000 (14:09 -0700)]
Fix crash in Settings > Security

Change-Id: Ib439c652f4f8a55cac710dbd22792943a7ef8f98

11 years agoImport translations. DO NOT MERGE
Baligh Uddin [Fri, 14 Sep 2012 20:50:27 +0000 (13:50 -0700)]
Import translations. DO NOT MERGE

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

11 years agoam 767597b2: Merge "Watch for profile changes and push to user manager" into jb-mr1-dev
Amith Yamasani [Fri, 14 Sep 2012 20:08:30 +0000 (13:08 -0700)]
am 767597b2: Merge "Watch for profile changes and push to user manager" into jb-mr1-dev

* commit '767597b28aebf46e42f7ce194acc09454d8d2324':
  Watch for profile changes and push to user manager

11 years agoMerge "Watch for profile changes and push to user manager" into jb-mr1-dev
Amith Yamasani [Fri, 14 Sep 2012 20:07:11 +0000 (13:07 -0700)]
Merge "Watch for profile changes and push to user manager" into jb-mr1-dev

11 years agoam 3a932f33: Merge "Treat cache storage usage as available space." into jb-mr1-dev
Jeff Sharkey [Fri, 14 Sep 2012 20:04:58 +0000 (13:04 -0700)]
am 3a932f33: Merge "Treat cache storage usage as available space." into jb-mr1-dev

* commit '3a932f33223e54d619014afa3e34799bc6256b69':
  Treat cache storage usage as available space.

11 years agoMerge "Treat cache storage usage as available space." into jb-mr1-dev
Jeff Sharkey [Fri, 14 Sep 2012 20:03:27 +0000 (13:03 -0700)]
Merge "Treat cache storage usage as available space." into jb-mr1-dev

11 years agoTreat cache storage usage as available space.
Jeff Sharkey [Fri, 14 Sep 2012 20:01:17 +0000 (13:01 -0700)]
Treat cache storage usage as available space.

Bug: 7123160
Change-Id: I1b3f36622be557d7c47f1452832f67da40893a02

11 years agoam 8227e303: Add support for setting lock widgets
Michael Jurka [Fri, 14 Sep 2012 19:47:00 +0000 (12:47 -0700)]
am 8227e303: Add support for setting lock widgets

* commit '8227e303850d7c1162c62947b70d0592432b455e':
  Add support for setting lock widgets

11 years agoAdd support for setting lock widgets
Michael Jurka [Fri, 7 Sep 2012 16:24:03 +0000 (09:24 -0700)]
Add support for setting lock widgets

Change-Id: I26165f1bc60e3cf277dbdd4f627ac720b492ffde

11 years agoam a9286147: Merge "Adding ability to filter for certain types of widgets in picker...
Michael Jurka [Fri, 14 Sep 2012 19:21:43 +0000 (12:21 -0700)]
am a9286147: Merge "Adding ability to filter for certain types of widgets in picker activity" into jb-mr1-dev

* commit 'a92861471d41a6cfae0c7e6825d02398fdbd0b42':
  Adding ability to filter for certain types of widgets in picker activity

11 years agoMerge "Adding ability to filter for certain types of widgets in picker activity"...
Michael Jurka [Fri, 14 Sep 2012 19:19:39 +0000 (12:19 -0700)]
Merge "Adding ability to filter for certain types of widgets in picker activity" into jb-mr1-dev

11 years agoam 9310f85d: Merge "Protect self from async change of BluetoothPan" into jb-mr1-dev
Robert Greenwalt [Fri, 14 Sep 2012 17:55:47 +0000 (10:55 -0700)]
am 9310f85d: Merge "Protect self from async change of BluetoothPan" into jb-mr1-dev

* commit '9310f85dc7f5421f9ca6b1d644c8ddff792e8f37':
  Protect self from async change of BluetoothPan

11 years agoMerge "Protect self from async change of BluetoothPan" into jb-mr1-dev
Robert Greenwalt [Fri, 14 Sep 2012 17:53:54 +0000 (10:53 -0700)]
Merge "Protect self from async change of BluetoothPan" into jb-mr1-dev

11 years agoProtect self from async change of BluetoothPan
Robert Greenwalt [Thu, 13 Sep 2012 22:02:00 +0000 (15:02 -0700)]
Protect self from async change of BluetoothPan

bug:6945678
Change-Id: I627a55aea9170f889823a38c8e2bb08a06faa841

11 years agoWatch for profile changes and push to user manager
Amith Yamasani [Fri, 14 Sep 2012 01:06:49 +0000 (18:06 -0700)]
Watch for profile changes and push to user manager

If the contacts Me Profile changes, push a copy of the photo to
user manager for user by the user switcher.

Also use an async task to load the profile data.

Change-Id: Ie784114622038ff14e3feb70f2ff51c372eecb3f

11 years agoam b6d7c9c6: Merge "Multi-user battery settings." into jb-mr1-dev
Dianne Hackborn [Thu, 13 Sep 2012 17:37:39 +0000 (10:37 -0700)]
am b6d7c9c6: Merge "Multi-user battery settings." into jb-mr1-dev

* commit 'b6d7c9c6f93e3d50a3fc5ce2db900a10cbb258e4':
  Multi-user battery settings.

11 years agoMerge "Multi-user battery settings." into jb-mr1-dev
Dianne Hackborn [Thu, 13 Sep 2012 17:36:13 +0000 (10:36 -0700)]
Merge "Multi-user battery settings." into jb-mr1-dev

11 years agoam 4a095381: Merge "Iteration on multi-user Storage UI." into jb-mr1-dev
Jeff Sharkey [Thu, 13 Sep 2012 08:32:54 +0000 (01:32 -0700)]
am 4a095381: Merge "Iteration on multi-user Storage UI." into jb-mr1-dev

* commit '4a0953818da25e2240d32136821d4ecb97f90ce1':
  Iteration on multi-user Storage UI.