drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
124,139 Commits 1 Branch 0 Tags
Commit Graph

124139 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
smain@google.com
b06efc724c am aa1ecf5c: html cleanup. delete quickviews 
* commit 'aa1ecf5cdf70c5b76bd5e31d252735ba52a90b72':
  html cleanup. delete quickviews
 2014-06-14 00:55:40 +00:00
smain@google.com
aa1ecf5cdf html cleanup. delete quickviews 
Change-Id: Ifd71ca32848982919f37f8927acd8b66b0cf4438
 2014-06-13 17:47:15 -07:00
smain@google.com
80b69dc203 am b43eff80: adjust scroll position now that there\'s secondary nav bar 
* commit 'b43eff80e56c29b29ac3f77ee12150211539dcee':
  adjust scroll position now that there's secondary nav bar
 2014-06-14 00:35:48 +00:00
smain@google.com
b43eff80e5 adjust scroll position now that there's secondary nav bar 
Change-Id: I7aa237390066805bef210f2ed2f4ae1063e5e252
 2014-06-13 17:31:20 -07:00
Craig Mautner
916cd9770c am 6335fbcb: Revert "Revert "Close ActivityView and ActivityContainer cleanly."" 
* commit '6335fbcba106147d914acae0a9d8f4fcd53af768':
  Revert "Revert "Close ActivityView and ActivityContainer cleanly.""
 2014-06-14 00:30:47 +00:00
Craig Mautner
4019037540 am 6fe2184b: Do not treat the dummy animation as an animation 
* commit '6fe2184bf10362ac53db7e8f6a0be521ea59b054':
  Do not treat the dummy animation as an animation
 2014-06-14 00:22:36 +00:00
Craig Mautner
6335fbcba1 Revert "Revert "Close ActivityView and ActivityContainer cleanly."" 
This reverts commit dd5c94717077c9366dee364c88a86a78e5ee2688.
 2014-06-13 17:18:47 -07:00
Nick Kralevich
748f4b8d42 Merge "update mLastSlash for gdbserver" 2014-06-13 23:54:51 +00:00
Robert Ly
d3843038b9 Merge "docs: Fixing the remaining issues with the Auto page" into klp-modular-dev 2014-06-13 23:54:21 +00:00
Ricardo Cervera
5fa675415a docs: Fixing the remaining issues with the Auto page 
Change-Id: I18ff53b6e9aa64bd7b00674b67799a0f37f0c57d
 2014-06-15 23:10:32 -07:00
Nick Kralevich
195b23ef71 update mLastSlash for gdbserver 
the gdbserver special case wasn't updating mLastSlash. Fix it.

Change-Id: I63d64bb5f543bd2df6183649cf727e830731e144
 2014-06-13 16:24:58 -07:00
Craig Mautner
6fe2184bf1 Do not treat the dummy animation as an animation 
The dummy animation is a place holder. When the task stack is being
removed treating it as a true animation forced us through a path
where we deferred the detachment and made a call to tmpRemoveWindows.

Also replaced call to tmpRemoveWindows with a real remove windows
call. The tmpRemoveWindows call does not clean up the Session
and this leaves a surface on the screen.

Fixes bug 15591610.

Change-Id: I05f7bc276bfed2366bbcd8443c92a4bbbc8a4491
 2014-06-13 15:46:22 -07:00
smain@google.com
122ee7e861 am 78219f04: update download pages for SDK and remove /tools landing page. 
* commit '78219f0466a1924e8edb1a0b7a40b7d51d7f6283':
  update download pages for SDK and remove /tools landing page.
 2014-06-13 22:40:49 +00:00
Vinod Krishnan
1e6048e015 Merge "DO NOT MERGE Cherry picking 3 CLs to fix CTS testFitSystemWindows" into klp-modular-dev 2014-06-13 21:09:46 +00:00
Adam Powell
11335f14b9 DO NOT MERGE Cherry picking 3 CLs to fix CTS testFitSystemWindows 
----
Explicitly track consumed state for WindowInsets

