OSDN Git Service
James Cook [Tue, 17 Mar 2015 21:16:28 +0000 (21:16 +0000)]
Merge "Recents: Tapping on background returns to launcher"
Andreas Gampe [Tue, 17 Mar 2015 21:12:25 +0000 (21:12 +0000)]
am
3814163b: am
aae42eb2: Merge "Frameworks/base: Fix format string in Camera"
* commit '
3814163b6ddc35292f6b25f782ad7a858c703c24':
Frameworks/base: Fix format string in Camera
Andreas Gampe [Tue, 17 Mar 2015 21:05:48 +0000 (21:05 +0000)]
am
aae42eb2: Merge "Frameworks/base: Fix format string in Camera"
* commit '
aae42eb26176482b09f0846e6acf7efa844a0d23':
Frameworks/base: Fix format string in Camera
Andreas Gampe [Tue, 17 Mar 2015 20:56:02 +0000 (20:56 +0000)]
am
e4bdf3c1: am
be549f9b: Merge "Frameworks/base: Fix precedence bug"
* commit '
e4bdf3c1c9e7be06b68cc32f9a492d512bf87528':
Frameworks/base: Fix precedence bug
Andreas Gampe [Tue, 17 Mar 2015 20:52:20 +0000 (20:52 +0000)]
Merge "Frameworks/base: Fix format string in Camera"
Andreas Gampe [Sun, 15 Mar 2015 21:43:31 +0000 (14:43 -0700)]
Frameworks/base: Fix format string in Camera
One cannot print a boolean with %d. That will result in an exception.
Bug:
19797138
Change-Id: I86c42ea834cebebaecff8463637cc9de14d1fc88
Andreas Gampe [Tue, 17 Mar 2015 20:49:18 +0000 (20:49 +0000)]
am
be549f9b: Merge "Frameworks/base: Fix precedence bug"
* commit '
be549f9b8e01f884a2cc2d668457c6b1c12ff4cc':
Frameworks/base: Fix precedence bug
Filip Gruszczynski [Tue, 17 Mar 2015 20:47:48 +0000 (20:47 +0000)]
am
d0663e03: am
7bd2feda: Merge "Add animation to zeroing burn in protection." into lmp-mr1-modular-dev
* commit '
d0663e03657704db8e9006a0a3aa919ed28c6d03':
Add animation to zeroing burn in protection.
Andreas Gampe [Tue, 17 Mar 2015 20:47:41 +0000 (20:47 +0000)]
am
c8484abb: am
0ae488e1: Merge "Frameworks/base: Use || instead of |"
* commit '
c8484abbbde02171023f159491ca342186ae095c':
Frameworks/base: Use || instead of |
Andreas Gampe [Tue, 17 Mar 2015 20:47:33 +0000 (20:47 +0000)]
am
17eda7d0: am
4d907643: Merge "Frameworks/base: Fix trivial equals implementation"
* commit '
17eda7d0bed1d32a9b8f4a6a9d572aeabb43810a':
Frameworks/base: Fix trivial equals implementation
Filip Gruszczynski [Tue, 17 Mar 2015 20:44:58 +0000 (20:44 +0000)]
am
7bd2feda: Merge "Add animation to zeroing burn in protection." into lmp-mr1-modular-dev
* commit '
7bd2feda9e146c90c8720d8aa213ebcd9c30430c':
Add animation to zeroing burn in protection.
Andreas Gampe [Tue, 17 Mar 2015 20:41:04 +0000 (20:41 +0000)]
am
0ae488e1: Merge "Frameworks/base: Use || instead of |"
* commit '
0ae488e1cb64318906397a40d8be4866e81e4860':
Frameworks/base: Use || instead of |
Andreas Gampe [Tue, 17 Mar 2015 20:40:58 +0000 (20:40 +0000)]
am
4d907643: Merge "Frameworks/base: Fix trivial equals implementation"
* commit '
4d9076437c0270cd863493f505e734a3108e89ea':
Frameworks/base: Fix trivial equals implementation
Filip Gruszczynski [Tue, 17 Mar 2015 20:38:30 +0000 (20:38 +0000)]
Merge "Add animation to zeroing burn in protection." into lmp-mr1-modular-dev
Andreas Gampe [Tue, 17 Mar 2015 20:36:21 +0000 (20:36 +0000)]
Merge "Frameworks/base: Fix precedence bug"
Andreas Gampe [Sun, 15 Mar 2015 20:59:50 +0000 (13:59 -0700)]
Frameworks/base: Fix precedence bug
Explicit cast has higher precedence than shift.
Bug:
19797138
Change-Id: Ifcf569bf774fbf65ee50c078f736ad167bcc6b8c
Andreas Gampe [Tue, 17 Mar 2015 20:28:52 +0000 (20:28 +0000)]
Merge "Frameworks/base: Use || instead of |"
Andreas Gampe [Mon, 16 Mar 2015 03:32:22 +0000 (20:32 -0700)]
Frameworks/base: Use || instead of |
Nothing wrong with | in this case, but || is canonical.
Bug:
19797138
Change-Id: I5f145736a5470f7cde06efce9a217d86eda2135f
Andreas Gampe [Tue, 17 Mar 2015 20:25:20 +0000 (20:25 +0000)]
Merge "Frameworks/base: Fix trivial equals implementation"
Andreas Gampe [Sun, 15 Mar 2015 22:21:25 +0000 (15:21 -0700)]
Frameworks/base: Fix trivial equals implementation
The comparator's equal implementation doesn't satisfy the constraints
of an equals method, namely being reflexive. Use the standard Object
implementation instead.
Bug:
19797138
Change-Id: I74f888e99533e1945aab7ab10fe8ee3ded6388f4
Wale Ogunwale [Tue, 17 Mar 2015 20:22:36 +0000 (20:22 +0000)]
Merge "Recompute focus stack if cleared while starting an activity."
Wale Ogunwale [Tue, 17 Mar 2015 18:36:24 +0000 (11:36 -0700)]
Recompute focus stack if cleared while starting an activity.
When starting an activity with Intent.FLAG_ACTIVITY_CLEAR_TOP flag,
the activity is destoried which can also cause its task to be removed
from its current stack if the activity process record is null. We now
recompute the stack for the activity task when this occurs so we
don't NPE later on.
Bug:
19552874
Change-Id: I50f51ca6dc32d4642f78d59cae93b0774bc6cdb7
Brian Carlstrom [Tue, 17 Mar 2015 19:51:28 +0000 (19:51 +0000)]
am
88dde1db: am
d8507e3a: am
83419118: am
97f3cd0a: Merge "Update vmSafeMode documentation" into lmp-mr1-dev
* commit '
88dde1db446c414bee7fb56e292be6b0ce6ac268':
Update vmSafeMode documentation
Brian Carlstrom [Tue, 17 Mar 2015 19:44:55 +0000 (19:44 +0000)]
am
d8507e3a: am
83419118: am
97f3cd0a: Merge "Update vmSafeMode documentation" into lmp-mr1-dev
* commit '
d8507e3aa4c8b05f753cd9541014c391891c1f75':
Update vmSafeMode documentation
Brian Carlstrom [Tue, 17 Mar 2015 19:36:19 +0000 (19:36 +0000)]
am
83419118: am
97f3cd0a: Merge "Update vmSafeMode documentation" into lmp-mr1-dev
* commit '
83419118e3c72311ef6b900457d1b03fd5c77883':
Update vmSafeMode documentation
Brian Carlstrom [Tue, 17 Mar 2015 19:29:20 +0000 (19:29 +0000)]
am
97f3cd0a: Merge "Update vmSafeMode documentation" into lmp-mr1-dev
* commit '
97f3cd0a8280b2cf08069cc1e2d89d8bb227633f':
Update vmSafeMode documentation
John Spurlock [Tue, 17 Mar 2015 19:24:23 +0000 (19:24 +0000)]
Merge "QS: 'Cast screen' -> 'Cast'."
Brian Carlstrom [Tue, 17 Mar 2015 19:22:45 +0000 (19:22 +0000)]
Merge "Update vmSafeMode documentation" into lmp-mr1-dev
John Spurlock [Tue, 17 Mar 2015 19:19:00 +0000 (19:19 +0000)]
Merge "Audio: Flag volume adjustments from hardware keys."
Clara Bayarri [Tue, 17 Mar 2015 19:12:26 +0000 (19:12 +0000)]
Merge "Delete the ActionModeWrapper now that it is not needed anymore."
Ruben Brunk [Tue, 17 Mar 2015 19:11:31 +0000 (19:11 +0000)]
Merge "camera2: Release surface in ImageReader#close and fix legacy cleanup"
Filip Gruszczynski [Tue, 17 Mar 2015 19:06:58 +0000 (19:06 +0000)]
am
81c47fc2: am
86318d76: Merge "Option for going home when going to sleep for devices without physical button." into lmp-mr1-modular-dev
* commit '
81c47fc23a0a15dddf37d96d28305e8b5e5ca2da':
Option for going home when going to sleep for devices without physical button.
Wale Ogunwale [Tue, 17 Mar 2015 19:02:59 +0000 (19:02 +0000)]
Merge "Convert some log points to in AMS to use ActivityManagerDebugConfig class."
Wale Ogunwale [Mon, 16 Mar 2015 16:55:45 +0000 (09:55 -0700)]
Convert some log points to in AMS to use ActivityManagerDebugConfig class.
Change-Id: I02154b0e1c2c64af840848fd6def054342922efa
Filip Gruszczynski [Tue, 17 Mar 2015 18:35:17 +0000 (18:35 +0000)]
am
86318d76: Merge "Option for going home when going to sleep for devices without physical button." into lmp-mr1-modular-dev
* commit '
86318d768a2c5043e1261e9daacf1497d1e4a732':
Option for going home when going to sleep for devices without physical button.
Filip Gruszczynski [Mon, 16 Mar 2015 21:47:32 +0000 (14:47 -0700)]
Add animation to zeroing burn in protection.
Also don't shift immediately after starting ambient mode, but wait until
the first update.
Bug:
19521822
Change-Id: Id0b267d0f30e4533195dcfadbed726db0866e4db
Filip Gruszczynski [Tue, 17 Mar 2015 18:29:29 +0000 (18:29 +0000)]
Merge "Option for going home when going to sleep for devices without physical button." into lmp-mr1-modular-dev
John Spurlock [Tue, 17 Mar 2015 18:23:00 +0000 (14:23 -0400)]
QS: 'Cast screen' -> 'Cast'.
Bug:
19773357
Change-Id: I967c972986af4eb97374d7cde1d3b19fb28986ff
John Spurlock [Tue, 17 Mar 2015 18:11:57 +0000 (14:11 -0400)]
Audio: Flag volume adjustments from hardware keys.
Bug:
19793279
Change-Id: If20d70c13c9e7d1f8a6b31e0069564073d30e2bc
Jean-Michel Trivi [Tue, 17 Mar 2015 18:05:03 +0000 (18:05 +0000)]
Merge "Notify newly registered audio focus listener of current focus owner"
James Cook [Tue, 17 Mar 2015 14:33:28 +0000 (07:33 -0700)]
Recents: Tapping on background returns to launcher
Conceptually the area outside the recents task stack looks like a
"desktop". Make a non-scroll tap outside the task stack close
recents and return to the launcher.
Bug:
19271451
Change-Id: I9e639d6b5c6127bc37e1003152ef7a6fcbc2c2f3
Ruben Brunk [Fri, 13 Mar 2015 03:54:03 +0000 (20:54 -0700)]
camera2: Release surface in ImageReader#close and fix legacy cleanup
Bug:
19694090
Change-Id: I344ad707dbd414db023e4770769b5237bd3bbb4e
Jeff Tinker [Tue, 17 Mar 2015 17:49:10 +0000 (17:49 +0000)]
Merge "Deprecate redundant event, should handle via NotProvisionedException"
Tobias Sargeant [Tue, 17 Mar 2015 17:07:10 +0000 (17:07 +0000)]
Merge "Add visual state callbacks to the WebView."
Wale Ogunwale [Tue, 17 Mar 2015 16:53:33 +0000 (16:53 +0000)]
Merge "Remove duplicate move of home stack that can cause animation jank."
Clara Bayarri [Tue, 17 Mar 2015 15:43:50 +0000 (15:43 +0000)]
Merge "Floating toolbars: Add content rect related methods to API"
Tobias Sargeant [Tue, 3 Mar 2015 18:07:40 +0000 (18:07 +0000)]
Add visual state callbacks to the WebView.
Registering a visual state callback allows the caller to be notified
after the commit, activation and swap of the current (or future) state
of the DOM tree has occurred. At the point at which the callback is
called, the caller can be sure that any DOM updates made prior to
the registration are ready to be drawn in the next WebView#onDraw.
We also provide a convenience callback related to the visual state:
* WebViewClient.onPageCommitVisible; called at the earliest point at
which the next draw will not render contents from the previously
loaded page.
Bug:
6375170
Change-Id: I17e706b6e6ba4a8c28c835552687c9f7a4623024
Yohei Yukawa [Tue, 17 Mar 2015 15:16:41 +0000 (15:16 +0000)]
Merge "Remove deprecated hidden public methods from InputMethodUtils."
Deepanshu Gupta [Tue, 17 Mar 2015 14:53:17 +0000 (14:53 +0000)]
am
199a70f1: am
576801ff: am
842eee9f: am
1f9a26af: am
158c08bc: am
ada85905: Fix AppCompat action bar theming.
* commit '
199a70f1820c38a9f1db1697ad91c4f5f07d00aa':
Fix AppCompat action bar theming.
Deepanshu Gupta [Tue, 17 Mar 2015 14:53:10 +0000 (14:53 +0000)]
am
0f8c9d1d: am
a5be9a7d: am
38467b5f: am
9a00f1c8: am
79f7fce7: am
2e4d9324: Fix NoActionBar themes rendering.
* commit '
0f8c9d1df28ed10b1c9013ddd315b306868e349d':
Fix NoActionBar themes rendering.
Mathieu Chartier [Tue, 17 Mar 2015 14:47:24 +0000 (14:47 +0000)]
am
5ec7c78d: am
008ec61e: Merge "Change jit properties to be debug properties"
* commit '
5ec7c78d52a5a01ed1755ad8b8e486e4c6f05a93':
Change jit properties to be debug properties
Deepanshu Gupta [Tue, 17 Mar 2015 14:44:52 +0000 (14:44 +0000)]
am
576801ff: am
842eee9f: am
1f9a26af: am
158c08bc: am
ada85905: Fix AppCompat action bar theming.
* commit '
576801ff82a85c4de19404dfe364eef7184b84e0':
Fix AppCompat action bar theming.
Deepanshu Gupta [Tue, 17 Mar 2015 14:44:46 +0000 (14:44 +0000)]
am
a5be9a7d: am
38467b5f: am
9a00f1c8: am
79f7fce7: am
2e4d9324: Fix NoActionBar themes rendering.
* commit '
a5be9a7d2d2cbcd3892fc916c9a944745024881d':
Fix NoActionBar themes rendering.
Mathieu Chartier [Tue, 17 Mar 2015 14:36:50 +0000 (14:36 +0000)]
am
008ec61e: Merge "Change jit properties to be debug properties"
* commit '
008ec61e0ccff0ca92cc0d2b5b73a1d620d3aad3':
Change jit properties to be debug properties
Deepanshu Gupta [Tue, 17 Mar 2015 14:36:05 +0000 (14:36 +0000)]
am
842eee9f: am
1f9a26af: am
158c08bc: am
ada85905: Fix AppCompat action bar theming.
* commit '
842eee9f816a2e35bf3c9ce6c14cd5e43684265b':
Fix AppCompat action bar theming.
Deepanshu Gupta [Tue, 17 Mar 2015 14:35:58 +0000 (14:35 +0000)]
am
38467b5f: am
9a00f1c8: am
79f7fce7: am
2e4d9324: Fix NoActionBar themes rendering.
* commit '
38467b5fbbc09ad05624454f735d27ada25565c8':
Fix NoActionBar themes rendering.
Andreas Gampe [Tue, 17 Mar 2015 14:29:50 +0000 (14:29 +0000)]
am
14e436ae: am
345a8f69: Merge "Frameworks/base: Fix a comparison"
* commit '
14e436aec45e7d83c2b3695c07d9740b9fd7f043':
Frameworks/base: Fix a comparison
Deepanshu Gupta [Tue, 17 Mar 2015 14:28:37 +0000 (14:28 +0000)]
am
1f9a26af: am
158c08bc: am
ada85905: Fix AppCompat action bar theming.
* commit '
1f9a26af95abba385b612c734d1d5e32d9e3f363':
Fix AppCompat action bar theming.
Deepanshu Gupta [Tue, 17 Mar 2015 14:28:33 +0000 (14:28 +0000)]
am
9a00f1c8: am
79f7fce7: am
2e4d9324: Fix NoActionBar themes rendering.
* commit '
9a00f1c84b7a7936a12415a08604ac8fb98ec5ea':
Fix NoActionBar themes rendering.
Deepanshu Gupta [Tue, 17 Mar 2015 14:16:50 +0000 (14:16 +0000)]
am
158c08bc: am
ada85905: Fix AppCompat action bar theming.
* commit '
158c08bcf1cd0bc702748ee2a4cf6aa259c26147':
Fix AppCompat action bar theming.
Deepanshu Gupta [Tue, 17 Mar 2015 14:16:42 +0000 (14:16 +0000)]
am
79f7fce7: am
2e4d9324: Fix NoActionBar themes rendering.
* commit '
79f7fce7a49e7b7cd414ff5c3fdb5cbaae45c1f1':
Fix NoActionBar themes rendering.
Yohei Yukawa [Fri, 20 Feb 2015 18:00:22 +0000 (03:00 +0900)]
Remove deprecated hidden public methods from InputMethodUtils.
This is a follow up CL for a recent attempt to minimize
the number of default enabled IMEs.
- part1: I831502db502f4073c9c2f50ce7705a4e45e2e1e3
- part2: Ife93d909fb8a24471c425c903e2b7048826e17a3
- part3: I6571d464a46453934f0a8f5e79018a67a9a3c845
- part4: I871ccda787eb0f1099ba3574356c1da4b33681f3
This CL removes following deprecated hidden public methods
from InputMethodUtils as planned.
- isSystemImeThatHasEnglishKeyboardSubtype(InputMethodInfo)
- isValidSystemDefaultIme(boolean, InputMethodInfo, Context)
- containsSubtypeOf(InputMethodInfo, String, String)
This is a pure code refactoring with preserving the current
logic. Hence no behavior change is intended.
Change-Id: I1ff994cbbdef83e1e907a0d88aa9ae09d45263b4
Christopher Tate [Tue, 17 Mar 2015 02:17:24 +0000 (02:17 +0000)]
Merge "Back up / restore spell checker configuration"
Christopher Tate [Tue, 17 Mar 2015 02:13:10 +0000 (02:13 +0000)]
Merge "Merge restored accessibility enable state, don't overwrite"
Christopher Tate [Tue, 17 Mar 2015 02:12:11 +0000 (02:12 +0000)]
Merge "Notification listener backup & restore"
Mathieu Chartier [Tue, 17 Mar 2015 02:04:33 +0000 (02:04 +0000)]
Merge "Change jit properties to be debug properties"
Vishwath Mohan [Tue, 17 Mar 2015 01:52:24 +0000 (01:52 +0000)]
Merge "Handle malformed manifests in printXMLBlock"
Christopher Tate [Tue, 17 Mar 2015 01:29:42 +0000 (18:29 -0700)]
Back up / restore spell checker configuration
Bug
19779845
Change-Id: Ib8382f0296f0726b64494d3b1fd8237e13adb540
Clara Bayarri [Wed, 25 Feb 2015 14:44:34 +0000 (14:44 +0000)]
Floating toolbars: Add content rect related methods to API
This CL adds the ActionMode.Callback2 abstract class and the rect
invalidate method needed to add the content rect API for Floating
Toolbars. It also extends the existing ActionModeCallbackWrapper in
DecorView to handle the case when ActionMode.Callback is provided
instead of Callback2, falling back to a default implementation.
Change-Id: Ia918ddfcfdf73d0e4cafd24c4a0573245d497cfe
Christopher Tate [Mon, 16 Mar 2015 23:55:14 +0000 (16:55 -0700)]
Merge restored accessibility enable state, don't overwrite
We do not want to accidentally disable the user's currently-enabled
accessibility service(s); presumably they turned them on during
setup for a reason. We now merge the prior + current states rather
than simply replacing the current state with the former.
Bug
19427367
Change-Id: I96eb47df57318c88066c5da6862f23f656639148
Andreas Gampe [Tue, 17 Mar 2015 00:25:04 +0000 (00:25 +0000)]
am
345a8f69: Merge "Frameworks/base: Fix a comparison"
* commit '
345a8f69ea2acd6d3ecf4c200cb33e8037f8798c':
Frameworks/base: Fix a comparison
Deepanshu Gupta [Tue, 17 Mar 2015 00:21:02 +0000 (00:21 +0000)]
am
ada85905: Fix AppCompat action bar theming.
* commit '
ada8590547348b77d8cbd56abdb8fadb3e72c015':
Fix AppCompat action bar theming.
Deepanshu Gupta [Tue, 17 Mar 2015 00:20:58 +0000 (00:20 +0000)]
am
2e4d9324: Fix NoActionBar themes rendering.
* commit '
2e4d93245764a1c1d7515361ddbb8fc1665f814e':
Fix NoActionBar themes rendering.
Andreas Gampe [Tue, 17 Mar 2015 00:12:24 +0000 (00:12 +0000)]
Merge "Frameworks/base: Fix a comparison"
Dongwon Kang [Mon, 16 Mar 2015 23:58:03 +0000 (23:58 +0000)]
Merge "TIF: Add getDescription() method to TvTrackInfo."
Christopher Tate [Tue, 17 Feb 2015 20:15:25 +0000 (12:15 -0800)]
Notification listener backup & restore
We now back up & restore the set of enabled notification listeners. Post-
restore, a listener that had been enabled on the ancestral device will be
enabled on the current device as soon as it's installed, matching the
user's previous configuration. After this has happened the enable/disable
state for that app is not "sticky"; disabling it again will work as
expected.
The infrastructure for accomplishing this is general: it can be leveraged
by any ManagedServices derivative. There's a bit of extra wiring in the
settings provider to support the restore-time information flow as well.
This is because ManagedServices -- like many other parts of the system --
monitors writes to the settings provider and does work in response to new
writes of the elements that it cares about. Unfortunately this means that
there is no way to use the BackupAgent's restoreFinished() hook to post-
process the restored data: by the time it is run, the ManagedService's
observers have already executed and culled any unknown components from
the description that was just pushed into settings.
As of this patch, the settings provider's restore logic knows that a
particular settings element will require a message to interested observers
about the restore-driven change. The message is delivered as a broadcast,
and is sent after the new value has been committed to the settings db.
Adding other system ManagedService handling that parallels this will only
require adding a new corresponding entry to the table of individual settings
for which the relevant "this settings element is being restored" broadcast
is sent, found in SettingsHelper.
(It isn't sent for all settings elements because very few settings elements
have semantics that require it; 3rd party code won't be running yet during
platform restore anyway; and sending up to hundreds of broadcasts during
setup & restore is far from ideal.)
Bug
19254153
Change-Id: Ib8268c6cb273862a3ee089d2764f3bff4a299103
Mathieu Chartier [Mon, 16 Mar 2015 23:10:52 +0000 (16:10 -0700)]
Change jit properties to be debug properties
Bug:
19735273
Change-Id: I266cf447a7af0595366bf89109d2823094f5cf41
Mike Lockwood [Mon, 16 Mar 2015 23:20:10 +0000 (23:20 +0000)]
Merge "MidiDeviceInfo: Fix NPE for devices with no port names"
Jean-Michel Trivi [Fri, 13 Mar 2015 17:11:28 +0000 (10:11 -0700)]
Notify newly registered audio focus listener of current focus owner
When an AudioPolicy with an AudioPolicyFocusListener gets registered,
notify it automatically of the current focus owner, i.e. the
top of the stack, if there is one.
Bug
19194917
Change-Id: I66fa141ce9550349d107288fc36ddab50898dc45
Tor Norbye [Mon, 16 Mar 2015 23:03:39 +0000 (23:03 +0000)]
Merge "Add @TransitionRes for transition resource integers"
Mike Lockwood [Mon, 16 Mar 2015 23:03:17 +0000 (16:03 -0700)]
MidiDeviceInfo: Fix NPE for devices with no port names
Change-Id: I703709f84b6b1951b67918c9762bb84a142d855c
Jeff Brown [Mon, 16 Mar 2015 22:53:21 +0000 (22:53 +0000)]
Merge "Reduce SQLite logspam."
Jeff Brown [Mon, 16 Mar 2015 22:21:45 +0000 (15:21 -0700)]
Reduce SQLite logspam.
Suppress "automatic index on" warnings unless verbose logging is enabled.
Also suppress any notices.
Bug:
19773765
Change-Id: I4a4160e81e2cccf5119770182a64d6bbd9cc3505
Selim Cinek [Mon, 16 Mar 2015 22:29:23 +0000 (22:29 +0000)]
Merge "Fixed a bug where HUNs would not dissappear"
Adam Lesinski [Mon, 16 Mar 2015 22:16:03 +0000 (22:16 +0000)]
Merge "Only attempt to load .apk files in AssetManager"
Adam Lesinski [Mon, 16 Mar 2015 22:10:56 +0000 (15:10 -0700)]
Only attempt to load .apk files in AssetManager
This will reduce the number of files we must open
and reduce log spam.
Change-Id: I595ba4a5ea8466e530915d6ae4cf1d3e3dba15ef
Dianne Hackborn [Mon, 16 Mar 2015 22:01:49 +0000 (22:01 +0000)]
Merge "Add new voice request for picking from a list."
Andreas Gampe [Mon, 16 Mar 2015 21:58:39 +0000 (21:58 +0000)]
am
7f95a1bc: am
5eb42122: Merge "Frameworks/base: Force long computation"
* commit '
7f95a1bc3271318d7f08f19426be24b17186f9f0':
Frameworks/base: Force long computation
Tor Norbye [Mon, 16 Mar 2015 21:20:30 +0000 (21:20 +0000)]
Merge "Add resource type annotations to some APIs"
Andreas Gampe [Mon, 16 Mar 2015 20:49:12 +0000 (20:49 +0000)]
am
5eb42122: Merge "Frameworks/base: Force long computation"
* commit '
5eb421221bcade4f5715d42843346f7d3c733547':
Frameworks/base: Force long computation
Andreas Gampe [Mon, 16 Mar 2015 20:36:04 +0000 (20:36 +0000)]
Merge "Frameworks/base: Force long computation"
Selim Cinek [Mon, 16 Mar 2015 20:34:43 +0000 (13:34 -0700)]
Fixed a bug where HUNs would not dissappear
Bug:
19626170
Change-Id: Iadc4bd6b2bfc85b3da67e1e87cf1514cfcb269bb
Andreas Gampe [Mon, 16 Mar 2015 20:26:43 +0000 (20:26 +0000)]
am
e6857531: am
f3e581c9: Merge "Frameworks/base: Check before foreach in Script"
* commit '
e685753136ee8e88212ad95b24284a153c86a0c1':
Frameworks/base: Check before foreach in Script
Andreas Gampe [Mon, 16 Mar 2015 20:26:32 +0000 (20:26 +0000)]
am
c3228a9d: am
3d33314e: Merge "Frameworks/base: Use equals for Integer comparison"
* commit '
c3228a9d400bcacd15fbbdf136ee1f9cf56de2d0':
Frameworks/base: Use equals for Integer comparison
Derek Sollenberger [Mon, 16 Mar 2015 19:40:07 +0000 (19:40 +0000)]
Merge "Add conic support to HWUI path tessellator."
Andreas Gampe [Mon, 16 Mar 2015 19:31:17 +0000 (19:31 +0000)]
am
f3e581c9: Merge "Frameworks/base: Check before foreach in Script"
* commit '
f3e581c99f33ae1857fa52b11cf9bfbfe400c553':
Frameworks/base: Check before foreach in Script
Derek Sollenberger [Mon, 16 Mar 2015 18:35:55 +0000 (14:35 -0400)]
Add conic support to HWUI path tessellator.
bug:
19732872
Change-Id: Ic3ae46f746325468ab972c9daf829099165eb596
Andreas Gampe [Mon, 16 Mar 2015 19:22:00 +0000 (19:22 +0000)]
am
3d33314e: Merge "Frameworks/base: Use equals for Integer comparison"
* commit '
3d33314e03c24758e3b3bbd9e23e40199a259b80':
Frameworks/base: Use equals for Integer comparison
Andreas Gampe [Mon, 16 Mar 2015 19:17:44 +0000 (19:17 +0000)]
Merge "Frameworks/base: Check before foreach in Script"
Andreas Gampe [Mon, 16 Mar 2015 19:10:39 +0000 (19:10 +0000)]
Merge "Frameworks/base: Use equals for Integer comparison"