OSDN Git Service
Baligh Uddin [Thu, 18 Apr 2013 03:41:23 +0000 (03:41 +0000)]
Merge "Import translations. DO NOT MERGE" into jb-mr2-dev
Jeff Brown [Thu, 18 Apr 2013 02:22:05 +0000 (19:22 -0700)]
Ensure WFD switch is removed along with settings fragment.
Bug:
8340072
Change-Id: I8d203725ef1bfa5b1b5e5c224fa57d5feaa9db5a
Jim Miller [Wed, 17 Apr 2013 20:37:29 +0000 (20:37 +0000)]
Merge "Move owner info from Settings.Secure to LockSettings" into jb-mr2-dev
Baligh Uddin [Wed, 17 Apr 2013 18:15:26 +0000 (11:15 -0700)]
Import translations. DO NOT MERGE
Change-Id: I04afe54c24573ae6980c1140aede0e0d3b0a06f8
Auto-generated-cl: translation import
Amith Yamasani [Wed, 17 Apr 2013 17:47:34 +0000 (10:47 -0700)]
Changes to deal with restrictions API change
Bug:
8633967
Change-Id: I5d8e843c850ad3eff900409a9006666ddf91b061
Amith Yamasani [Tue, 16 Apr 2013 22:39:47 +0000 (15:39 -0700)]
Remove wifi/bt restrictions choice for limited users
Bug:
8631653
Make "Unknown sources" visible but disabled if restricted for limited user.
Bug:
8629605
Also show the restriction name as the dialog title in the picker.
Change-Id: I8d6ea3571bcc4372347cad6a2c982f35afa7cc09
Jim Miller [Tue, 16 Apr 2013 03:27:55 +0000 (20:27 -0700)]
Move owner info from Settings.Secure to LockSettings
Fixes bug
8512972
Change-Id: I3eb68ace44c51daa012547908e28544a2d94847d
Kenny Root [Mon, 15 Apr 2013 20:45:16 +0000 (20:45 +0000)]
Merge "Remove old KeyStore API call sites" into jb-mr2-dev
Baligh Uddin [Mon, 15 Apr 2013 18:12:49 +0000 (11:12 -0700)]
Import translations. DO NOT MERGE
Change-Id: Ia5a4c8320ec06c7aee2eeb272fc62939a7b63cce
Auto-generated-cl: translation import
Amith Yamasani [Sun, 14 Apr 2013 01:30:59 +0000 (18:30 -0700)]
Don't show developer options to secondary users
Show just a message that developer options are not available for the user.
Also fix silent exit of AddAccount operation by showing a toast that user
cannot add accounts.
Bug:
7409523
Bug:
8519646
Bug:
7304007
Change-Id: Id3f430d568d6b7151ac55f86dbc0ef91803fa10c
Amith Yamasani [Sat, 13 Apr 2013 22:54:18 +0000 (22:54 +0000)]
Merge "Disable apps that require an account on a limited user" into jb-mr2-dev
Amith Yamasani [Sat, 13 Apr 2013 00:56:34 +0000 (17:56 -0700)]
Disable apps that require an account on a limited user
If an app is marked as requiring an account to work, disable that app
and show a message in the summary.
Also, implement graying out of icons for deselected apps.
Bug:
8600261
Change-Id: I9cf48832675c24257e09addad4316249082c30fb
Kenny Root [Sat, 13 Apr 2013 00:34:13 +0000 (17:34 -0700)]
Remove old KeyStore API call sites
Remove the call sites that don't have the flags specified. This is to
ensure that callers know what flags they're setting.
Bug:
8122243
Change-Id: I59e38efbab6ad60a905ce8678a340da2088b19c9
Baligh Uddin [Fri, 12 Apr 2013 23:06:30 +0000 (23:06 +0000)]
Merge "Import translations. DO NOT MERGE" into jb-mr2-dev
Maggie Benthall [Fri, 12 Apr 2013 21:28:18 +0000 (21:28 +0000)]
Merge "Implement Settings app UX for when a user has wifi config locked down." into jb-mr2-dev
Emily Bernier [Fri, 12 Apr 2013 20:22:03 +0000 (20:22 +0000)]
Merge "User restrictions for creds storage & user removal" into jb-mr2-dev
Amith Yamasani [Fri, 12 Apr 2013 17:58:03 +0000 (17:58 +0000)]
Merge "Embed the app restrictions fragment in the dual-pane settings." into jb-mr2-dev
Baligh Uddin [Fri, 12 Apr 2013 17:56:21 +0000 (10:56 -0700)]
Import translations. DO NOT MERGE
Change-Id: I55d1e2ad4c165c7098054dadaa79ea3e6896fc89
Auto-generated-cl: translation import
Irfan Sheriff [Fri, 12 Apr 2013 16:55:13 +0000 (16:55 +0000)]
Merge "Limit device name length" into jb-mr2-dev
Irfan Sheriff [Fri, 12 Apr 2013 05:26:28 +0000 (22:26 -0700)]
Limit device name length
Bug:
8599677
Change-Id: Ifce5579c0a65c98a4faaad286a7255b2e63d2a76
Amith Yamasani [Fri, 12 Apr 2013 01:21:07 +0000 (18:21 -0700)]
Embed the app restrictions fragment in the dual-pane settings.
Change the limited user creation flow to show the usual message before
actually adding the user. Might need to customize the message for limited
users.
Removed the old activity wrapper and moved the logic to UserSettings.
Removed the finish button.
Bug:
8566751
Change-Id: Ie9e1a03736c41758b0bb6e79d004ad662a5af7f4
Emily Bernier [Thu, 11 Apr 2013 20:24:56 +0000 (16:24 -0400)]
User restrictions for creds storage & user removal
Change-Id: I423e729f73ece6209875d2f8d194d0d11c975c20
Benjamin Poiesz [Thu, 11 Apr 2013 22:12:10 +0000 (22:12 +0000)]
Merge "Forcing the settings apk to be built with the zz_ZZ pseudolocale. This will enable Settings to show the effects of the zz_ZZ pseudolocale when selected in the LocalePicker." into jb-mr2-dev
Benjamin Poiesz [Thu, 4 Apr 2013 23:14:13 +0000 (16:14 -0700)]
Forcing the settings apk to be built with the zz_ZZ pseudolocale.
This will enable Settings to show the effects of the zz_ZZ pseudolocale when selected in the LocalePicker.
Bug #
8556677
Change-Id: I68ffc81454865dec94a3c1460019d1efce00ea49
Maggie Benthall [Thu, 11 Apr 2013 19:45:58 +0000 (15:45 -0400)]
Implement Settings app UX for when a user has wifi config locked down.
When the user is restricted from configuring wifi:
- Leave the on/off button enabled
- Hide all menu options
- Hide all networks, and display a message saying:
"This user is not allowed to configure wireless networks."
Change-Id: I20193b552ea071740686bd9091637459e9b668b5
Amith Yamasani [Thu, 11 Apr 2013 18:12:35 +0000 (11:12 -0700)]
Make sure Settings app restrictions show up
Inadvertently disabled that in the previous change where we would
skip apps that were required but had no restrictions entries.
Bug:
8520185
Change-Id: Idc1808e489f7b6da267f68a2c7cef81cc351d2d0
Maggie Benthall [Thu, 11 Apr 2013 14:04:39 +0000 (14:04 +0000)]
Merge "Implement Settings app UX for when a user has bluetooth config locked down." into jb-mr2-dev
Amith Yamasani [Thu, 11 Apr 2013 04:59:18 +0000 (21:59 -0700)]
Improve app list for limited users
Show all activities in the same package with a master/slave relationship,
toggling all when the master is toggled.
Don't show required apps that have no restrictions.
Show apps that are only installed on the target user.
Bug:
8520813 lowercase app names
Bug:
8520185 apps installed only in limited user
Bug:
8567000 strange behavior with apps that have two launcher icons
Change-Id: Id8ab296c13202735a9534f918bd81ea4b4c14b46
Svetoslav [Thu, 11 Apr 2013 00:33:37 +0000 (17:33 -0700)]
First accessibility device disabled if enableing a second one is canceled.
The value whether accessibility should stay enabled was incorrectly
computed and as a result accessibility was disaabled when the second
accessibility service enabling is canceled.
bug:
7716830
Change-Id: Ic23c24b1ffa90811e21210aeeca158568ad37904
Dianne Hackborn [Wed, 10 Apr 2013 21:14:22 +0000 (21:14 +0000)]
Merge "Fix issue #
7691456: adbd CPU usage identified as Bluetooth in battery stats" into jb-mr2-dev
Dianne Hackborn [Wed, 10 Apr 2013 19:50:32 +0000 (12:50 -0700)]
Fix issue #
7691456: adbd CPU usage identified as Bluetooth in battery stats
Should be comparing with Bluetooth UID, not the wrong and broken GID.
Change-Id: I2cb33e25b0ae5a441a467c12d91860dcf36232dc
Baligh Uddin [Wed, 10 Apr 2013 18:27:46 +0000 (11:27 -0700)]
Import translations. DO NOT MERGE
Change-Id: Ifb727fcd1cfd28e78a2f405ee5cbba21e1999ab3
Auto-generated-cl: translation import
Amith Yamasani [Wed, 10 Apr 2013 00:29:12 +0000 (00:29 +0000)]
Merge "Select text in user name dialog" into jb-mr2-dev
Amith Yamasani [Wed, 10 Apr 2013 00:26:43 +0000 (17:26 -0700)]
Select text in user name dialog
Enables quickly changing the name without moving the cursor.
Also use cap words style.
Bug:
8518507
Change-Id: I6841cad221b56bb4c3d51c21d30b3858d1ee3e1c
Wink Saville [Tue, 9 Apr 2013 22:50:40 +0000 (22:50 +0000)]
Merge "Add FW support for CellInfo RIL commands." into jb-mr2-dev
Baligh Uddin [Tue, 9 Apr 2013 19:26:15 +0000 (19:26 +0000)]
Merge "Import translations. DO NOT MERGE" into jb-mr2-dev
Ben Murdoch [Tue, 9 Apr 2013 19:00:41 +0000 (19:00 +0000)]
Merge "Properly remove experimental WebView preference when unavailable." into jb-mr2-dev
Jared Duke [Tue, 9 Apr 2013 17:09:03 +0000 (10:09 -0700)]
Properly remove experimental WebView preference when unavailable.
When the experimental WebView library is unavailable, properly remove it from
the appropriate preferences group.
Bug:
8572673
Change-Id: I34dd0720199c826ca12e0f991e2f6bd9c5ad35f3
Amith Yamasani [Tue, 9 Apr 2013 18:09:40 +0000 (18:09 +0000)]
Merge "Send app restrictions broadcast to stopped apps as well" into jb-mr2-dev
Amith Yamasani [Tue, 9 Apr 2013 18:05:18 +0000 (11:05 -0700)]
Send app restrictions broadcast to stopped apps as well
Otherwise the restrictions won't be shown for apps that haven't been
launched yet.
Bug:
8577600
Change-Id: I1d0d93553456dfedfb749e3d8262911af4362a80
Amith Yamasani [Tue, 9 Apr 2013 17:22:47 +0000 (10:22 -0700)]
Potential fix for a monkey-related NPE
Cache the content resolver so that async callbacks, events can
continue to get the cntent resolver when detached from the activity.
This should help with stability.
Bug:
8005271
Change-Id: Ia566bc312ce678b438004bdf4ed7537ac1604608
Wink Saville [Fri, 5 Apr 2013 22:04:05 +0000 (15:04 -0700)]
Add FW support for CellInfo RIL commands.
Add being able to setCellInfoListRate.
Bug:
8235566
Change-Id: I7ad7dabc4b6c38bfba4461b08e6e30d0eb9efea1
Maggie Benthall [Mon, 8 Apr 2013 20:05:38 +0000 (16:05 -0400)]
Implement Settings app UX for when a user has bluetooth config locked down.
When a user has the user restriction DISALLOW_CONFIG_BLUETOOTH
- Remove all the menu items for searching and other config
- Hide "available" but non-paired devices
- Remove settings button from paired devices
- Remove ability to make the device visible to others
Change-Id: Icaebf29d3cce55d924fdd65449447b5b7a438bbe
Baligh Uddin [Mon, 8 Apr 2013 19:47:32 +0000 (12:47 -0700)]
Import translations. DO NOT MERGE
Change-Id: Ib3ac2b538aa44464e84db39d318f828b656eb759
Auto-generated-cl: translation import
Kenny Root [Mon, 8 Apr 2013 17:58:37 +0000 (17:58 +0000)]
Merge "Allow multiuser use of keystore" into jb-mr2-dev
Kenny Root [Mon, 8 Apr 2013 16:56:05 +0000 (09:56 -0700)]
Allow multiuser use of keystore
Since keystore has been refactored to let muliple users use it
simultaneously, we can remove all the restrictions put into place to
prevent it.
(cherry picked from commit
cc48b0104e4d81592055a578a33f2a59f29bf907)
Bug:
7249554
Change-Id: I419474151380c29e49e50451befbbdf3af65b175
Daniel Sandler [Mon, 8 Apr 2013 16:01:33 +0000 (12:01 -0400)]
Fix "no notification listeners" text.
Bug:
8454150
Change-Id: I6b02367e2be9f31fdf0a54d7fc0c49f8c82922d7
Nick Kralevich [Sat, 6 Apr 2013 01:36:15 +0000 (18:36 -0700)]
InstalledAppDetails: allow revocable permission.
Modify the Settings app so that a user can revoke permissions,
using the new API added in AppSecurityPermissions.
Bug:
8332307
Change-Id: I4d6c10877e2c3cc284dbf9a43f79697914c0b192
Daniel Sandler [Thu, 4 Apr 2013 18:30:04 +0000 (14:30 -0400)]
Notification listeners can be enabled in Settings>Security.
Also known as android.settings.ACTION_NOTIFICATION_LISTENER_SETTINGS.
Bug:
8454150
Change-Id: I0c2433bf58ba4c78cd461326bd014535c7f67578
Daniel Sandler [Sat, 23 Mar 2013 01:29:51 +0000 (18:29 -0700)]
Reference new StatusBarNotification and INotificationListener packages.
Requires change I1be46f82 in f/b.
Bug:
8199624
Change-Id: I2ebf7fde793dd932c5fadb308f8a0b93e18d9afa
Baligh Uddin [Fri, 5 Apr 2013 18:48:15 +0000 (18:48 +0000)]
Merge "Import translations. DO NOT MERGE" into jb-mr2-dev
Baligh Uddin [Fri, 5 Apr 2013 18:07:06 +0000 (11:07 -0700)]
Import translations. DO NOT MERGE
Change-Id: Ide4cc0e303747966dd29a5c849a2d9023b92e098
Auto-generated-cl: translation import
Kristian Monsen [Fri, 5 Apr 2013 17:41:34 +0000 (17:41 +0000)]
Merge "Adding developer toggle for using Chromium WebView." into jb-mr2-dev
Fabrice Di Meglio [Thu, 4 Apr 2013 17:59:50 +0000 (17:59 +0000)]
Merge "More fix for bug #
8505156 WiFi properties dialog is having some issues in RTL mode" into jb-mr2-dev
Baligh Uddin [Wed, 3 Apr 2013 18:14:39 +0000 (11:14 -0700)]
Import translations. DO NOT MERGE
Change-Id: I5b8551dbf8daff54103023c68f8214b135dd07c1
Auto-generated-cl: translation import
Fabrice Di Meglio [Wed, 3 Apr 2013 01:36:43 +0000 (18:36 -0700)]
More fix for bug #
8505156 WiFi properties dialog is having some issues in RTL mode
- use setPaddingRelative() instead of setPadding()
- add missing android:textAlignment="viewStart"
Change-Id: I8b981fb64686067de5998e4e218b04126bf2b2f8
Robert Greenwalt [Tue, 2 Apr 2013 19:20:12 +0000 (19:20 +0000)]
Merge "pre-provide the mvno data of the edited apn" into jb-mr2-dev
Sungmin Choi [Thu, 21 Mar 2013 06:42:27 +0000 (15:42 +0900)]
pre-provide the mvno data of the edited apn
For mvno, user can add or edit mvno data field.
Pre-provide the mvno data of the edited apn when the user selects
one of the mvno types.
For example if user choose gid, populate the data field with the
current sim's gid1 data, or if user choose the SPN option, fill
in data with the current carrier string. If IMSI, fill in imsi data.
Change-Id: I1bc280054cc7cd37e78a279866cefd62872a19fb
Baligh Uddin [Mon, 1 Apr 2013 19:37:24 +0000 (19:37 +0000)]
Merge "Import translations. DO NOT MERGE" into jb-mr2-dev
Maggie Benthall [Mon, 1 Apr 2013 18:50:29 +0000 (18:50 +0000)]
Merge "When user has DISALLOW_USB_FILE_TRANSFER set, disable settings controls." into jb-mr2-dev
Amith Yamasani [Mon, 1 Apr 2013 05:40:26 +0000 (22:40 -0700)]
Better app filtering for limited users
Show all system apps that have launchers and widgets.
Show all downloaded apps.
Remove dupes by package name.
Change-Id: Ief59b057e55a55e48ef48c5a638f6daf6a952e4e
Amith Yamasani [Mon, 1 Apr 2013 00:50:55 +0000 (17:50 -0700)]
Implement proper settings restrictions
Settings restrictions for limited users translate to user
restrictions specified in UserManager. Added required strings.
TODO: Add NFC restriction.
Change-Id: If1f81319131855f5dc1b27fe5bd54a4fef616d7f
Amith Yamasani [Sat, 30 Mar 2013 03:28:28 +0000 (20:28 -0700)]
Remove Limited users category if empty
If there are no users under limited category, in a secondary user,
remove the subheading completely.
Change-Id: I0397b6198c8cfc147e9e7dc30a92a7cb2f5860e3
Baligh Uddin [Sat, 30 Mar 2013 02:41:06 +0000 (19:41 -0700)]
Import translations. DO NOT MERGE
Change-Id: I846ec473107cdeeb6573445d8faa60ab83fa6946
Auto-generated-cl: translation import
Amith Yamasani [Sat, 30 Mar 2013 01:48:38 +0000 (01:48 +0000)]
Merge "Follow changes to RestrictionEntry API" into jb-mr2-dev
Amith Yamasani [Thu, 28 Mar 2013 21:34:36 +0000 (14:34 -0700)]
Follow changes to RestrictionEntry API
Implement custom restrictions activity.
Fixed some bugs.
Change-Id: I094a6ffcc41c2936f76a8731048d7cb712c1b857
Maggie Benthall [Thu, 28 Mar 2013 18:58:27 +0000 (14:58 -0400)]
When user has DISALLOW_USB_FILE_TRANSFER set, disable settings controls.
Under Settings > Storage, remove the "USB computer connection" menu item.
In case someone launches the UsbSettings screen instead, also disable those checkboxes.
Change-Id: I59ec8b16bed4670beeac8d359e5368e4a659061b
Kenny Root [Fri, 29 Mar 2013 21:24:47 +0000 (21:24 +0000)]
Merge "Add KeyStore storage type to Settings UI" into jb-mr2-dev
Kenny Root [Fri, 29 Mar 2013 18:12:55 +0000 (11:12 -0700)]
Add KeyStore storage type to Settings UI
Give the user an idea of what kind of credential storage is in use on
this device for keystore daemon.
(cherry picked from commit
39b56008be0ad0b50fd65ec8fc1c6f9d81d60959)
Change-Id: Id89a1e210b3627914f080b0925bd0d0585872dd2
Fabrice Di Meglio [Fri, 29 Mar 2013 19:41:12 +0000 (19:41 +0000)]
Merge "Fix bug #
8505156 WiFi properties dialog is having some issues in RTL mode" into jb-mr2-dev
Irfan Sheriff [Fri, 29 Mar 2013 18:15:07 +0000 (11:15 -0700)]
Add install support for WIFI UID
Bug:
8472221
Change-Id: If203760fc960b4d8987d745e49ef1d4355c45adf
Fabrice Di Meglio [Fri, 29 Mar 2013 03:12:40 +0000 (20:12 -0700)]
Fix bug #
8505156 WiFi properties dialog is having some issues in RTL mode
- title should be "viewStart"
- link speed should be also "viewStart"
Change-Id: Ic0389a1e4ddf1b1d6fc1fcbeba50074434fdb52d
Jared Duke [Fri, 15 Mar 2013 22:13:41 +0000 (15:13 -0700)]
Adding developer toggle for using Chromium WebView.
This is hidden by default, and only revealed in device configurations that contain the Chromium WebView implementation.
BUG=
8383477
Change-Id: I8fbb0bb55776e384b9bfc4feb6a2d30eed114ece
Eric Laurent [Thu, 28 Mar 2013 22:27:44 +0000 (22:27 +0000)]
Merge "Display vibrate icon in volume menu" into jb-mr2-dev
Kenny Root [Thu, 28 Mar 2013 21:32:50 +0000 (14:32 -0700)]
am
0d52fc18: am
9dc478ec: Merge "Add ability to install credentials as other UID"
* commit '
0d52fc184defef46378e7ba095091c7bab1ee459':
Add ability to install credentials as other UID
Kenny Root [Thu, 28 Mar 2013 21:30:37 +0000 (14:30 -0700)]
am
9dc478ec: Merge "Add ability to install credentials as other UID"
* commit '
9dc478ec23944e9b008ab559e2f1360a9e4818b4':
Add ability to install credentials as other UID
Kenny Root [Thu, 28 Mar 2013 20:57:03 +0000 (20:57 +0000)]
Merge "Add ability to install credentials as other UID"
Maggie Benthall [Thu, 28 Mar 2013 19:17:13 +0000 (19:17 +0000)]
Merge "Respect user restrictions about adding/removing accounts, sideloading" into jb-mr2-dev
Kenny Root [Thu, 28 Mar 2013 18:05:19 +0000 (11:05 -0700)]
Add ability to install credentials as other UID
We need the ability to install from the system UID to wifi UID
to explicitly bind WiFi credentials to the WiFi profile. This adds the
ability for Wifi Settings to invoke installation of a PKCS12 file for
the wifi UID.
Bug:
8183258
Change-Id: I357c4387baf7e2f6fd6acc9046d9e6b52fdd4bb0
Maggie Benthall [Thu, 14 Mar 2013 21:41:27 +0000 (17:41 -0400)]
Respect user restrictions about adding/removing accounts, sideloading
Hide or disable options in the settings app when the user is restricted from
making changes.
Remove "Add account" button from Settings menu, and "remove account" option from menu in AccountSyncSettings.
Remove sideloading checkbox in SecuritySettings.
Also handle replacement of UserManager.isShareLocationToggleAllowed() with hasUserRestriction, which takes a restriction key string.
Change-Id: I34c74fd5aed8956ba00f92e3d3c657b608454dfe
Amith Yamasani [Wed, 27 Mar 2013 19:30:55 +0000 (19:30 +0000)]
Merge "Split User settings into limited and trusted." into jb-mr2-dev
Amith Yamasani [Wed, 27 Mar 2013 19:27:01 +0000 (12:27 -0700)]
Split User settings into limited and trusted.
Also show avatars with the circular frame like on lockscreen.
Change-Id: I032d842555b2f50a07166460f9cfb1963366dbb1
Baligh Uddin [Wed, 27 Mar 2013 17:41:56 +0000 (17:41 +0000)]
Merge "Import translations. DO NOT MERGE" into jb-mr2-dev
Baligh Uddin [Wed, 27 Mar 2013 17:38:59 +0000 (10:38 -0700)]
Import translations. DO NOT MERGE
Change-Id: I7b83d0e661e36dfe47e342bf9e6086099c4b6be9
Auto-generated-cl: translation import
Jeff Sharkey [Wed, 27 Mar 2013 16:46:33 +0000 (16:46 +0000)]
Merge "Fix padding so TextViews are baseline aligned." into jb-mr2-dev
Jeff Sharkey [Wed, 27 Mar 2013 16:44:49 +0000 (09:44 -0700)]
Fix padding so TextViews are baseline aligned.
Also removed unused layout.
Change-Id: I1dd69c3766a58d389fb2fadcf04b23210af3d00a
Irfan Sheriff [Tue, 26 Mar 2013 22:41:17 +0000 (22:41 +0000)]
Merge "Allow wildcard for bypass proxy" into jb-mr2-dev
Amith Yamasani [Tue, 26 Mar 2013 22:27:29 +0000 (22:27 +0000)]
Merge "Device Admin Settings changes for Device Owner" into jb-mr2-dev
Irfan Sheriff [Tue, 26 Mar 2013 22:08:52 +0000 (15:08 -0700)]
Allow wildcard for bypass proxy
Allow *.example.com to be bypassed
Bug:
7422561
Change-Id: Ia7bd2d5b0a19794ae3bcccb8d6b78aeb2ba9c5fb
Irfan Sheriff [Tue, 26 Mar 2013 21:17:55 +0000 (21:17 +0000)]
Merge "Fix monkey crash" into jb-mr2-dev
Irfan Sheriff [Tue, 26 Mar 2013 21:11:36 +0000 (14:11 -0700)]
Fix monkey crash
Bug:
8011964
Change-Id: Idafdb7b3bc22d3280e0aa93877b7e09a23270149
Amith Yamasani [Mon, 25 Mar 2013 22:38:48 +0000 (15:38 -0700)]
Device Admin Settings changes for Device Owner
Disable the list entry for an active device owner, as it can't be deactivated.
Change-Id: I833561f91ae60dff8226f9118c9e3b012e5e194f
Eric Laurent [Tue, 26 Mar 2013 01:43:39 +0000 (18:43 -0700)]
Display vibrate icon in volume menu
When a tablet is in vibrate mode, the notification
volume icon in the volume menu should be vibrate
and not silent.
Bug
7235006
Change-Id: I460a579a7796f8fb2cac8ff581a98f23e57d1bb0
Jeff Sharkey [Mon, 25 Mar 2013 23:13:21 +0000 (23:13 +0000)]
Merge "Fix Data Usage restrict logic, scrolling." into jb-mr2-dev
Jeff Sharkey [Mon, 25 Mar 2013 23:13:00 +0000 (16:13 -0700)]
Fix Data Usage restrict logic, scrolling.
Bug:
8141491
Change-Id: I4e94666c59d91fb112477781ab340fd25d03de27
Jeff Sharkey [Mon, 25 Mar 2013 22:12:34 +0000 (22:12 +0000)]
Merge "Read NumberPicker value after finishing edit." into jb-mr2-dev
Jeff Sharkey [Mon, 25 Mar 2013 22:11:25 +0000 (15:11 -0700)]
Read NumberPicker value after finishing edit.
Bug:
6881204
Change-Id: I736c9205b69914353f88028a3794db6cd43c4c74
Baligh Uddin [Mon, 25 Mar 2013 20:57:42 +0000 (20:57 +0000)]
Merge "Import translations. DO NOT MERGE" into jb-mr2-dev
Baligh Uddin [Mon, 25 Mar 2013 20:22:50 +0000 (13:22 -0700)]
Import translations. DO NOT MERGE
Change-Id: I898d0fd6ce299f2ffb6cc38805baf566e83f501f
Auto-generated-cl: translation import
Eric Laurent [Mon, 25 Mar 2013 17:09:49 +0000 (17:09 +0000)]
Merge "Do not display volume settings if volume is fixed" into jb-mr2-dev