Treating 0-insets as fully consumed is incorrect since it means that
you can't dispatch empty insets down the view hierarchy - traversal
terminates immediately. Track consumed state independent of actual
values. Replacing a given set of insets with all zeroes will mark it
consumed.
----
Fix incorrect dispatch of empty WindowInsets from ActionBarOverlayLayout

Fix a bug where ActionBarOverlayLayout was using a private constructor
of WindowInsets to return empty insets that should have been marked
fully consumed. This caused dispatch to further child views not to
stop appropriately, corrupting application layout in some cases.
---
Fix CTS regression in fitSystemWindows

Don't attempt to apply null insets from a call to fitSystemWindows.
Immediately return false since null insets cannot be applied.
----

Bug: 15452706
Change-Id: I34276a90305b141b4653aef0048f70350c69d02a
 2014-06-13 16:51:01 -07:00
smain@google.com
78219f0466 update download pages for SDK and remove /tools landing page. 
Change-Id: I7e883a2647d7c487570c4abdba9df5d72a52b274
 2014-06-13 13:26:43 -07:00
Andrew Solovay
79130d1de3 am 81be9239: am bd8ca9f9: am 4737af8b: docs: Added "Verifying for ART" to TOC. 
* commit '81be9239fd9bf4122757a23e143c0aa1b925b42b':
  docs: Added "Verifying for ART" to TOC.
 2014-06-13 18:29:36 +00:00
Andrew Solovay
81be9239fd am bd8ca9f9: am 4737af8b: docs: Added "Verifying for ART" to TOC. 
* commit 'bd8ca9f9adf10a5b7e1e04ed139e4108758e286f':
  docs: Added "Verifying for ART" to TOC.
 2014-06-13 18:25:53 +00:00
Andrew Solovay
bd8ca9f9ad am 4737af8b: docs: Added "Verifying for ART" to TOC. 
* commit '4737af8b0aa77681270b6bc6478a946b71144e45':
  docs: Added "Verifying for ART" to TOC.
 2014-06-13 18:23:03 +00:00
Andrew Solovay
4737af8b0a docs: Added "Verifying for ART" to TOC. 
Now that "Verifying App Behavior on the Android Runtime (ART)"
(guide/practices/verifying-apps-art.jd) is published, also adding it
to the "API Guides" TOC.

You can verify it at

http://asolovay.mtv:9001/guide/practices/index.html

