OSDN Git Service
Baligh Uddin [Tue, 9 Apr 2013 19:29:52 +0000 (12:29 -0700)]
am
f0e09bf7: Merge "Import translations. DO NOT MERGE" into jb-mr2-dev
* commit '
f0e09bf702cb62abe6bd53d17e5dd2e9593cc3b0':
Import translations. DO NOT MERGE
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:03:53 +0000 (12:03 -0700)]
am
f452008f: Merge "Properly remove experimental WebView preference when unavailable." into jb-mr2-dev
* commit '
f452008f5b6bf57dca0b624c14a7f3cfa1ae8fdd':
Properly remove experimental WebView preference when unavailable.
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:12:42 +0000 (11:12 -0700)]
am
0a970cae: Merge "Send app restrictions broadcast to stopped apps as well" into jb-mr2-dev
* commit '
0a970caed489fc10078eaad6796ee06832323bde':
Send app restrictions broadcast to stopped apps as well
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:35:12 +0000 (10:35 -0700)]
am
350938ec: Potential fix for a monkey-related NPE
* commit '
350938ecc69085badef2edc16491ff7a461dfb08':
Potential fix for a monkey-related NPE
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
The Android Open Source Project [Mon, 8 Apr 2013 20:36:32 +0000 (13:36 -0700)]
Reconcile with jb-mr2-release - do not merge
Change-Id: I6f525da73cd808b3dd861d2df8b279c861041b02
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 19:06:29 +0000 (12:06 -0700)]
resolved conflicts for merge of
3a271718 to jb-mr2-dev-plus-aosp
Change-Id: If405c0e3ccff4029c2b54cf557d09c086485ab20
Kenny Root [Mon, 8 Apr 2013 18:04:10 +0000 (11:04 -0700)]
am
645e78d8: Merge "Allow multiuser use of keystore" into jb-mr2-dev
* commit '
645e78d8063169fa59b69bdc83ac5a62840d3253':
Allow multiuser use of keystore
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
Kenny Root [Mon, 8 Apr 2013 17:34:32 +0000 (17:34 +0000)]
Merge "Allow multiuser use of keystore"
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.
Bug:
7249554
Change-Id: I5aa069ca439cea68e87e141c497be8cd86b0ba9d
Daniel Sandler [Mon, 8 Apr 2013 16:12:38 +0000 (09:12 -0700)]
am
b8c4898c: Fix "no notification listeners" text.
* commit '
b8c4898c64c6e1a0e3d0a1de7c0116d80edb6e44':
Fix "no notification listeners" text.
Daniel Sandler [Mon, 8 Apr 2013 16:01:33 +0000 (12:01 -0400)]
Fix "no notification listeners" text.
Bug:
8454150
Change-Id: I6b02367e2be9f31fdf0a54d7fc0c49f8c82922d7
The Android Automerger [Mon, 8 Apr 2013 12:57:01 +0000 (05:57 -0700)]
merge in jb-mr2-release history after reset to jb-mr2-dev
Nick Kralevich [Sun, 7 Apr 2013 17:56:54 +0000 (10:56 -0700)]
am
b26a61d6: InstalledAppDetails: allow revocable permission.
* commit '
b26a61d6433e2e5456563e5d33aa4f419a8966fb':
InstalledAppDetails: allow revocable permission.
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
Daniel Sandler [Fri, 5 Apr 2013 19:58:41 +0000 (12:58 -0700)]
am
79b9bfe5: Notification listeners can be enabled in Settings>Security.
* commit '
79b9bfe56ee4036fbe8d9bcac01260356309ae2f':
Notification listeners can be enabled in Settings>Security.
Daniel Sandler [Fri, 5 Apr 2013 19:58:40 +0000 (12:58 -0700)]
am
e44f5e2b: Reference new StatusBarNotification and INotificationListener packages.
* commit '
e44f5e2bd6624f5df91e2676b1ef5e3ddf279066':
Reference new StatusBarNotification and INotificationListener packages.
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:53:35 +0000 (11:53 -0700)]
am
34e85f84: Merge "Import translations. DO NOT MERGE" into jb-mr2-dev
* commit '
34e85f841cf1022a1e709cc6288c68267d358e0b':
Import translations. DO NOT MERGE
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:46:44 +0000 (10:46 -0700)]
am
a95604de: Merge "Adding developer toggle for using Chromium WebView." into jb-mr2-dev
* commit '
a95604de1acd89999c240449e926485393963455':
Adding developer toggle for using Chromium WebView.
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 18:02:04 +0000 (11:02 -0700)]
am
e68959de: Merge "More fix for bug #
8505156 WiFi properties dialog is having some issues in RTL mode" into jb-mr2-dev
* commit '
e68959de3a7f2d47de4816b65262b10e03ef313c':
More fix for bug #
8505156 WiFi properties dialog is having some issues in RTL mode
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 21:59:08 +0000 (14:59 -0700)]
am
186e250a: Import translations. DO NOT MERGE
* commit '
186e250ac7f74e8c724919184e949f7bf17afefb':
Import translations. DO NOT MERGE
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:25:17 +0000 (12:25 -0700)]
am
58f9cbd6: Merge "pre-provide the mvno data of the edited apn" into jb-mr2-dev
* commit '
58f9cbd6774741d7fffbddbd06f2c0bf1fdf2e66':
pre-provide the mvno data of the edited apn
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:39:36 +0000 (12:39 -0700)]
am
1c541aec: Merge "Import translations. DO NOT MERGE" into jb-mr2-dev
* commit '
1c541aec2be937f3ba6b1530551c16435d0eafc6':
Import translations. DO NOT MERGE
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:52:50 +0000 (11:52 -0700)]
am
8d9b07ed: Merge "When user has DISALLOW_USB_FILE_TRANSFER set, disable settings controls." into jb-mr2-dev
* commit '
8d9b07edb1785983f60a317a6adbc6199f81788c':
When user has DISALLOW_USB_FILE_TRANSFER set, disable settings controls.
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:44:14 +0000 (22:44 -0700)]
am
cb7b0b77: Better app filtering for limited users
* commit '
cb7b0b77ae04a84c75611a98a583c81208575ba5':
Better app filtering for limited users
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 01:22:50 +0000 (18:22 -0700)]
am
2601cd91: Implement proper settings restrictions
* commit '
2601cd9142bda1953c1e7b0302f7e0d0f02b0c1b':
Implement proper settings restrictions
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:31:22 +0000 (20:31 -0700)]
am
732c80ff: Remove Limited users category if empty
* commit '
732c80ff18a0e0e0cd516e7ec007eda1574cd2de':
Remove Limited users category if empty
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:51:15 +0000 (18:51 -0700)]
am
a7ff2a2d: Merge "Follow changes to RestrictionEntry API" into jb-mr2-dev
* commit '
a7ff2a2d22b43197a168655159612c96c90fa335':
Follow changes to RestrictionEntry API
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
Kenny Root [Fri, 29 Mar 2013 23:45:15 +0000 (16:45 -0700)]
am
43366b2c: Merge "Add KeyStore storage type to Settings UI"
* commit '
43366b2c546045f3b554427bc6e97a6b529ab66a':
Add KeyStore storage type to Settings UI
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
Kenny Root [Fri, 29 Mar 2013 21:09:47 +0000 (21:09 +0000)]
Merge "Add KeyStore storage type to Settings UI"
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
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.
Change-Id: Ic970fb908989662665bf1af968ca4a6a9dbfb55a
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
Baligh Uddin [Fri, 22 Mar 2013 18:37:52 +0000 (11:37 -0700)]
Import translations. DO NOT MERGE
Change-Id: I2a3ca4e806acc10e961d5720761de5f9e608455a
Auto-generated-cl: translation import
Irfan Sheriff [Fri, 22 Mar 2013 00:49:31 +0000 (17:49 -0700)]
Fix build
Change-Id: Ic2eacc240e693cb523c9189c7bd62e1bf17fd85c
Eric Laurent [Wed, 20 Mar 2013 01:24:47 +0000 (18:24 -0700)]
Do not display volume settings if volume is fixed
When the configuration option config_useFixedVolume is true
indicating that stream volumes cannot be modified, the volume
settings submenu is not available.
Bug
8161458
Change-Id: I6d76a2f85c642778ae8c4caa7347b50f659c1def
Irfan Sheriff [Fri, 22 Mar 2013 00:15:12 +0000 (00:15 +0000)]
Merge "Notify user that scans are still active" into jb-mr2-dev
Irfan Sheriff [Thu, 21 Mar 2013 19:16:52 +0000 (12:16 -0700)]
Notify user that scans are still active
Bug:
8141918
Change-Id: I115ce2ac57125b8ffbb34245dc25effd4b3bebb0
Daniel Sandler [Thu, 21 Mar 2013 22:02:40 +0000 (22:02 +0000)]
Merge "Add some extra info to the notification list rows." into jb-mr2-dev
Daniel Sandler [Thu, 21 Mar 2013 22:02:36 +0000 (22:02 +0000)]
Merge "Optimizations in the notification list:" into jb-mr2-dev
OSDN Git Service
