OSDN Git Service
Jonathan Dixon [Thu, 12 Sep 2013 00:55:15 +0000 (17:55 -0700)]
Hide Experimental WebView from dev settings DO NOT MERGE
Bug
10427705
The persist.webview system property is no longer needed, so removed too.
Change-Id: I99bbf2e9b9ec42f282339c72509fd99b18594ebf
Craig Mautner [Sun, 15 Sep 2013 21:47:52 +0000 (21:47 +0000)]
Merge "Add debug logging for b/
10689184." into klp-dev
Craig Mautner [Sat, 14 Sep 2013 21:59:50 +0000 (14:59 -0700)]
Add debug logging for b/
10689184.
Focus is now on focus. Remove logging when fixed.
Change-Id: Ic0cd2d6bd4e65dac9dd40f4745dd12fb84f687ce
Svetoslav Ganov [Sun, 15 Sep 2013 18:46:01 +0000 (18:46 +0000)]
Merge changes Id0a67846,I20b57d66 into klp-dev
* changes:
Print system may get stuck bound to a print service
Spooler should not crash if print service config activities are not exported.
Svetoslav Ganov [Sat, 14 Sep 2013 08:02:04 +0000 (01:02 -0700)]
Print system may get stuck bound to a print service
1. If a print service dies, is restarted and at the time of the
restart the service has neither print jobs nor a discovery
serssion it gets stuck into a bound state. Now it unbinds if
after binding and ensuring it is in the lifecycle state right
before the death there are no active print jobs and no discovery
session.
Also when a print service dies we fail all of its print jobs
but did not update the service that all of its print jobs are
handled, i.e. it has no active print jobs.
2. Fixed a null pointer exception in UserState
bug:
10696723
Change-Id: Id0a67846093fca5d4c1e10843eaf6aa90169d942
Baligh Uddin [Sun, 15 Sep 2013 04:36:51 +0000 (04:36 +0000)]
Merge "Import translations. DO NOT MERGE" into klp-dev
Baligh Uddin [Sun, 15 Sep 2013 04:31:30 +0000 (04:31 +0000)]
Merge "Import translations. DO NOT MERGE" into klp-dev
Baligh Uddin [Sun, 15 Sep 2013 04:31:24 +0000 (04:31 +0000)]
Merge "Import translations. DO NOT MERGE" into klp-dev
Baligh Uddin [Sun, 15 Sep 2013 04:31:09 +0000 (04:31 +0000)]
Merge "Import translations. DO NOT MERGE" into klp-dev
Baligh Uddin [Sun, 15 Sep 2013 04:31:02 +0000 (04:31 +0000)]
Merge "Import translations. DO NOT MERGE" into klp-dev
Baligh Uddin [Sun, 15 Sep 2013 04:08:26 +0000 (21:08 -0700)]
Import translations. DO NOT MERGE
Change-Id: I12383ccb553cbace814156dafc8aad62a007f2c0
Auto-generated-cl: translation import
Baligh Uddin [Sun, 15 Sep 2013 03:33:13 +0000 (20:33 -0700)]
Import translations. DO NOT MERGE
Change-Id: Iedddc6498eb09ce99ae5ffbc60c2069d4373b3e5
Auto-generated-cl: translation import
Baligh Uddin [Sun, 15 Sep 2013 03:32:29 +0000 (20:32 -0700)]
Import translations. DO NOT MERGE
Change-Id: Iab13f37067f3888f58ada1c4764674194eb24c25
Auto-generated-cl: translation import
Baligh Uddin [Sun, 15 Sep 2013 03:30:38 +0000 (20:30 -0700)]
Import translations. DO NOT MERGE
Change-Id: Ie76c722a4e7525264922041684f25b5b35286973
Auto-generated-cl: translation import
Baligh Uddin [Sun, 15 Sep 2013 03:29:57 +0000 (20:29 -0700)]
Import translations. DO NOT MERGE
Change-Id: I45ac6ed92f61d59d2e2fdf87a1ac02db3510720c
Auto-generated-cl: translation import
Baligh Uddin [Sun, 15 Sep 2013 03:27:49 +0000 (03:27 +0000)]
Merge "Import translations. DO NOT MERGE" into klp-dev
Baligh Uddin [Sun, 15 Sep 2013 03:27:22 +0000 (20:27 -0700)]
Import translations. DO NOT MERGE
Change-Id: I68895c16a26ecc9554bfc53e9d9346fe29412fec
Auto-generated-cl: translation import
Baligh Uddin [Sun, 15 Sep 2013 03:26:52 +0000 (03:26 +0000)]
Merge "Import translations. DO NOT MERGE" into klp-dev
Baligh Uddin [Sun, 15 Sep 2013 03:26:04 +0000 (20:26 -0700)]
Import translations. DO NOT MERGE
Change-Id: I190e27f9b7d9774cf922b50e1f0ac9c5d08a5652
Auto-generated-cl: translation import
Baligh Uddin [Sun, 15 Sep 2013 03:09:03 +0000 (03:09 +0000)]
Merge "Import translations. DO NOT MERGE" into klp-dev
Baligh Uddin [Sun, 15 Sep 2013 03:06:00 +0000 (20:06 -0700)]
Import translations. DO NOT MERGE
Change-Id: Iebcc32693fe755e3f7e73b255e61f1963e4c15e9
Auto-generated-cl: translation import
Baligh Uddin [Sun, 15 Sep 2013 03:04:06 +0000 (20:04 -0700)]
Import translations. DO NOT MERGE
Change-Id: I1e4035acc161f784dc2f35eaf1f346ecbddf2fcf
Auto-generated-cl: translation import
John Spurlock [Sat, 14 Sep 2013 21:31:09 +0000 (21:31 +0000)]
Merge "Promote lights-out to a bar transition mode." into klp-dev
John Spurlock [Sat, 14 Sep 2013 21:30:21 +0000 (21:30 +0000)]
Merge "Despotted back." into klp-dev
John Spurlock [Sat, 14 Sep 2013 15:58:55 +0000 (11:58 -0400)]
Promote lights-out to a bar transition mode.
Move all visual application of the legacy lights-out behind
a new mode managed by BarTransitions for better coordination.
Remove unused "hidden" state in NavigationBarView.
Improve window state (showing/hiding/hidden) calculation,
affecting whether or not sysui thinks it should animate.
Removes invalid interim mode changes causing needless
flashing during some transitions.
Consider WINDOW_STATE_HIDING a state in which we ought to animate,
since at least part of the window is visible throughout.
Make the status/nav bar transition helper classes real boys.
Animate KeyButtonView drawing alpha transition, cancel existing
animations when resetting to avoid needless and unsightly "recovery".
Bug:
10746803
Change-Id: Ibd883da9041d071b6a4ff5b42cf96efba7696e9c
Baligh Uddin [Sat, 14 Sep 2013 19:48:09 +0000 (19:48 +0000)]
Merge "Import translations. DO NOT MERGE" into klp-dev
Baligh Uddin [Sat, 14 Sep 2013 19:47:36 +0000 (19:47 +0000)]
Merge "Import translations. DO NOT MERGE" into klp-dev
Baligh Uddin [Sat, 14 Sep 2013 19:47:20 +0000 (19:47 +0000)]
Merge "Import translations. DO NOT MERGE" into klp-dev
Ying Wang [Sat, 14 Sep 2013 19:01:03 +0000 (19:01 +0000)]
Merge "Fix docs build." into klp-dev
Ying Wang [Sat, 14 Sep 2013 18:57:17 +0000 (11:57 -0700)]
Fix docs build.
Change-Id: I4a1608bfad809d67240db2070fda85df486179e6
Wink Saville [Sat, 14 Sep 2013 18:19:39 +0000 (18:19 +0000)]
Merge "Tighten condition for calling checkMobileProvisioning." into klp-dev
Maggie Benthall [Sat, 14 Sep 2013 18:00:12 +0000 (18:00 +0000)]
Merge "CA cert monitoring: add notifications and actions for dialog" into klp-dev
John Spurlock [Sat, 14 Sep 2013 16:17:15 +0000 (12:17 -0400)]
Despotted back.
Bug:
9795248
Change-Id: If46134afe7560b74ce7758f8dbe221dbe2872262
Wink Saville [Sat, 14 Sep 2013 16:04:53 +0000 (09:04 -0700)]
Tighten condition for calling checkMobileProvisioning.
Add the condition that the connected network needs to be TYPE_MOBILE.
This eliminates checking on connecting to secondary networks like
FOTA, MMS, SUPL ...
This reduces unnecessary attempts to bring up multiple connections at
the same time. Especially in the light of the trouble we're having with HFA
on Sprint, where we don't want to connect to any other network until HFA
has completed.
Bug:
10758001
Change-Id: Id294536b70304a51de4752bc1a4ffac734f10f1a
Michael Jurka [Sat, 14 Sep 2013 12:25:50 +0000 (12:25 +0000)]
Merge "Add new intent/method for cropping and setting wallpapers" into klp-dev
Svetoslav Ganov [Sat, 14 Sep 2013 07:59:03 +0000 (00:59 -0700)]
Spooler should not crash if print service config activities are not exported.
1. If a print service does not export its activities for settings and
adding printers the print spooler ignores them instead of crashing.
Also if the service is not enabled its activities are now ignored.
2. Added a dedicated permission for a print service to optionally
protect its settings and add printer activities such that only the
system can bind to them.
3. Fixed a crash in the print dialog if its content is detached
from the window and animators are running.
bug:
10680224
Change-Id: I20b57d6622a15f9b2352ba78d04c44e67b316a15
Baligh Uddin [Sat, 14 Sep 2013 04:47:27 +0000 (21:47 -0700)]
Import translations. DO NOT MERGE
Change-Id: Idfb9ef96c1c4ea6fc1ca836114a8eb09be18f8f4
Auto-generated-cl: translation import
Baligh Uddin [Sat, 14 Sep 2013 04:45:23 +0000 (21:45 -0700)]
Import translations. DO NOT MERGE
Change-Id: I45033c9b90cdbf35e1feec31b91df21a27eaaf06
Auto-generated-cl: translation import
Baligh Uddin [Sat, 14 Sep 2013 04:14:47 +0000 (21:14 -0700)]
Import translations. DO NOT MERGE
Change-Id: Ic9f16e364544b1366e92d26552b27a01dc1d57c5
Auto-generated-cl: translation import
Chet Haase [Sat, 14 Sep 2013 03:39:45 +0000 (03:39 +0000)]
Merge "Only buildLayer() on attached views" into klp-dev
Dirk Dougherty [Sat, 14 Sep 2013 02:59:29 +0000 (19:59 -0700)]
am
a99cc3a7: am
788fc628: am
6212f6b3: Merge "Update documentation for speech APIs." into jb-mr2-docs
* commit '
a99cc3a72d7ff883b8ade7e119169b561fc98e17':
Update documentation for speech APIs.
Dirk Dougherty [Sat, 14 Sep 2013 02:56:03 +0000 (19:56 -0700)]
am
788fc628: am
6212f6b3: Merge "Update documentation for speech APIs." into jb-mr2-docs
* commit '
788fc6285a0b7f1585c5a4fa68599af7c07747e5':
Update documentation for speech APIs.
Dirk Dougherty [Sat, 14 Sep 2013 02:53:26 +0000 (19:53 -0700)]
am
6212f6b3: Merge "Update documentation for speech APIs." into jb-mr2-docs
* commit '
6212f6b3c5c92298fedbb37f5ceb0094b770549b':
Update documentation for speech APIs.
Dirk Dougherty [Sat, 14 Sep 2013 02:50:15 +0000 (02:50 +0000)]
Merge "Update documentation for speech APIs." into jb-mr2-docs
Scott Main [Sat, 14 Sep 2013 02:39:15 +0000 (19:39 -0700)]
am
19612c63: am
575245dc: am
1294a8f9: Merge "update samples landing page with summaries based on parameter in the url. This is just for testing purposes... no real functionality yet." into jb-mr2-docs
* commit '
19612c63519dce47b1cbe03d1691ec66f7160c44':
update samples landing page with summaries based on parameter in the url. This is just for testing purposes... no real functionality yet.
Scott Main [Sat, 14 Sep 2013 02:36:49 +0000 (19:36 -0700)]
am
575245dc: am
1294a8f9: Merge "update samples landing page with summaries based on parameter in the url. This is just for testing purposes... no real functionality yet." into jb-mr2-docs
* commit '
575245dc29441fc796442805caa16000f48f27cc':
update samples landing page with summaries based on parameter in the url. This is just for testing purposes... no real functionality yet.
Scott Main [Sat, 14 Sep 2013 02:33:17 +0000 (19:33 -0700)]
am
1294a8f9: Merge "update samples landing page with summaries based on parameter in the url. This is just for testing purposes... no real functionality yet." into jb-mr2-docs
* commit '
1294a8f9a2ccc4e19d218dbe8645ddac533706d8':
update samples landing page with summaries based on parameter in the url. This is just for testing purposes... no real functionality yet.
Scott Main [Sat, 14 Sep 2013 02:31:08 +0000 (02:31 +0000)]
Merge "update samples landing page with summaries based on parameter in the url. This is just for testing purposes... no real functionality yet." into jb-mr2-docs
Scott Main [Thu, 12 Sep 2013 19:57:29 +0000 (12:57 -0700)]
update samples landing page with summaries based on parameter in the url.
This is just for testing purposes... no real functionality yet.
Change-Id: I7d18033b01a7c3615e3d998da71062b25af22b28
Geoff Mendal [Sat, 14 Sep 2013 02:08:20 +0000 (02:08 +0000)]
Merge "Disable ActionBar transitions" into klp-dev
Chet Haase [Sat, 14 Sep 2013 02:01:52 +0000 (19:01 -0700)]
Only buildLayer() on attached views
A recent change to ViewPropertyAnimator.withLayer() builds the layer
immediately after creating it. This works in general, but if the view
is not attached, buildLayer() throws an exception.
The fix is to ensure that the view is attached before calling buildLayer().
Issue #
10750925 Dialer crashed and phone dropped while on call
Change-Id: I801c835a0f5cb81e159fe90c157c122cf2d0da01
Chet Haase [Sat, 14 Sep 2013 01:51:12 +0000 (18:51 -0700)]
Disable ActionBar transitions
A problem with transitions is causing various ActionBar icons to go
missing occasionally. This CL disables these transitions for now
to allow ActionBar to work as expected.
Issue #
10726905 ActionBar weirdness in People app
Change-Id: I0cb774840ae84cbb733d65865f8c1b4c6d7490fa
Dianne Hackborn [Sat, 14 Sep 2013 01:43:20 +0000 (01:43 +0000)]
Merge "Maybe fix issue #
10748810: Runtime restart: crash under..." into klp-dev
Dianne Hackborn [Sat, 14 Sep 2013 01:34:13 +0000 (18:34 -0700)]
Maybe fix issue #
10748810: Runtime restart: crash under...
...ActivityManagerService.setProcessTrackerState
And if not, at least we'll have a little more debug info
when it happens again.
Change-Id: I685f0f72c2e1b17608a8d069d6c7f2cff2fd0abd
Scott Main [Sat, 14 Sep 2013 01:09:45 +0000 (18:09 -0700)]
am
bb3b431d: am
8bf0c9ae: am
a23fd887: more javadocs for onTrimMemory()
* commit '
bb3b431dc6b5786bed7cc988f44c35df21408a93':
more javadocs for onTrimMemory()
Scott Main [Sat, 14 Sep 2013 01:06:28 +0000 (18:06 -0700)]
am
8bf0c9ae: am
a23fd887: more javadocs for onTrimMemory()
* commit '
8bf0c9ae604e5114260159077bfafbdd9d16a7ea':
more javadocs for onTrimMemory()
Dianne Hackborn [Sat, 14 Sep 2013 01:04:05 +0000 (01:04 +0000)]
Merge "Implement #
10666712: NetworkOnMainThreadException should be..." into klp-dev
Scott Main [Sat, 14 Sep 2013 01:03:18 +0000 (18:03 -0700)]
am
a23fd887: more javadocs for onTrimMemory()
* commit '
a23fd88729bd10c02a9d631c9954616b3a1d0f6f':
more javadocs for onTrimMemory()
David Christie [Sat, 14 Sep 2013 01:02:40 +0000 (01:02 +0000)]
Merge "Strip names out of externally supplied WorkSources to WifiManager (b/
10710007)." into klp-dev
Scott Main [Thu, 15 Aug 2013 20:53:31 +0000 (13:53 -0700)]
more javadocs for onTrimMemory()
Change-Id: I52a99bc1b07732e474d1c632f3021c6c4db8c5ab
David Christie [Sat, 14 Sep 2013 00:11:53 +0000 (17:11 -0700)]
Strip names out of externally supplied WorkSources to WifiManager (b/
10710007).
Change-Id: I69bd7ce9e942c2f9327415b2821d805e1b50a1a4
Dianne Hackborn [Sat, 14 Sep 2013 00:32:57 +0000 (17:32 -0700)]
Implement #
10666712: NetworkOnMainThreadException should be...
...relayed back to calling application
What's one more exception between friends?
Change-Id: Ib83c7bfbddd397457dcdbe506a8cd2bc0f4fb70b
Adam Powell [Sat, 14 Sep 2013 00:23:07 +0000 (00:23 +0000)]
Merge "Check RelativeLayout's access of its own LayoutParams during measurement" into klp-dev
Dianne Hackborn [Sat, 14 Sep 2013 00:22:06 +0000 (00:22 +0000)]
Merge "Fix issue #
10461477: KLP API Review: Debug.MemoryInfo" into klp-dev
Dianne Hackborn [Sat, 14 Sep 2013 00:20:00 +0000 (17:20 -0700)]
Fix issue #
10461477: KLP API Review: Debug.MemoryInfo
Oops.
Change-Id: I2143790af9e6649dba8d74618358c47232cf6cc4
Jeff Tinker [Sat, 14 Sep 2013 00:16:34 +0000 (00:16 +0000)]
Merge "Part of corrections from KLP API Review: Media" into klp-dev
Chris Craik [Sat, 14 Sep 2013 00:12:37 +0000 (00:12 +0000)]
Merge "Fix merged operation clipping" into klp-dev
Christopher Tate [Sat, 14 Sep 2013 00:11:47 +0000 (00:11 +0000)]
Merge "Prune shared users that the system declares but does not use" into klp-dev
Glenn Kasten [Sat, 14 Sep 2013 00:07:44 +0000 (00:07 +0000)]
Merge "Remove obsolete assets from target /system/media/video/" into klp-dev
Dianne Hackborn [Sat, 14 Sep 2013 00:04:43 +0000 (00:04 +0000)]
Merge "Fix issue #
10747324: adb install hangs" into klp-dev
Dianne Hackborn [Sat, 14 Sep 2013 00:01:26 +0000 (17:01 -0700)]
Fix issue #
10747324: adb install hangs
Dumb typo was clearing the wrong service array, causing
us to sometimes forget we were launching a service.
Change-Id: Ie1aba0e07d19e85a104a5985e3cead5f28a0556a
Christopher Tate [Fri, 13 Sep 2013 23:58:36 +0000 (16:58 -0700)]
Prune shared users that the system declares but does not use
Bug
10184643
Change-Id: I72c5177c621c24fac34bf8744eb6c5108b6d3464
Adam Powell [Fri, 13 Sep 2013 23:46:38 +0000 (23:46 +0000)]
Merge "Don't recycle action button views" into klp-dev
Rachad Alao [Fri, 13 Sep 2013 23:44:43 +0000 (23:44 +0000)]
Merge "Camera2: Rename TEMPLATE_MANUAL to TEMPLATE_ZERO_SHUTTER_LAG" into klp-dev
Jeff Sharkey [Fri, 13 Sep 2013 23:33:27 +0000 (23:33 +0000)]
Merge "More UX updates around picking images." into klp-dev
Craig Mautner [Fri, 13 Sep 2013 23:33:17 +0000 (23:33 +0000)]
Merge "When launching home activity, make sure it is top." into klp-dev
Vineeta Srivastava [Fri, 13 Sep 2013 23:29:31 +0000 (23:29 +0000)]
Merge "Roaming Icon should not displayed with Indosat's old SIM" into klp-dev
Dianne Hackborn [Fri, 13 Sep 2013 23:06:07 +0000 (23:06 +0000)]
Merge "Implement #
10749688: Improve low memory reporting" into klp-dev
Jeff Sharkey [Fri, 13 Sep 2013 20:42:19 +0000 (13:42 -0700)]
More UX updates around picking images.
When picking images or videos, hide the titles in recents, since the
thumbnails should speak for themselves. Also respect new flag that
allows a directory to request their titles be hidden.
Show directory icon hint in grid mode when showing a thumbnail, to
remind user it's a directory.
Filter directories out of recents. Hide most action bar icons on
phones, even when room. Only show drawer on first launch. Hide most
drawer headers to match spec.
Bug:
10710331
Change-Id: I0ef1973ddd62750f57345336388366eda1449720
Dianne Hackborn [Wed, 11 Sep 2013 02:06:15 +0000 (19:06 -0700)]
Implement #
10749688: Improve low memory reporting
This significantly reworks the logging we do when
all cached processes are killed:
- We now collect the list of processes in-place so we
have a snapshot of exactly when the low memory situation
happened.
- In that snapshot we include the key process state: oom
adj, proc state, adj reasons.
- The report then asynchronously collects pss information
for those processes.
- The ultimate data printed to the log looks like a mix
between the "dumpsys meminfo" and "dumpsys activity"
output. This code no longer uses "dumpsys meminfo"
itself, so some of that data is no longer included,
in particular pss organized by allocation type.
In doing this, I realized that the existing code that is
supposed to run "procstats" is not currently working. And
at that point I realized, really, when we are collecting
this pss data we'd really like to include all those native
processes using ghod-only-knows how much RAM. And guess
what, we have a list of processes available in
ProcessCpuTracker.
So we now also collect and print information for native
processes, and we also do this for "dumpsys meminfo" which
really seems like a good thing when we are printing summaries
of all pss and such.
I also improved the code for reading /proc/meminfo to be
able to load all the interesting fields from there, and
am now printing that as well.
Change-Id: I9e7d13e9c07a8249c7a7e12e5433973b2c0fdc11
Zhihai Xu [Fri, 13 Sep 2013 23:00:21 +0000 (23:00 +0000)]
Merge "Fixed review comments" into klp-dev
Craig Mautner [Fri, 13 Sep 2013 22:34:08 +0000 (15:34 -0700)]
When launching home activity, make sure it is top.
Because recents sits on the same stack as launcher it can sometimes be
above launcher. When we were launching home activity because the flag
told us to we would sometimes launch recents instead. This fix makes
sure that the home activity is on the top when it is supposed to be
launched next.
Previously this was fixed by having recents move itself to the back
of the stack after it launched an activity (b/
9750207 and ag/336019).
But that solution caused the AppTransition to be set to
TRANSIT_TASK_TO_BACK which left the SOFT_INPUT_IS_FORWARD_NAVIGATION
flag unset. This in turn caused IMEs to remain unlaunched when
returning from recents (b/
10240567).
Fixes bug
10240567.
Change-Id: I35c6619af0e68d0e6d9ab87cad06ea7c27e11e27
Victoria Lease [Fri, 13 Sep 2013 22:32:58 +0000 (22:32 +0000)]
Merge "NotoColorEmoji.ttf is the new AndroidEmoji.ttf" into klp-dev
Jeff Tinker [Fri, 13 Sep 2013 22:32:08 +0000 (15:32 -0700)]
Part of corrections from KLP API Review: Media
b/
10461617
Change-Id: Ic2e102c39428f7cef2923d00a67aec8c77cd108e
Sungmin Choi [Fri, 13 Sep 2013 20:42:34 +0000 (13:42 -0700)]
Roaming Icon should not displayed with Indosat's old SIM
Bug:
10403087
Change-Id: If2ea5650ed9a665da94f2941507fb273800b3ab8
Baligh Uddin [Fri, 13 Sep 2013 22:13:09 +0000 (22:13 +0000)]
Merge "Import translations. DO NOT MERGE" into klp-dev
Deepanshu Gupta [Fri, 13 Sep 2013 22:01:00 +0000 (15:01 -0700)]
am
31207780: am
0ecfe381: am
54d88f76: Fix ClassCastException when rendering ListView
* commit '
31207780338b97e396927701ca0da7a61d6d44b2':
Fix ClassCastException when rendering ListView
Deepanshu Gupta [Fri, 13 Sep 2013 21:57:35 +0000 (14:57 -0700)]
am
0ecfe381: am
54d88f76: Fix ClassCastException when rendering ListView
* commit '
0ecfe3819269062805c4c56cdc1470c2fc3856c8':
Fix ClassCastException when rendering ListView
Deepanshu Gupta [Fri, 13 Sep 2013 21:55:06 +0000 (14:55 -0700)]
am
54d88f76: Fix ClassCastException when rendering ListView
* commit '
54d88f7678387a6eb871ec2dccd36af4ff35b1fe':
Fix ClassCastException when rendering ListView
Chris Craik [Fri, 13 Sep 2013 21:41:31 +0000 (14:41 -0700)]
Fix merged operation clipping
bug:
10745870
Missing 'const' meant MergingDrawBatch would never clip anything.
Change-Id: Ia6367eff94cf5f437efafbc3ba7f0da102ffd956
Victoria Lease [Fri, 13 Sep 2013 21:11:58 +0000 (14:11 -0700)]
NotoColorEmoji.ttf is the new AndroidEmoji.ttf
Bug:
10144988
Change-Id: I04ebb86e283b752c43597b5f908f5c28f7806ee1
Wink Saville [Fri, 13 Sep 2013 20:55:36 +0000 (20:55 +0000)]
Merge "checkMobileProvisioning should not block." into klp-dev
Jason Monk [Fri, 13 Sep 2013 20:31:53 +0000 (20:31 +0000)]
Merge "Guarantee that PAC Local Proxy owns Port" into klp-dev
Zhijun He [Fri, 13 Sep 2013 18:32:20 +0000 (11:32 -0700)]
Camera2: Rename TEMPLATE_MANUAL to TEMPLATE_ZERO_SHUTTER_LAG
It collides with HAL ZSL template, rename it to TEMPLATE_ZERO_SHUTTER_LAG and
hide it for now.
Bug:
10690122
Change-Id: I793154849aa7aa4bf4874e2ff3f3890dd05b1f9e
Scott Main [Fri, 13 Sep 2013 20:04:43 +0000 (13:04 -0700)]
am
a73e5df0: am
cdde6dc6: am
95e7df91: fix title for uses-sdk doc
* commit '
a73e5df060262d1fc92f76fcc7a3a3d4537f9a0a':
fix title for uses-sdk doc
Scott Main [Fri, 13 Sep 2013 20:02:20 +0000 (13:02 -0700)]
am
cdde6dc6: am
95e7df91: fix title for uses-sdk doc
* commit '
cdde6dc6675207708020fbe7458b13ccf22fe492':
fix title for uses-sdk doc
Christopher Tate [Fri, 13 Sep 2013 20:01:17 +0000 (20:01 +0000)]
Merge "Add hidden API for querying available 'home' activities" into klp-dev
Jeff Sharkey [Fri, 13 Sep 2013 20:00:14 +0000 (20:00 +0000)]
Merge "Move search to roots; Documents root; hide empty." into klp-dev
Scott Main [Fri, 13 Sep 2013 19:59:59 +0000 (12:59 -0700)]
am
95e7df91: fix title for uses-sdk doc
* commit '
95e7df915fd3c173b4d8d71c1ac5cbeaa8c8e7ed':
fix title for uses-sdk doc
Scott Main [Fri, 13 Sep 2013 19:55:20 +0000 (12:55 -0700)]
fix title for uses-sdk doc
Change-Id: I544868d209f04cb46928861148e9320fc0118f56