OSDN Git Service
Paul Mclean [Fri, 15 May 2015 22:28:07 +0000 (22:28 +0000)]
Revert "Addeding try/catch to card#/device# parsing in AlsaDevicesParser.java"
This reverts commit
34f5e042904c22643f96d4466caa003073708b62.
Change-Id: Ie2a00ef26b20a662fb0e801925a3721804e427ba
Paul McLean [Fri, 15 May 2015 20:57:03 +0000 (13:57 -0700)]
Addeding try/catch to card#/device# parsing in AlsaDevicesParser.java
Not the cause of, but related to...
Bug:
19082426
Change-Id: I296c67989debc932838b39d63fdb57396448c50c
Craig Mautner [Thu, 14 May 2015 20:03:03 +0000 (20:03 +0000)]
Merge "Lock top task if whitelisting arrives after start." into mnc-dev
Craig Mautner [Wed, 13 May 2015 20:06:11 +0000 (13:06 -0700)]
Lock top task if whitelisting arrives after start.
If the DevicePolicyManagerService updates the whitelist after a task
in the whitelist has started then the task won't have started locked.
When the updated whitelist arrives this change automatically locks the
topmost task if it is in the whitelist.
Also more locktask debugging.
Fixes bug
21031298.
Change-Id: I2494af6f2819ca91bc01abc5decb3d1adc088226
Wale Ogunwale [Thu, 14 May 2015 19:29:34 +0000 (19:29 +0000)]
Merge "Revert "Update IME focus when the active view is losing the focus."" into mnc-dev
Wale Ogunwale [Thu, 14 May 2015 19:20:53 +0000 (12:20 -0700)]
Revert "Update IME focus when the active view is losing the focus."
This reverts commit
97c381304207013fd95c7806df4dcca0c69006c0.
This causes issue with the right IME window getting focus.
Bug:
21144633
Change-Id: I4c75b6e7dd87c10f008444d2059164b52a8f4335
Yorke Lee [Thu, 14 May 2015 17:32:44 +0000 (17:32 +0000)]
Merge "Make Conferenceable an abstract class" into mnc-dev
Andrei Stingaceanu [Thu, 14 May 2015 17:21:08 +0000 (17:21 +0000)]
Merge "Editor: enable double tap for selection after cut/copy." into mnc-dev
Clara Bayarri [Thu, 14 May 2015 16:44:45 +0000 (16:44 +0000)]
Merge "PhoneWindow ActionMode handling tests" into mnc-dev
Alan Viverette [Thu, 14 May 2015 16:39:18 +0000 (16:39 +0000)]
Merge "Add example for detectResourceMismatches()" into mnc-dev
Daniel Sandler [Thu, 14 May 2015 16:34:52 +0000 (16:34 +0000)]
Merge "Revert "Icon support comes to Notification."" into mnc-dev
Daniel Sandler [Thu, 14 May 2015 15:32:28 +0000 (15:32 +0000)]
Revert "Icon support comes to Notification."
This reverts commit
08a04c15245c970856022d0779aa27d4d63cdee3.
This also reverts commit
5bcbf857d129f4513e562801a4e88077b2655ade.
Change-Id: Ia0b0a5339d523581c877822a3a1feec97ae4b73d
Joe Fernandez [Thu, 14 May 2015 16:05:33 +0000 (16:05 +0000)]
am
a90cb675: am
a0f0b5bf: am
574690b1: Merge "docs: Add weekly subscriptions and grace period information to IAB docs" into lmp-mr1-ub-docs
* commit '
a90cb675a53ebf9a749bcaefc19ba00c8cbf7570':
docs: Add weekly subscriptions and grace period information to IAB docs
Paul McLean [Thu, 14 May 2015 15:59:37 +0000 (15:59 +0000)]
Merge "New policy for internal and wired device names." into mnc-dev
Paul McLean [Thu, 14 May 2015 15:59:18 +0000 (15:59 +0000)]
Merge "Add manufacturer-provided device name for AudioPort name field for BT devices. Change "a2dp-device" to empty string for EnumAPI." into mnc-dev
Joe Fernandez [Thu, 14 May 2015 15:53:44 +0000 (15:53 +0000)]
am
a0f0b5bf: am
574690b1: Merge "docs: Add weekly subscriptions and grace period information to IAB docs" into lmp-mr1-ub-docs
* commit '
a0f0b5bfd8df9e0caa6848bc479f1ed3dc492efc':
docs: Add weekly subscriptions and grace period information to IAB docs
Chris Craik [Thu, 14 May 2015 15:53:17 +0000 (15:53 +0000)]
Merge "Add tracing for path texture upload" into mnc-dev
Alex Klyubin [Thu, 14 May 2015 15:51:00 +0000 (15:51 +0000)]
Merge "Move Android Keystore impl to android.security.keystore." into mnc-dev
Joe Fernandez [Thu, 14 May 2015 15:40:38 +0000 (15:40 +0000)]
am
574690b1: Merge "docs: Add weekly subscriptions and grace period information to IAB docs" into lmp-mr1-ub-docs
* commit '
574690b13c8f0d4835c6d86b8e26fc4c9b914037':
docs: Add weekly subscriptions and grace period information to IAB docs
Clara Bayarri [Thu, 7 May 2015 15:13:41 +0000 (16:13 +0100)]
PhoneWindow ActionMode handling tests
Tests focusing on action mode creation, how the two types of
modes are handled together and how the lifecycle is handled.
Change-Id: I17fe7a83cba4651b295a8ce80bc449f2f2538048
Michael Wright [Thu, 14 May 2015 15:31:10 +0000 (15:31 +0000)]
Merge "Revert "Revert "Add new MotionEvent actions for button press and release.""" into mnc-dev
Joe Fernandez [Thu, 14 May 2015 15:26:36 +0000 (15:26 +0000)]
Merge "docs: Add weekly subscriptions and grace period information to IAB docs" into lmp-mr1-ub-docs
Zoltan Szatmary-Ban [Thu, 14 May 2015 15:13:33 +0000 (15:13 +0000)]
Merge "Rename NetworkUsageStats -> NetworkStats" into mnc-dev
Andrei Stingaceanu [Wed, 29 Apr 2015 13:39:40 +0000 (14:39 +0100)]
Editor: enable double tap for selection after cut/copy.
* detect double tap in the TextView and pass it to Editor.
* add a timer (with getDoubleTapTimeout) for executing the
single tap job in Editor.
* if double tap is detected then cancel the single tap job.
This way one tap shows the toolbar if within the timeframe
and two taps select the word and show the toolbar.
Bug:
20442587
Change-Id: I0a117939c896fcb13669346e30c9c48d319576dd
Dan Sandler [Thu, 14 May 2015 15:10:01 +0000 (15:10 +0000)]
Merge "Fix icon-related crash." into mnc-dev
Lorenzo Colitti [Thu, 14 May 2015 15:07:09 +0000 (15:07 +0000)]
Merge "Don't display the "no Internet access" prompt on captive portals." into mnc-dev
Xiyuan Xia [Thu, 14 May 2015 15:05:53 +0000 (15:05 +0000)]
Merge "Clear security message on user input" into mnc-dev
John Reck [Thu, 14 May 2015 14:51:06 +0000 (14:51 +0000)]
am
570b2052: (-s ours) DO NOT MERGE resolved conflicts for merge of
951f2347 to lmp-mr1-ub-dev
* commit '
570b2052bb8eec8c510941b0a6d77262df28b922':
Revert "DO NOT MERGE Backport of limited jank-tracking metrics"
Lorenzo Colitti [Thu, 14 May 2015 14:15:10 +0000 (23:15 +0900)]
Don't display the "no Internet access" prompt on captive portals.
Bug:
20081183
Bug:
21066461
Change-Id: Idc71844a604f9ca655411c6916de256780ea4586
John Reck [Thu, 14 May 2015 14:38:07 +0000 (07:38 -0700)]
DO NOT MERGE resolved conflicts for merge of
951f2347 to lmp-mr1-ub-dev
Change-Id: Ic392bf6f2cf9e9bf526b6ea63a3be7e50420e7d1
Andrei Stingaceanu [Thu, 14 May 2015 14:27:16 +0000 (14:27 +0000)]
Merge "Fix: text selection bubbles move along with the text" into mnc-dev
Rubin Xu [Thu, 14 May 2015 14:00:16 +0000 (14:00 +0000)]
Merge "clear caller identify before sending system update notification" into mnc-dev
Dan Sandler [Thu, 14 May 2015 13:42:50 +0000 (09:42 -0400)]
Fix icon-related crash.
Bug:
21144636
Change-Id: Ib686e9a9a18ac6b9f1e249bcde74be9212e0f53b
Michael Wright [Thu, 14 May 2015 13:48:08 +0000 (14:48 +0100)]
Revert "Revert "Add new MotionEvent actions for button press and release.""
This reverts commit
96238051621ba2dc8a1c20fa48a00ec6ec4735d6.
Michael Wright [Thu, 14 May 2015 13:47:07 +0000 (13:47 +0000)]
Merge "Revert "Add new MotionEvent actions for button press and release."" into mnc-dev
Michael Wright [Thu, 14 May 2015 13:46:25 +0000 (14:46 +0100)]
Revert "Add new MotionEvent actions for button press and release."
This reverts commit
ec0ce51b733f10c620cb9447b074f022d042e31d.
Michael Wright [Thu, 14 May 2015 13:31:24 +0000 (13:31 +0000)]
Merge "Add new MotionEvent actions for button press and release." into mnc-dev
Andrei Stingaceanu [Thu, 7 May 2015 15:49:49 +0000 (16:49 +0100)]
Fix: text selection bubbles move along with the text
Always hide the selection cursor when showing the
insertion cursor.
Bug:
19857679
Change-Id: I549552fa5026e60f94900364b8194217e0de4b4a
Michael Wright [Fri, 8 May 2015 19:08:04 +0000 (20:08 +0100)]
Add new MotionEvent actions for button press and release.
Introduce ACTION_BUTTON_PRESS and ACTION_BUTTON_RELEASE as actions to
signal a button press or release. If these actions happen
simulanteously with a DOWN or UP event then they're explicitly
ordered to happen after the DOWN or preceding the UP in order to send
them to the most recently targeted view.
Also, introduce new stylus button constants that differ from the
constants we use for mouse buttons.
Bug:
20704355
Change-Id: I5b75e5c5e692171c1c117ee687dd185a0d9dd15c
Rubin Xu [Thu, 14 May 2015 12:48:35 +0000 (13:48 +0100)]
clear caller identify before sending system update notification
Because DeviceAdminReceiver is protected by BIND_DEVICE_ADMIN permission,
in order to send broadcast to it, we need to clear the caller's identity
and call sendBroadcastAsUser() as system.
Bug:
20213644
Change-Id: Icc7b239b9005e286012ade6580ec92a0a57198e0
Wojciech Staszkiewicz [Thu, 14 May 2015 10:27:23 +0000 (10:27 +0000)]
Merge "Pass charset to XmlPullParser.setInput instead of null" into mnc-dev
Andrei Stingaceanu [Thu, 14 May 2015 10:23:06 +0000 (10:23 +0000)]
Merge "Fix floating toolbar popping frequently after Replace/Copy" into mnc-dev
Narayan Kamath [Thu, 14 May 2015 09:34:07 +0000 (09:34 +0000)]
Merge "Fix build." into mnc-dev
Andrei Stingaceanu [Thu, 14 May 2015 09:33:56 +0000 (09:33 +0000)]
Merge "Fix: replace terminates extract mode (floating toolbar)" into mnc-dev
Chris Banes [Thu, 14 May 2015 09:32:38 +0000 (09:32 +0000)]
Merge "Fix build; doc link in ImageView" into mnc-dev
Clara Bayarri [Thu, 14 May 2015 09:28:45 +0000 (09:28 +0000)]
Merge "Tests for WindowDecorActionBar's startActionMode implementation" into mnc-dev
Narayan Kamath [Thu, 14 May 2015 09:27:41 +0000 (10:27 +0100)]
Fix build.
Broken @link tag in javadoc.
Change-Id: I1452d858eb46c9184903a0110ae645e949db4230
Clara Bayarri [Thu, 7 May 2015 14:18:27 +0000 (15:18 +0100)]
Tests for WindowDecorActionBar's startActionMode implementation
Change-Id: Ib7a79f3987fd565aabf4c5b093186ec669131522
Clara Bayarri [Thu, 14 May 2015 09:25:25 +0000 (09:25 +0000)]
Merge "Tests for ActionBarContainer's startActionModeForChild" into mnc-dev
Clara Bayarri [Wed, 6 May 2015 15:01:57 +0000 (16:01 +0100)]
Tests for ActionBarContainer's startActionModeForChild
Change-Id: Ida782cb72f26689ec49a6674dcaeee7d2fb196d3
Wojciech Staszkiewicz [Fri, 8 May 2015 13:58:46 +0000 (14:58 +0100)]
Pass charset to XmlPullParser.setInput instead of null
Passing null to XmlPullParser.setInput forces it to do additional
work, which can be easily avoided if we know the charset beforehand.
bug: b/
20849543
Change-Id: Iaff97be9df2d0f99d7af8f19f65934439c9658e2
Chris Banes [Thu, 14 May 2015 09:12:20 +0000 (10:12 +0100)]
Fix build; doc link in ImageView
Change-Id: Ie3057fc2b920f71ff89eee0d3577d21d0e9930c3
Geoff Mendal [Thu, 14 May 2015 08:58:50 +0000 (08:58 +0000)]
Merge "Import translations. DO NOT MERGE" into mnc-dev
Geoff Mendal [Thu, 14 May 2015 08:58:19 +0000 (08:58 +0000)]
Merge "Import translations. DO NOT MERGE" into mnc-dev
Geoff Mendal [Thu, 14 May 2015 08:57:55 +0000 (08:57 +0000)]
Merge "Import translations. DO NOT MERGE" into mnc-dev
Geoff Mendal [Thu, 14 May 2015 08:57:40 +0000 (08:57 +0000)]
Merge "Import translations. DO NOT MERGE" into mnc-dev
Geoff Mendal [Thu, 14 May 2015 08:56:14 +0000 (01:56 -0700)]
Import translations. DO NOT MERGE
Change-Id: I0096104dd65eeb3b4e7bf836c09a58f8aa34965e
Auto-generated-cl: translation import
Geoff Mendal [Thu, 14 May 2015 08:52:48 +0000 (01:52 -0700)]
Import translations. DO NOT MERGE
Change-Id: I39f1448a0cead40a7deadb7769eb14dea658bf0a
Auto-generated-cl: translation import
Geoff Mendal [Thu, 14 May 2015 08:25:41 +0000 (01:25 -0700)]
Import translations. DO NOT MERGE
Change-Id: I67b89c7404834f90bd632fdb0fa400187902a0f1
Auto-generated-cl: translation import
Geoff Mendal [Thu, 14 May 2015 08:22:15 +0000 (01:22 -0700)]
Import translations. DO NOT MERGE
Change-Id: I2fd493c8a9420bd2a42011ff69301d2ef0375523
Auto-generated-cl: translation import
Robin Lee [Tue, 5 May 2015 14:57:17 +0000 (15:57 +0100)]
Replace String host:port/url args with Uri arg
Uri provides a stronger guarantee of well-formedness and lets apps do
nice extra things like specifying scheme etc. without twisting any
expectations.
Bug:
20820034
Change-Id: Ia6bbedb74765444920b667d643fb7e1eb6a7292b
Deepanshu Gupta [Thu, 14 May 2015 05:21:19 +0000 (05:21 +0000)]
Merge "Fix build." into mnc-dev
Deepanshu Gupta [Thu, 14 May 2015 05:18:37 +0000 (22:18 -0700)]
Fix build.
When doing the full build, javalib.jar wasn't created. However, mm had
created the javalib.jar. Fix the build by not depending on javalib.jar,
but on classes.jar
Change-Id: I643676b1d73cbfce42946a065a2ada6c50cc959a
Deepanshu Gupta [Thu, 14 May 2015 04:53:00 +0000 (04:53 +0000)]
Merge "Update rendering fidelity tag to use constant." into mnc-dev
Deepanshu Gupta [Thu, 14 May 2015 04:52:56 +0000 (04:52 +0000)]
Merge "Revert "Call dispatchFinishTemporaryDetach before returning a transient view"" into mnc-dev
Geoff Mendal [Thu, 14 May 2015 04:52:31 +0000 (04:52 +0000)]
Merge "Import translations. DO NOT MERGE" into mnc-dev
Deepanshu Gupta [Thu, 14 May 2015 04:52:11 +0000 (04:52 +0000)]
Merge "Use Balanced line breaker instead of HighQuality." into mnc-dev
Deepanshu Gupta [Thu, 14 May 2015 04:52:01 +0000 (04:52 +0000)]
Merge "Update nav bar icons." into mnc-dev
Deepanshu Gupta [Thu, 14 May 2015 04:51:56 +0000 (04:51 +0000)]
Merge "Load ICU data in LayoutLib" into mnc-dev
Deepanshu Gupta [Thu, 14 May 2015 04:51:35 +0000 (04:51 +0000)]
Merge "Add missing delegates for M preview." into mnc-dev
Deepanshu Gupta [Thu, 14 May 2015 04:51:23 +0000 (04:51 +0000)]
Merge "Run setup for full tests only once." into mnc-dev
Deepanshu Gupta [Thu, 14 May 2015 04:51:14 +0000 (04:51 +0000)]
Merge "Remove kxml dependency." into mnc-dev
Deepanshu Gupta [Thu, 14 May 2015 04:47:10 +0000 (21:47 -0700)]
Update rendering fidelity tag to use constant.
Change-Id: If6c1076aa1e070c6bda7be16516fe0e18a95fe2d
Geoff Mendal [Thu, 14 May 2015 04:44:23 +0000 (21:44 -0700)]
Import translations. DO NOT MERGE
Change-Id: I74bbf76bccf8567fe859e3ee4d0884b1306fc7e2
Auto-generated-cl: translation import
Geoff Mendal [Thu, 14 May 2015 04:36:17 +0000 (04:36 +0000)]
Merge "Import translations. DO NOT MERGE" into mnc-dev
Geoff Mendal [Thu, 14 May 2015 04:28:40 +0000 (21:28 -0700)]
Import translations. DO NOT MERGE
Change-Id: If33561fdaf98e273425caa3c0e9da3cf81446886
Auto-generated-cl: translation import
Keisuke Kuroyanagi [Thu, 14 May 2015 04:26:20 +0000 (04:26 +0000)]
Merge "Track difference between touch and word in x coordinate." into mnc-dev
Deepanshu Gupta [Thu, 14 May 2015 04:25:57 +0000 (21:25 -0700)]
Revert "Call dispatchFinishTemporaryDetach before returning a transient view"
This reverts commit
c73a1aaa90694c66feefc59557b35f5913ef1b04. The change
causes an NPE when rendering ListViews.
Joe Fernandez [Fri, 8 May 2015 21:25:42 +0000 (14:25 -0700)]
docs: Add weekly subscriptions and grace period information to IAB docs
b/
20351362
Change-Id: Ie1d9c928acbe3ae3846680d6fa4ff9e2fa049f84
Deepanshu Gupta [Thu, 14 May 2015 03:53:14 +0000 (20:53 -0700)]
Use Balanced line breaker instead of HighQuality.
Fallback to the Balanced line breaker till the time HighQuality one is
implemented.
Change-Id: I51e9882c5c733e5409f932ef740684829340ced9
Dan Sandler [Wed, 6 May 2015 19:18:49 +0000 (15:18 -0400)]
Icon support comes to Notification.
And you may ask yourself: what is that beautiful icon?
And you may ask yourself: where does that API go to?
And you may ask yourself: is it a resource? is it a Bitmap?
And you may say to yourself: my god, what have I done
Bug:
18568715
Change-Id: I4377b311c538bd1cf36b3fba22326bae81af40c9
Dan Sandler [Wed, 13 May 2015 04:12:47 +0000 (00:12 -0400)]
Add Icon support to ImageView.
ImageView.setImageIcon() is remotable, so you can also call
RemoteViews.setImageViewIcon().
Bug:
18568715
Change-Id: I456cfa65102e1983d3392d822584d154a6cd761a
Deepanshu Gupta [Wed, 13 May 2015 23:56:42 +0000 (16:56 -0700)]
Update nav bar icons.
- Add a script to copy the icons from the original source.
- Update layout used for the navigation bar to be closer to the original
layout.
- Update test image with the latest rendering.
- Add a nexus 5 landscape device config to help with testing.
Change-Id: I0b6674955e0970a6a8cce148b1b7aa61e1752ccd
Yorke Lee [Thu, 14 May 2015 01:55:18 +0000 (18:55 -0700)]
Make Conferenceable an abstract class
Bug:
21066017
Change-Id: Ibcbccfc7b1380e417b464aed9b968cbc0a6a1cc2
Geoff Mendal [Thu, 14 May 2015 03:48:13 +0000 (03:48 +0000)]
Merge "Import translations. DO NOT MERGE" into mnc-dev
Geoff Mendal [Thu, 14 May 2015 03:47:17 +0000 (20:47 -0700)]
Import translations. DO NOT MERGE
Change-Id: Ie70f9077c3e51b08528ca37c3614b065ab44c68b
Auto-generated-cl: translation import
Vinit Deshpande [Thu, 14 May 2015 03:39:45 +0000 (03:39 +0000)]
Merge "fix null pointer crash" into mnc-dev
Lorenzo Colitti [Thu, 14 May 2015 03:25:20 +0000 (03:25 +0000)]
Merge "Only activate the wifi alternate reality hack for KK and lower" into mnc-dev
Jean-Michel Trivi [Thu, 14 May 2015 03:21:54 +0000 (03:21 +0000)]
Merge "AudioTrack in SoundPool uses audio_attributes_t parameter" into mnc-dev
Jeff Brown [Thu, 14 May 2015 02:52:08 +0000 (02:52 +0000)]
Merge "DO NOT MERGE - Overlay display now support multiple modes." into mnc-dev
Sanket Padawe [Thu, 14 May 2015 02:40:36 +0000 (02:40 +0000)]
Merge "Hotspot 2.0 UI." into mnc-dev
Jean-Michel Trivi [Thu, 14 May 2015 02:03:21 +0000 (19:03 -0700)]
AudioTrack in SoundPool uses audio_attributes_t parameter
Bug
20731155
Change-Id: I62ce9d5c5a88aaf534cfd1861378215f9253248d
Andy Hung [Thu, 14 May 2015 02:18:01 +0000 (02:18 +0000)]
Merge "Add getChannelIndexMasks API to AudioDeviceInfo" into mnc-dev
Pierre Vandwalle [Fri, 8 May 2015 23:07:04 +0000 (16:07 -0700)]
fix null pointer crash
(cherry-picked from mirror-m-wireless-internal-release
216d8c3 fix null pointer crash)
Bug:
20232584
Change-Id: I7c46e372bc8f3a54b0428ef56c034eb2c79133ea
Jaesung Chung [Thu, 14 May 2015 02:14:36 +0000 (02:14 +0000)]
Merge "TIF: Add DVB device handling to TvInputManagerService" into mnc-dev
Santos Cordon [Thu, 14 May 2015 02:10:33 +0000 (02:10 +0000)]
Merge "Improve javadoc for PRESENTATION_ constants." into mnc-dev
Santos Cordon [Thu, 14 May 2015 01:47:38 +0000 (18:47 -0700)]
Improve javadoc for PRESENTATION_ constants.
Bug:
21089678
Change-Id: I045fd71a30c75c213dd5c0c64ded983ea5e5d866
Santos Cordon [Thu, 14 May 2015 02:07:52 +0000 (02:07 +0000)]
Merge "[1/4] Use new Icon class in PhoneAccount." into mnc-dev
Yorke Lee [Thu, 14 May 2015 02:06:52 +0000 (02:06 +0000)]
Merge "Add BIND_TELECOM_CONNECTION_SERVICE permission" into mnc-dev
Svetoslav [Thu, 14 May 2015 02:04:27 +0000 (02:04 +0000)]
Merge "Do not allow opting out from the new permission model." into mnc-dev