OSDN Git Service
Adam Powell [Fri, 19 Jul 2013 02:42:41 +0000 (19:42 -0700)]
Add View#cancelPendingInputEvents API
This API allows an application to cancel deferred high-level input
events already in flight. It forms one tool of several to help apps
debounce input events and prevent things like multiple startActivity
calls, FragmentTransactions, etc. from executing when only one was
desired since it's otherwise not desirable for things like click
events to fire synchronously.
Change-Id: I60b12cd5350898065f0019d616e24d779eb8cff9
Dianne Hackborn [Thu, 5 Sep 2013 00:53:27 +0000 (00:53 +0000)]
Merge "Fix issue #
10461600: KLP API Review: UndoManager" into klp-dev
Dianne Hackborn [Thu, 5 Sep 2013 00:43:56 +0000 (17:43 -0700)]
Fix issue #
10461600: KLP API Review: UndoManager
Hide, hide, hide!
Change-Id: Ie04825723d9392a4258e2d738828201ee387f7c6
Chet Haase [Wed, 4 Sep 2013 23:47:44 +0000 (23:47 +0000)]
Merge "Transition API changes from API council recommendations" into klp-dev
Scott Main [Wed, 4 Sep 2013 22:43:40 +0000 (15:43 -0700)]
am
f56076ee: am
966b9d46: am
002057bf: Merge "update dashboards for 9/13" into jb-mr2-docs
* commit '
f56076eefba47dad9b66b3011f487dc9a22e2756':
update dashboards for 9/13
Scott Main [Wed, 4 Sep 2013 22:40:27 +0000 (15:40 -0700)]
am
966b9d46: am
002057bf: Merge "update dashboards for 9/13" into jb-mr2-docs
* commit '
966b9d467dbb21d7bbc0a49067110ff4ddaffb89':
update dashboards for 9/13
Michael Wright [Wed, 4 Sep 2013 22:37:05 +0000 (22:37 +0000)]
Merge "Fix keymap build dependencies and variable name collisions" into klp-dev
Scott Main [Wed, 4 Sep 2013 22:36:59 +0000 (15:36 -0700)]
am
002057bf: Merge "update dashboards for 9/13" into jb-mr2-docs
* commit '
002057bf0452168fd88eb81c2d36f02cfb260769':
update dashboards for 9/13
Scott Main [Wed, 4 Sep 2013 22:35:04 +0000 (22:35 +0000)]
Merge "update dashboards for 9/13" into jb-mr2-docs
Glenn Kasten [Wed, 4 Sep 2013 22:29:19 +0000 (22:29 +0000)]
Merge "Java API for AudioTrack timestamps" into klp-dev
Glenn Kasten [Wed, 4 Sep 2013 20:51:29 +0000 (13:51 -0700)]
Java API for AudioTrack timestamps
This change adds android.media.AudioTimestamp and
android.media.AudioTrack.getTimestamp, with implementation, but hidden.
Change-Id: Ic314f04ff775baca05c57d19b5ea91133dbd0be1
Scott Main [Wed, 4 Sep 2013 01:01:31 +0000 (18:01 -0700)]
update dashboards for 9/13
Change-Id: I50171e5448fa062ed59d585c603cb5ac80f80d47
Chong Zhang [Wed, 4 Sep 2013 22:07:05 +0000 (22:07 +0000)]
Merge "wifi-display: add a global setting to force WPS config method" into klp-dev
Chong Zhang [Wed, 4 Sep 2013 22:06:45 +0000 (22:06 +0000)]
Merge "wifi-display: disable WFD IE when Wifi display is turned off" into klp-dev
Chet Haase [Mon, 26 Aug 2013 21:20:16 +0000 (14:20 -0700)]
Transition API changes from API council recommendations
Issue #
10460684 KLP API Review: android.view.transition and android.animation
Issue #
10570740 Transitions: inflate transition targets from xml
Change-Id: I7a3f6d3aece2fcafc5efd555d033f79e86635c98
Lajos Molnar [Wed, 4 Sep 2013 21:32:43 +0000 (21:32 +0000)]
Merge "Add subtitle support to VideoView." into klp-dev
Fabrice Di Meglio [Wed, 4 Sep 2013 21:26:55 +0000 (21:26 +0000)]
Merge "Fix bug #
10514694 Specifying android:gravity="center_vertical|left" results in negative vertical positioning of child" into klp-dev
Lajos Molnar [Wed, 4 Sep 2013 21:22:46 +0000 (21:22 +0000)]
Merge "Internal WebVtt subtitle support" into klp-dev
Alan Viverette [Wed, 4 Sep 2013 21:17:00 +0000 (21:17 +0000)]
Merge "Implement drag-to-open in ActivityChooserView" into klp-dev
Romain Guy [Wed, 4 Sep 2013 21:16:23 +0000 (21:16 +0000)]
Merge "Don't draw with invalid display lists Bug #
10301674" into klp-dev
Romain Guy [Wed, 4 Sep 2013 21:14:07 +0000 (14:14 -0700)]
Don't draw with invalid display lists
Bug #
10301674
Change-Id: I900322dcb9b53f0eb82741c94d4ab1eaf939259e
Chet Haase [Wed, 4 Sep 2013 21:13:31 +0000 (21:13 +0000)]
Merge "Perform layout and invalidation after bringChildToFront()" into klp-dev
Timothy Knight [Wed, 4 Sep 2013 00:23:23 +0000 (17:23 -0700)]
Camera2: Clarified docs for 3A regions.
Bug:
10545568
Change-Id: I0a76e7d063ceccb68707973abd312a1b909155ec
Timothy Knight [Wed, 4 Sep 2013 20:25:35 +0000 (20:25 +0000)]
Merge "Camera2: Updated Rational for denom=0." into klp-dev
Dianne Hackborn [Wed, 4 Sep 2013 20:22:27 +0000 (20:22 +0000)]
Merge "Fix issue #
10427108: Google+ has long running process" into klp-dev
Fabrice Di Meglio [Wed, 28 Aug 2013 02:46:43 +0000 (19:46 -0700)]
Fix bug #
10514694 Specifying android:gravity="center_vertical|left" results in negative vertical positioning of child
- related to "wrap_content"
- self bounds should include childs horizontal / vertical margin too
- so make height / width computation follow similar pattern as top / bottom computation
Passing CTS tests: RelativeLayoutTest / RelativeLayout_LayoutParamsTest
Change-Id: Id019c2536e89d2d8a4991aaabf6de60aae2e263b
David Christie [Wed, 4 Sep 2013 19:22:25 +0000 (19:22 +0000)]
Merge "Make location QuickSettings multi-user compatible (b/
10563313)" into klp-dev
Lajos Molnar [Thu, 15 Aug 2013 23:43:08 +0000 (16:43 -0700)]
Internal WebVtt subtitle support
Change-Id: Ia55673a68a99c277dd6e3246e6f1913c8eb476d8
Signed-off-by: Lajos Molnar <lajos@google.com>
Bug:
10326117
John Spurlock [Wed, 4 Sep 2013 19:03:52 +0000 (19:03 +0000)]
Merge "Change semi-transparent system bar from 33 to 40% black." into klp-dev
Lajos Molnar [Wed, 4 Sep 2013 18:58:12 +0000 (18:58 +0000)]
Merge "Add MediaTimeProvider to MediaPlayer" into klp-dev
John Spurlock [Wed, 4 Sep 2013 18:47:17 +0000 (14:47 -0400)]
Change semi-transparent system bar from 33 to 40% black.
Bug:
10502089
Change-Id: I045dab25e16a2711ed48659412022bee0fd4e2b2
David Christie [Wed, 4 Sep 2013 00:15:28 +0000 (17:15 -0700)]
Make location QuickSettings multi-user compatible (b/
10563313)
Change-Id: I8ae5238e66fa2d6890ffe5697d3e6d5f50413c3e
Chet Haase [Wed, 4 Sep 2013 17:21:46 +0000 (10:21 -0700)]
Perform layout and invalidation after bringChildToFront()
Previously, calls to ViewGroup.bringChildToFront() or View.bringToFront()
would need to be followed by calls to requestLayout() and invalidate()
to force the container to redraw with the new child ordering. This
change calls requestLayout() and invalidate() automatically.
Issue #
8667065 bringtoTop does not work
Change-Id: Id37ce7a64dead82119e49f7a1b28385cf0d1f20d
Derek Sollenberger [Wed, 4 Sep 2013 17:36:21 +0000 (17:36 +0000)]
Merge "Revert workaround for Skia bug now that Skia has been fixed." into klp-dev
Timothy Knight [Wed, 21 Aug 2013 21:33:40 +0000 (14:33 -0700)]
Camera2: Updated Rational for denom=0.
Handle NaN and INF using the same semantics as Java floats. No longer
throw an exception if a rational is constructed with a zero-denominator.
This commit is required for the ITS pdk app, since without it, the app
fails when it tries to deserialize rational values that are
(incorrectly) set to 0/0.
Bug:
10337323
Change-Id: I890ec2092f2945abc0f531fc46f9a7f5c71d2dbf
Scott Main [Wed, 4 Sep 2013 16:23:13 +0000 (09:23 -0700)]
am
c6ed9ff7: am
ca0d88b8: am
c3adcf9d: Merge "replace instances of Wi-Fi Direct with Wi-Fi P2P" into jb-mr2-docs
* commit '
c6ed9ff77a6ce1ed05397a4abdea8ebb8a290b42':
replace instances of Wi-Fi Direct with Wi-Fi P2P
Scott Main [Wed, 4 Sep 2013 16:20:31 +0000 (09:20 -0700)]
am
ca0d88b8: am
c3adcf9d: Merge "replace instances of Wi-Fi Direct with Wi-Fi P2P" into jb-mr2-docs
* commit '
ca0d88b841db52fc926027f412003a8bf6efdf39':
replace instances of Wi-Fi Direct with Wi-Fi P2P
Scott Main [Wed, 4 Sep 2013 16:19:46 +0000 (09:19 -0700)]
am
f579f134: am
e0718c04: am
605d56c0: Merge "clarify javadoc for constructors. bug:
10563421" into jb-mr2-docs
* commit '
f579f134ee9495571899be958983a1a242457603':
clarify javadoc for constructors. bug:
10563421
Scott Main [Wed, 4 Sep 2013 16:18:23 +0000 (09:18 -0700)]
am
c3adcf9d: Merge "replace instances of Wi-Fi Direct with Wi-Fi P2P" into jb-mr2-docs
* commit '
c3adcf9dc745932bf3a059a7201644dd96b97750':
replace instances of Wi-Fi Direct with Wi-Fi P2P
Scott Main [Wed, 4 Sep 2013 16:17:05 +0000 (09:17 -0700)]
am
e0718c04: am
605d56c0: Merge "clarify javadoc for constructors. bug:
10563421" into jb-mr2-docs
* commit '
e0718c044bc81db0334f2973b9884b968c18ce07':
clarify javadoc for constructors. bug:
10563421
Scott Main [Wed, 4 Sep 2013 16:14:59 +0000 (16:14 +0000)]
Merge "replace instances of Wi-Fi Direct with Wi-Fi P2P" into jb-mr2-docs
Scott Main [Wed, 4 Sep 2013 16:13:57 +0000 (09:13 -0700)]
am
605d56c0: Merge "clarify javadoc for constructors. bug:
10563421" into jb-mr2-docs
* commit '
605d56c0492536488c997c6ca0b85fd38fd4e19a':
clarify javadoc for constructors. bug:
10563421
Scott Main [Wed, 4 Sep 2013 16:10:58 +0000 (16:10 +0000)]
Merge "clarify javadoc for constructors. bug:
10563421" into jb-mr2-docs
Victoria Lease [Wed, 4 Sep 2013 15:34:56 +0000 (15:34 +0000)]
Merge "add Noto Sans Khmer and Lao" into klp-dev
Derek Sollenberger [Wed, 4 Sep 2013 14:50:06 +0000 (10:50 -0400)]
Revert workaround for Skia bug now that Skia has been fixed.
bug:
7170836
Change-Id: If357767a5f66d539f775bce766e963b3d0df38bf
Tom O'Neill [Wed, 4 Sep 2013 14:16:11 +0000 (14:16 +0000)]
Merge "Add LocationManager.MODE_CHANGED_ACTION broadcast" into klp-dev
John Spurlock [Wed, 4 Sep 2013 13:35:06 +0000 (13:35 +0000)]
Merge "Icon updates: location, settings, cdma roaming" into klp-dev
John Spurlock [Wed, 4 Sep 2013 13:32:18 +0000 (13:32 +0000)]
Merge "Remove unused status bar icon stat_sys_secure." into klp-dev
John Spurlock [Wed, 4 Sep 2013 13:04:37 +0000 (09:04 -0400)]
Icon updates: location, settings, cdma roaming
Bug:
10502089
Change-Id: I2cc1b6bd8e1998830228b1d174cd4af13a1f1b6e
Adam Skory [Wed, 4 Sep 2013 12:22:10 +0000 (12:22 +0000)]
Merge "Add provideAssistData attr to public.xml" into klp-dev
Ben Murdoch [Wed, 4 Sep 2013 12:09:10 +0000 (13:09 +0100)]
Fix the build.
Fix javadoc typo.
Change-Id: I3e5f8f43650ce7b0958512bacc36e0ee744efa40
Adam Skory [Sat, 31 Aug 2013 03:53:33 +0000 (04:53 +0100)]
Add provideAssistData attr to public.xml
http://ag/323631 added the provideAssistData
attribute to the Service manifest tag.
It did not, however, add that attribute to
public.xml - making it impossible to actually
build a service that defines said tag.
So, add it.
Now that the attribute is where it should be,
restore @link notation to ServiceInfo.java
without breaking the offline docs build
( see http://ag//340279 ).
Also, make some log warnings related to
providing assist data slightly more verbose.
Bug:
10573008
Change-Id: Ie2bcb411c182d69738a2fa4a74de3171b9b9c455
Lajos Molnar [Thu, 15 Aug 2013 18:37:47 +0000 (11:37 -0700)]
Add subtitle support to VideoView.
Change-Id: Ibfde491a624272c4f9733098529ad70c6aa93fe0
Signed-off-by: Lajos Molnar <lajos@google.com>
Bug:
10326117
Lajos Molnar [Wed, 4 Sep 2013 05:52:36 +0000 (22:52 -0700)]
SubtitleController: update to new CaptioningManager APIs
This resolves the build issue.
Change-Id: I4db018c1abd9677ceb6d355921e4f7fa4be3b037
Signed-off-by: Lajos Molnar <lajos@google.com>
Bug:
10326117
Baligh Uddin [Wed, 4 Sep 2013 04:44:27 +0000 (04:44 +0000)]
Merge "Import translations. DO NOT MERGE" into klp-dev
Baligh Uddin [Wed, 4 Sep 2013 04:43:47 +0000 (04:43 +0000)]
Merge "Import translations. DO NOT MERGE" into klp-dev
Baligh Uddin [Wed, 4 Sep 2013 04:43:28 +0000 (04:43 +0000)]
Merge "Import translations. DO NOT MERGE" into klp-dev
Jeff Sharkey [Wed, 4 Sep 2013 04:34:17 +0000 (04:34 +0000)]
Merge "Show loading, error, and info messages as footers." into klp-dev
Jeff Sharkey [Wed, 4 Sep 2013 04:34:15 +0000 (04:34 +0000)]
Merge "Updated documents UX around action bar." into klp-dev
Lajos Molnar [Wed, 4 Sep 2013 04:28:00 +0000 (04:28 +0000)]
Merge "Internal subtitle base support" into klp-dev
Aravind Akella [Wed, 4 Sep 2013 02:37:24 +0000 (19:37 -0700)]
Fix for build breakage. Remove documentation link to hidden registerListener API.
Change-Id: Iba5d623bf12f1b6654f570febcc65d591d309038
Lajos Molnar [Fri, 16 Aug 2013 00:05:05 +0000 (17:05 -0700)]
Add MediaTimeProvider to MediaPlayer
Change-Id: Ie56331ef4eb4bdffa606598f241edb1cb2c2e2dc
Signed-off-by: Lajos Molnar <lajos@google.com>
Bug:
10326117
Dianne Hackborn [Wed, 4 Sep 2013 01:12:53 +0000 (18:12 -0700)]
Fix issue #
10427108: Google+ has long running process
There was a bug in counting the number of starting services
in a process that would cause it to count too many (it would
increment at any state change while the service is started, not
just when starting/stopping).
Also reduce dumpsys output -- only print summaries for old
data. There is probably no utility in printing the long details
of all that data.
Change-Id: I1c1e901b0214c01eb7d071f23166fc6f3702ca67
Tom O'Neill [Wed, 4 Sep 2013 01:05:13 +0000 (18:05 -0700)]
Add LocationManager.MODE_CHANGED_ACTION broadcast
- Currently redundant with PROVIDERS_CHANGED_ACTION, but that may
change in the future
- Part of fix for b/
10409275
Change-Id: I12daaf20e6546fd9e9dc71c599967fa0ad95e27f
Martijn Coenen [Wed, 4 Sep 2013 00:48:20 +0000 (00:48 +0000)]
Merge "Reader mode NFC API: move to callback model." into klp-dev
Christopher Tate [Wed, 4 Sep 2013 00:48:06 +0000 (00:48 +0000)]
Merge "Sanity check users before committing new Android ID" into klp-dev
Igor Murashkin [Wed, 4 Sep 2013 00:44:31 +0000 (00:44 +0000)]
Merge "camera2: Don't NPE when closing the CameraDevice" into klp-dev
Alan Viverette [Wed, 4 Sep 2013 00:44:11 +0000 (00:44 +0000)]
Merge "Fix pre tag formatting in getDragToOpenListener documentation" into klp-dev
Aravind Akella [Wed, 4 Sep 2013 00:41:52 +0000 (00:41 +0000)]
Merge "Sensor batching. Implementation for registerListener(with batch support) and flush APIs." into klp-dev
Geoffrey Borggaard [Wed, 4 Sep 2013 00:41:26 +0000 (00:41 +0000)]
Merge "UX improvements to the restrictions PIN" into klp-dev
Lajos Molnar [Thu, 15 Aug 2013 23:12:54 +0000 (16:12 -0700)]
Internal subtitle base support
Change-Id: I3fc57d6280773dc24f4822be21c9497ae70f7374
Signed-off-by: Lajos Molnar <lajos@google.com>
Bug:
10326117
Jeff Sharkey [Tue, 3 Sep 2013 22:25:52 +0000 (15:25 -0700)]
Show loading, error, and info messages as footers.
A provider can include extras in their Cursors to indicate that
loading is ongoing, or include an error or informational message,
which are now shown in footer views.
Fix registration to always get change notifications.
Test provider that verifies common provider behavior of holding
a reference to "cloud" resources that are released by GC when the
remote Cursor is closed. Also used to validate Recents behavior
for slow providers.
Bug:
10599268
Change-Id: I331c31058dbb80261e7d279b851197c65ac87e32
Aravind Akella [Thu, 27 Jun 2013 19:04:16 +0000 (12:04 -0700)]
Sensor batching. Implementation for registerListener(with batch support) and flush APIs.
Bug:
10109508
Change-Id: I6dfdd986bd8c3368cb568fa7d90abf9c03de9aef
Christopher Tate [Tue, 3 Sep 2013 23:57:34 +0000 (16:57 -0700)]
Sanity check users before committing new Android ID
In creation/deletion cycling we can wind up racing and attempting
to establish the Android ID on first access *after* the user has
already been deleted. Cope gracefully with this outcome.
Bug
10608503
Change-Id: I169d5052e5a2e354ce0e1f61258e45e31f5ba171
Alan Viverette [Tue, 3 Sep 2013 23:51:34 +0000 (23:51 +0000)]
Merge "Add methods for managing subtitle overlays in VideoView" into klp-dev
Alan Viverette [Tue, 3 Sep 2013 23:33:02 +0000 (23:33 +0000)]
Merge "Ensure list scrolling API is in parity with view scrolling API" into klp-dev
Romain Guy [Tue, 3 Sep 2013 23:32:33 +0000 (23:32 +0000)]
Merge "Prevent NPE when cloning gradients Bug #
10436856" into klp-dev
Alan Viverette [Tue, 3 Sep 2013 23:17:56 +0000 (16:17 -0700)]
Add methods for managing subtitle overlays in VideoView
Overlays are added directly to the VideoView, laid out to the
size of the video view, and rendered in draw().
BUG:
10260603
Change-Id: Ie8c30e5e6dcd5c6e1a2063af898afce0108a87bf
Romain Guy [Tue, 3 Sep 2013 23:08:00 +0000 (16:08 -0700)]
Prevent NPE when cloning gradients
Bug #
10436856
Change-Id: I98cbce941a06842112b8caa3753a3fa32b227da9
Alan Viverette [Tue, 3 Sep 2013 23:01:51 +0000 (16:01 -0700)]
Ensure list scrolling API is in parity with view scrolling API
Change-Id: Icaf533c0085b80f3c52cc026e0da7468698724f9
Lajos Molnar [Tue, 3 Sep 2013 22:51:32 +0000 (22:51 +0000)]
Merge "VideoView: add addSubtitleSource" into klp-dev
Matthew Xie [Tue, 3 Sep 2013 22:36:09 +0000 (22:36 +0000)]
Merge "Block ble adv api based on resource config" into klp-dev
Dianne Hackborn [Tue, 3 Sep 2013 22:04:43 +0000 (22:04 +0000)]
Merge "Fix issue #
10461469: KLP API Review: EXTRA_SHUTDOWN_USERSPACE_ONLY" into klp-dev
Alan Viverette [Tue, 3 Sep 2013 21:56:26 +0000 (14:56 -0700)]
Implement drag-to-open in ActivityChooserView
BUG:
10606456
Change-Id: I9ac0c5076bb1bf6c3f8a674bb2ef998d8515e8d9
Dianne Hackborn [Tue, 3 Sep 2013 21:34:12 +0000 (14:34 -0700)]
Fix issue #
10461469: KLP API Review: EXTRA_SHUTDOWN_USERSPACE_ONLY
Maybe adding more words will make it more clear. :)
Change-Id: Ie729eaba1df542d4ffcd0502ccba3807d641fd72
Romain Guy [Tue, 3 Sep 2013 21:41:39 +0000 (21:41 +0000)]
Merge "Update Bitmap.Config.ARGB_4444 documentation Bug #
10510122" into klp-dev
Jeff Sharkey [Tue, 3 Sep 2013 21:17:06 +0000 (14:17 -0700)]
Updated documents UX around action bar.
Change action bar to match current design; drawer is always available
and navigation dropdown is used to interact with current traversal
path in hierarchy. On first launch, show recents with drawer
expanded. On subsequent launches, resume from last location with
drawer closed. If last location root isn't applicable, then behave
like initial launch. Move sort order into action bar submenu.
Delete documents using contract. Use unstable provider when
inflating DocumentInfo from Uri.
Bug:
10330219,
10510851
Change-Id: I6e94637d70ebca156a6c5d50272e878156d0dd62
Craig Mautner [Tue, 3 Sep 2013 21:06:49 +0000 (21:06 +0000)]
Merge "Insert home task into history when sending to back." into klp-dev
John Spurlock [Tue, 3 Sep 2013 20:30:47 +0000 (20:30 +0000)]
Merge "Dim status icons / battery / clock on opaque bars." into klp-dev
Tom O'Neill [Tue, 3 Sep 2013 20:25:56 +0000 (20:25 +0000)]
Merge "Improve constant names for settings injection API" into klp-dev
John Spurlock [Tue, 3 Sep 2013 20:23:49 +0000 (16:23 -0400)]
Dim status icons / battery / clock on opaque bars.
Apply consistent alpha to the other status bar elements
now that they are intrinsically brighter than before.
Bug:
10602822
Change-Id: I8ca6ddc844f9c58ddf2a1df8d1a5bd7fb71932d1
Amith Yamasani [Tue, 3 Sep 2013 20:22:15 +0000 (20:22 +0000)]
Merge "Don't call setLastChosen if it's a chooser activity instance" into klp-dev
Craig Mautner [Tue, 3 Sep 2013 19:15:57 +0000 (12:15 -0700)]
Insert home task into history when sending to back.
- There is an assumption that moving a task to the back moves it
behind the home activity. This fix ensures that the home activity
will be launched by some activity before the task that has been
moved to the back.
- Convert "private final" declarations to private only.
- Convert container tests for size()==0 to isEmpty().
- Remove unused variable.
Fixes bug
10228536.
Change-Id: I51741ee7a09652e27afffcc50c14953bf0aa27ea
Jeff Sharkey [Tue, 3 Sep 2013 19:42:13 +0000 (19:42 +0000)]
Merge "Remove deprecated ACCESS_DRM permission." into klp-dev
Amith Yamasani [Tue, 3 Sep 2013 19:30:44 +0000 (12:30 -0700)]
Don't call setLastChosen if it's a chooser activity instance
Bug:
10605359
Change-Id: If76f5cf2f45442dc25f9bfbd20a4d671b9caa358
Martijn Coenen [Tue, 3 Sep 2013 19:29:45 +0000 (19:29 +0000)]
Merge "Add drawable for Apdu Services, fix build." into klp-dev
Michael Wright [Thu, 29 Aug 2013 21:33:58 +0000 (14:33 -0700)]
Fix keymap build dependencies and variable name collisions
Change-Id: I06e67ddc97429ae9c3d04143934c3f8233fcd22f
Martijn Coenen [Tue, 3 Sep 2013 19:24:18 +0000 (12:24 -0700)]
Add drawable for Apdu Services, fix build.
Change-Id: I7c138adb60b2efe19377b58b35360cd234628424
John Spurlock [Tue, 3 Sep 2013 19:12:54 +0000 (19:12 +0000)]
Merge "Don't ever disable the status/nav bar." into klp-dev
Jeff Sharkey [Tue, 3 Sep 2013 19:04:55 +0000 (19:04 +0000)]
Merge "Skip packages with missing metadata." into klp-dev