OSDN Git Service
The Android Automerger [Tue, 2 Apr 2013 16:18:02 +0000 (09:18 -0700)]
merge in master-release history after reset to master
Baligh Uddin [Mon, 1 Apr 2013 19:41:42 +0000 (12:41 -0700)]
am
0c4da3fa: (-s ours) am
1c541aec: Merge "Import translations. DO NOT MERGE" into jb-mr2-dev
* commit '
0c4da3fa97dc637571d8f0473bc1a1f5bade4fdb':
Import translations. DO NOT MERGE
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
Baligh Uddin [Mon, 1 Apr 2013 19:36:05 +0000 (19:36 +0000)]
Merge "Import translations. DO NOT MERGE"
Maggie Benthall [Mon, 1 Apr 2013 18:55:05 +0000 (11:55 -0700)]
am
e427ccdc: am
8d9b07ed: Merge "When user has DISALLOW_USB_FILE_TRANSFER set, disable settings controls." into jb-mr2-dev
* commit '
e427ccdce304a8afe8ebb493d60e94de56acedb3':
When user has DISALLOW_USB_FILE_TRANSFER set, disable settings controls.
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.
The Android Automerger [Mon, 1 Apr 2013 18:51:04 +0000 (11:51 -0700)]
merge in master-release history after reset to master
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:46:01 +0000 (22:46 -0700)]
am
52d9a78f: am
cb7b0b77: Better app filtering for limited users
* commit '
52d9a78f2241b62e6fa1ce9e07777d7c8e30af96':
Better app filtering for limited users
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:25:07 +0000 (18:25 -0700)]
am
b19daff9: am
2601cd91: Implement proper settings restrictions
* commit '
b19daff9cb6f04a71343f858a0c44415412b8049':
Implement proper settings restrictions
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:33:07 +0000 (20:33 -0700)]
am
fe44098d: am
732c80ff: Remove Limited users category if empty
* commit '
fe44098dd126af1a19fe3e29e35506a07bc05c62':
Remove Limited users category if empty
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:43:43 +0000 (19:43 -0700)]
Import translations. DO NOT MERGE
Change-Id: I709c77b2c45763a2090875189d88c65d28903030
Auto-generated-cl: translation import
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:56:30 +0000 (18:56 -0700)]
am
26aca80e: am
a7ff2a2d: Merge "Follow changes to RestrictionEntry API" into jb-mr2-dev
* commit '
26aca80eb1813cfe69450383efd8442805b16da5':
Follow changes to RestrictionEntry API
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:46:39 +0000 (16:46 -0700)]
am
47704d08: am
43366b2c: Merge "Add KeyStore storage type to Settings UI"
* commit '
47704d08b8756d78d426100b97a4fa81b81f12b3':
Add KeyStore storage type to Settings UI
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:36:30 +0000 (14:36 -0700)]
am
ab6a6645: Merge "Add KeyStore storage type to Settings UI" into jb-mr2-dev
* commit '
ab6a6645b01312816fe0688c76b5a26948252850':
Add KeyStore storage type to Settings UI
Fabrice Di Meglio [Fri, 29 Mar 2013 21:36:01 +0000 (14:36 -0700)]
am
fee612df: Merge "Fix bug #
8505156 WiFi properties dialog is having some issues in RTL mode" into jb-mr2-dev
* commit '
fee612df197ab3da969dff39ecc3df95b931cfae':
Fix bug #
8505156 WiFi properties dialog is having some issues in RTL mode
Irfan Sheriff [Fri, 29 Mar 2013 21:35:32 +0000 (14:35 -0700)]
am
0f41b49d: Add install support for WIFI UID
* commit '
0f41b49d1f33e86ec4e7004f009c074b68a90be6':
Add install support for WIFI UID
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
Eric Laurent [Thu, 28 Mar 2013 22:32:55 +0000 (15:32 -0700)]
am
899e4f27: Merge "Display vibrate icon in volume menu" into jb-mr2-dev
* commit '
899e4f27f1866acee29c67e6f19b50308a3b12c3':
Display vibrate icon in volume menu
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:36:37 +0000 (14:36 -0700)]
am
a8645309: am
0d52fc18: am
9dc478ec: Merge "Add ability to install credentials as other UID"
* commit '
a86453096979d027d65390f657568c945fea1b3d':
Add ability to install credentials as other UID
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:20:07 +0000 (12:20 -0700)]
am
02e8ca3e: Merge "Respect user restrictions about adding/removing accounts, sideloading" into jb-mr2-dev
* commit '
02e8ca3e9ad966bd523241aaa1eecf58865027a8':
Respect user restrictions about adding/removing accounts, sideloading
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
The Android Automerger [Thu, 28 Mar 2013 18:33:47 +0000 (11:33 -0700)]
merge in master-release history after reset to master
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:36:52 +0000 (12:36 -0700)]
am
0fb0d016: Merge "Split User settings into limited and trusted." into jb-mr2-dev
* commit '
0fb0d016dd51b0d8b882d92de58f5c2ea28a9208':
Split User settings into limited and trusted.
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:46:38 +0000 (10:46 -0700)]
am
c5a36d90: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-mr2-dev
* commit '
c5a36d903beb7929691b925d8b59664372e6d393':
Import translations. DO NOT MERGE
Baligh Uddin [Wed, 27 Mar 2013 17:42:47 +0000 (17:42 +0000)]
Merge "Import translations. DO NOT MERGE"
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:41:39 +0000 (10:41 -0700)]
Import translations. DO NOT MERGE
Change-Id: I4cdb85276f2ff6e50f4978eaad3481a248a52fcb
Auto-generated-cl: translation import
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:51:27 +0000 (09:51 -0700)]
am
f7ad8e39: Merge "Fix padding so TextViews are baseline aligned." into jb-mr2-dev
* commit '
f7ad8e39748087e4e33a511d1c439b72ebd979b9':
Fix padding so TextViews are baseline aligned.
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
The Android Automerger [Wed, 27 Mar 2013 14:50:47 +0000 (07:50 -0700)]
merge in master-release history after reset to master
Irfan Sheriff [Tue, 26 Mar 2013 22:44:43 +0000 (15:44 -0700)]
am
05d67f62: Merge "Allow wildcard for bypass proxy" into jb-mr2-dev
* commit '
05d67f62b7370b3bbe3bf691ae01b8a46dd04606':
Allow wildcard for bypass proxy
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:31:35 +0000 (15:31 -0700)]
am
86ecd3c4: Merge "Device Admin Settings changes for Device Owner" into jb-mr2-dev
* commit '
86ecd3c437be3478ee17347df46ae53af0eef5ba':
Device Admin Settings changes for Device Owner
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:26:06 +0000 (14:26 -0700)]
am
61c30fe2: Merge "Fix monkey crash" into jb-mr2-dev
* commit '
61c30fe2d14573378321d3a8df21ffb14a54e43b':
Fix monkey crash
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
The Android Automerger [Tue, 26 Mar 2013 14:50:37 +0000 (07:50 -0700)]
merge in master-release history after reset to master
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:19:57 +0000 (23:19 +0000)]
am
c64fad39: Merge "Fix Data Usage restrict logic, scrolling." into jb-mr2-dev
* commit '
c64fad3917c7dc421cf541a1d5fb11ab77b24ca0':
Fix Data Usage restrict logic, scrolling.
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:18:47 +0000 (22:18 +0000)]
am
8111e3d7: Merge "Read NumberPicker value after finishing edit." into jb-mr2-dev
* commit '
8111e3d734b35588377cfcce412c7cdcb0da8aec':
Read NumberPicker value after finishing edit.
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 21:03:39 +0000 (21:03 +0000)]
Merge "Import translations. DO NOT MERGE"
Baligh Uddin [Mon, 25 Mar 2013 21:02:43 +0000 (21:02 +0000)]
am
a042cbf6: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-mr2-dev
* commit '
a042cbf653679af3208905178f58ea5ec035ae1d':
Import translations. DO NOT MERGE
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:26:38 +0000 (13:26 -0700)]
Import translations. DO NOT MERGE
Change-Id: I9a68ce9bb321f72d21f45500427ef6c7c05d3e82
Auto-generated-cl: translation import
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:16:28 +0000 (17:16 +0000)]
am
18e688bd: Merge "Do not display volume settings if volume is fixed" into jb-mr2-dev
* commit '
18e688bdd27b2e8821ec08c6775a0b0dae1b9f71':
Do not display volume settings if volume is fixed
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
The Android Automerger [Mon, 25 Mar 2013 14:50:34 +0000 (07:50 -0700)]
merge in master-release history after reset to master
Baligh Uddin [Fri, 22 Mar 2013 18:54:38 +0000 (18:54 +0000)]
am
fd906e28: (-s ours) Import translations. DO NOT MERGE
* commit '
fd906e28d8c105bf31051228afaa100fb10f3420':
Import translations. DO NOT MERGE
Baligh Uddin [Fri, 22 Mar 2013 18:40:40 +0000 (11:40 -0700)]
Import translations. DO NOT MERGE
Change-Id: Ieb6e68acb5825785163fd24b92568c97f3b66851
Auto-generated-cl: translation import
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
The Android Automerger [Fri, 22 Mar 2013 14:50:31 +0000 (07:50 -0700)]
merge in master-release history after reset to master
Irfan Sheriff [Fri, 22 Mar 2013 00:57:55 +0000 (00:57 +0000)]
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:19:51 +0000 (00:19 +0000)]
am
871bbbd0: Merge "Notify user that scans are still active" into jb-mr2-dev
* commit '
871bbbd0d64bab970f7fba228af2779c1fcbcc46':
Notify user that scans are still active
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:06:41 +0000 (22:06 +0000)]
am
05f9c75a: Merge "Add some extra info to the notification list rows." into jb-mr2-dev
* commit '
05f9c75a7b9793f5a712029aad365926aaddf4a8':
Add some extra info to the notification list rows.
Daniel Sandler [Thu, 21 Mar 2013 22:06:40 +0000 (22:06 +0000)]
am
158d57a5: Merge "Optimizations in the notification list:" into jb-mr2-dev
* commit '
158d57a5d1820cd1c4479ab71da55c8840a964e1':
Optimizations in the notification list:
Daniel Sandler [Thu, 21 Mar 2013 22:06:40 +0000 (22:06 +0000)]
am
76c4a1bf: Merge "Keep up with INotificationListener changes." into jb-mr2-dev
* commit '
76c4a1bf7c1f8e2b895bd99aa4815954e9e9bc16':
Keep up with INotificationListener changes.
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