(...it's the last element in the "Best Practices" submenu.)

Change-Id: If7b445616768d17193309dbd3075b2630652ac96
 2014-06-13 10:52:29 -07:00
Justin Koh
0f3d3dd26c am dd5c9471: Revert "Close ActivityView and ActivityContainer cleanly." 
* commit 'dd5c94717077c9366dee364c88a86a78e5ee2688':
  Revert "Close ActivityView and ActivityContainer cleanly."
 2014-06-13 17:27:48 +00:00
Justin Koh
dd5c947170 Revert "Close ActivityView and ActivityContainer cleanly." 
This reverts commit 4a9f129874785d34930f165268dbc618e4bc2618.

Conflicts:
	services/core/java/com/android/server/am/ActivityStackSupervisor.java

Change-Id: Ic1f4df7f4cb644de7ddebcdc8ce632b46c5ba8f2
 2014-06-13 09:55:09 -07:00
Digish Pandya
1fa4cef34a hwui: fix possible null pointer de-refrence 
add layer check for  null before de-refrencing it.

issue link: http://code.google.com/p/android/issues/detail?id=61622

Change-Id: I54fc21ec594effcfb1eededd80dd5b0b52645c4c
 2014-06-13 17:14:50 +05:30
Jeff Brown
cd4c754e99 am 374013f4: Merge "Suppress haptic feedback for SLEEP key when already asleep." into klp-modular-dev 
* commit '374013f4dba56c9ea340d22dcefdf904cbd47ce6':
  Suppress haptic feedback for SLEEP key when already asleep.
 2014-06-13 03:08:35 +00:00
Jeff Brown
1a073a8f55 am 926e1f01: Merge "When watch is docked, home key press should launch dock home." into klp-modular-dev 
* commit '926e1f01a5f2366c5d0eeab358822ba1d138d980':
  When watch is docked, home key press should launch dock home.
 2014-06-13 03:04:25 +00:00
Lu, Shenghua
c5e0a29541 update parameters in uploadToTexture() for GLES20 
Google optimized the uploadToTexture with GLES3.0+,
This allows us to upload a sub-rectangle of texture,
but this has compliance issue with GLES 2.0.

With OpenGL ES 2.0 we need to copy the bitmap in a
temporary buffer if the stride doesn't match the width,
and then upload entire temporary stripes.

Change-Id: I8987cd8347913c61b7fa45bd47be1189aa6bdb05
Signed-off-by: Shenghua Lu <shenghua.lu@intel.com>
Signed-off-by: Shuo Gao <shuo.gao@intel.com>
Signed-off-by: Guobin Zhang<guobin.zhang@intel.com>
 2014-06-13 09:42:33 +08:00
Craig Mautner
4849aa86b1 am be634951: Fix permission problem and NPE 
* commit 'be63495101dba3b0c3c496cdd810df9e30e926d4':
  Fix permission problem and NPE
 2014-06-12 23:36:54 +00:00
Tim Murray
604ea0e415 am b1c9430c: am 77d28ca2: Merge "Move FieldPacker over to use large objects on 64-bit." 
* commit 'b1c9430c8749b1feba59bb55a31cb1364270981b':
  Move FieldPacker over to use large objects on 64-bit.
 2014-06-12 23:08:39 +00:00
Tim Murray
b1c9430c87 am 77d28ca2: Merge "Move FieldPacker over to use large objects on 64-bit." 
* commit '77d28ca25378530f92d409fbd72a38a1e256b59f':
  Move FieldPacker over to use large objects on 64-bit.
 2014-06-12 23:05:16 +00:00
Deepanshu Gupta
c57b410c8e Add a script to rename fonts for SDK. [DO NOT MERGE] 
Create a script that will rename the PS name encoded in the font that is
to be shipped with the SDK.

This commit is a combination of 5 commits:
e0660d31c256e02e5f5e2967508a7205d1f62f86
7e149f02c4e4403101e7e0e88af36cd4ab6f3554
66d3314301a8983c7070a15ea68daacc7300b7f2
c6364fd90de1600526d3431ce0740b6b856e48f0
2d8c52dc4502b8407705d5b6efe628cb657b20b4

Change-Id: I675a98db39fea4525e3673656af1764eb7e5bb96
 2014-06-12 15:08:46 -07:00
Nick Kralevich
50ece5ec53 am 9a0485aa: am 1ef888e5: Merge "Add service_contexts to policy update bundles." 
* commit '9a0485aa567c99157e45d08e9712a281f34ffc5f':
  Add service_contexts to policy update bundles.
 2014-06-12 21:10:30 +00:00
Jeff Brown
374013f4db Merge "Suppress haptic feedback for SLEEP key when already asleep." into klp-modular-dev 2014-06-12 21:07:47 +00:00
Jeff Brown
bae8e77db6 Suppress haptic feedback for SLEEP key when already asleep. 
Bug: 15377857
Change-Id: I4dfd273b089871d3a78513f52436a3f9c7d40fa4
 2014-06-12 19:59:45 -07:00
Jeff Brown
4f5fa285a8 When watch is docked, home key press should launch dock home. 
Bug: 15575717
Change-Id: Ib3fbe3ed0380378b0162901bfeebe3c218c4d568
 2014-06-12 19:19:15 -07:00
Nick Kralevich
9a0485aa56 am 1ef888e5: Merge "Add service_contexts to policy update bundles." 
* commit '1ef888e564926b78aeb02ef1085be2f72227b862':
  Add service_contexts to policy update bundles.
 2014-06-12 21:07:25 +00:00
Craig Mautner
be63495101 Fix permission problem and NPE 
Remove uid before calling into Window Manager. Restore afterwards.

Check for null stack value before dereferencing.

Fixes bug 15591112.

Change-Id: Ida3de556940440162c91b8c1614d0f21e364abd8
 2014-06-12 13:50:53 -07:00
Deepanshu Gupta
1434ea749f am 92b7c67e: Merge "LayoutLib fixes for API 20 [DO NOT MERGE]" into klp-modular-dev 
* commit '92b7c67e719fa125a5af368eb9e00f724c88601d':
  LayoutLib fixes for API 20 [DO NOT MERGE]
 2014-06-12 20:04:12 +00:00
Scott Main
91b078c8dc am 55c11af7: Merge "reorg the SDK setup docs to streamline setup for all variations. Move ADT plugin to the ADT help doc and combine the three setup guides into one page that is dynamic based on a URL parameter." into klp-modular-dev 
* commit '55c11af78a34f6746b9b5fcf8aa487eef797ea2e':
  reorg the SDK setup docs to streamline setup for all variations. Move ADT plugin to the ADT help doc and combine the three setup guides into one page that is dynamic based on a URL parameter.
 2014-06-12 19:04:34 +00:00
Andrew Solovay
d51a5b3891 am 25b8af9d: am 436f4e36: am ded9c171: Merge "docs: New "Verifying App Behavior on the Android Runtime (ART)" guide." into klp-docs 
* commit '25b8af9d3f91503146a4592d7fc19a53ca44bf4a':
  docs: New "Verifying App Behavior on the Android Runtime (ART)" guide.
 2014-06-12 17:27:48 +00:00
Andrew Solovay
25b8af9d3f am 436f4e36: am ded9c171: Merge "docs: New "Verifying App Behavior on the Android Runtime (ART)" guide." into klp-docs 
* commit '436f4e36d30bc6d1f2b353d8e5de9c37a594e874':
  docs: New "Verifying App Behavior on the Android Runtime (ART)" guide.
 2014-06-12 17:23:31 +00:00
Andrew Solovay
436f4e36d3 am ded9c171: Merge "docs: New "Verifying App Behavior on the Android Runtime (ART)" guide." into klp-docs 
* commit 'ded9c171ead51b358538a65d8b84946e05d8db2b':
  docs: New "Verifying App Behavior on the Android Runtime (ART)" guide.
 2014-06-12 17:19:33 +00:00
Jeff Brown
926e1f01a5 Merge "When watch is docked, home key press should launch dock home." into klp-modular-dev 2014-06-12 05:34:42 +00:00
Tim Murray
77d28ca253 Merge "Move FieldPacker over to use large objects on 64-bit." 2014-06-12 05:34:11 +00:00
Tim Murray
4154bbd69b Move FieldPacker over to use large objects on 64-bit. 
Change-Id: I1d4d502a3f9d86c6cf0f516cc087b1457f86ac28
 2014-06-12 14:23:19 -07:00
Dirk Dougherty
b9830ad3c4 remove extraneous tag causing extra spacing between heading/text. 
Change-Id: I008f48f8274ed45d38dcef05fa9c47b935f23910
 2014-06-11 21:03:33 -07:00
Nick Kralevich
1ef888e564 Merge "Add service_contexts to policy update bundles." 2014-06-12 03:32:07 +00:00
Riley Spahn
5f5cf5f670 Add service_contexts to policy update bundles. 
Add service_context file to SELinuxPolicyInstallReceiver
to allow updating.

Bug: 12909011
Change-Id: Ic0ad89958cc750413787d57e0f51363212a8730b
 2014-06-12 20:46:34 +00:00
Robert Ly
d73b045090 Merge "docs: fix index pages" into klp-modular-dev 2014-06-12 03:30:50 +00:00
Robert Ly
1568c19fe3 docs: fix index pages 
Change-Id: I2a011ee5a3539d908d10ac5dbc9c0df3e7633220
 2014-06-15 18:40:06 -07:00
Robert Ly
09e2459cc3 Merge "docs: Added info on customizing the status bar." into klp-modular-dev 2014-06-12 03:30:50 +00:00