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

59980 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Elliott Hughes
f21dd1eabe Merge branch 'master' of ssh://android-git:29418/platform/frameworks/base 2011-10-17 11:32:08 -07:00
Jamie Gennis
7f7362c02b Merge changes I4e5ff00c,Id5e3ca1d,I97cbba61 
* changes:
  SurfaceFlinger: Remove display freezing code
  SurfaceFlinger: add some layer update tests
  SurfaceFlinger: make sync transactions explicit
 2011-10-17 11:31:39 -07:00
Dianne Hackborn
c831f6c979 am e6b68036: New aapt feature to do smarter filtering of configurations. 
* commit 'e6b680364dd992907a8d2037685a2e500d188dfb':
  New aapt feature to do smarter filtering of configurations.
 2011-10-17 11:31:35 -07:00
Uriel Rodriguez
af0aec584a am d814d4fa: Merge "going directly to backup after face unlock fails 15 times" into ics-mr0 
* commit 'd814d4fa0c76a0384f7e32816e1ca36f237911c6':
  going directly to backup after face unlock fails 15 times
 2011-10-17 11:31:19 -07:00
Scott Main
82ced8250f am f755a2e8: Merge "docs: a couple notes for a11y methods in View and cleanup to the A11y service HTML to be semantically correct and thus improve its accessibility :)" into ics-mr0 
* commit 'f755a2e8aabfd6b26df4f3f56f0e9cdfb06cc173':
  docs: a couple notes for a11y methods in View and cleanup to the A11y service HTML to be semantically correct and thus improve its accessibility :)
 2011-10-17 11:30:58 -07:00
Bart Sears
b29553e5b0 am b227cce3: Merge "Check MediaPlayer state, do not teardown() from UI thread." into ics-mr0 
* commit 'b227cce31641c39a1a586739561b4776019945a4':
  Check MediaPlayer state, do not teardown() from UI thread.
 2011-10-17 11:30:52 -07:00
Mathias Agopian
4b1415ebd9 am 57337eb7: Merge "Add a LayerScreenshot" into ics-mr0 
* commit '57337eb78e65c160fb9c46a01e04c476d1bfdca1':
  Add a LayerScreenshot
 2011-10-17 11:30:33 -07:00
Steve Block
bddddf4729 Merge "Fix use of WebView.loadData() to avoid passing invalid encoding" 2011-10-17 08:58:58 -07:00
Steve Block
136b1637f8 Fix use of WebView.loadData() to avoid passing invalid encoding 
No change in behavior, as invalid encodings have always been ignored.

Bug: 5125738
Change-Id: I23f21ca65a6b14501c74dc2189a55643f1e33c33
 2011-10-17 15:11:33 +01:00
Justin Ho
37b3239343 am eaf49524: Merge "Moving text cursor to nodpi" into ics-mr0 
* commit 'eaf4952410eb86d6ac8b343af3024250b9550dfd':
  Moving text cursor to nodpi
 2011-10-17 07:07:29 -07:00
Peter Ng
9be02f66a5 am a3ffec23: Update stat_ icons 
* commit 'a3ffec23178922a48aee2ad10239ae79640b5bcd':
  Update stat_ icons
 2011-10-17 07:07:27 -07:00
Jim Miller
817a55b20f am ff74b9c8: Merge "Fix 5458658: Fix memory leak in lock screen" into ics-mr0 
* commit 'ff74b9c88400a14b1faa43c514aac348674ca685':
  Fix 5458658: Fix memory leak in lock screen
 2011-10-17 07:07:18 -07:00
Justin Ho
6aa942a2b3 am ccf29b4c: Merge "Updating numberpicker assets" into ics-mr0 
* commit 'ccf29b4c03422a858a2fcc644e3d2ecbcc555208':
  Updating numberpicker assets
 2011-10-17 07:07:16 -07:00
Justin Ho
494c5e3e51 am a6389a9c: Merge "Updated codelock assets" into ics-mr0 
* commit 'a6389a9c1e1a50fe040961dfead76102b530b149':
  Updated codelock assets
 2011-10-17 07:07:14 -07:00
Justin Ho
3f6a7c275c am af951c17: Merge "Update presence away asset" into ics-mr0 
* commit 'af951c17e75b378a382dc4e7fefa7464f7bdfddb':
  Update presence away asset
 2011-10-17 07:07:11 -07:00
Justin Ho
0ce59db8d9 am 52670cd4: Merge "Update list selector background (disabled state)" into ics-mr0 
* commit '52670cd4f73aa28a72dc1df4e7fa92fb0d972781':
  Update list selector background (disabled state)
 2011-10-17 07:07:10 -07:00
Justin Ho
aab13cd208 am 3c2bbc24: Merge "Update share pack assets" into ics-mr0 
* commit '3c2bbc2406e491b11e16b9f8bb0495d433097d52':
  Update share pack assets
 2011-10-17 07:07:08 -07:00
Scott Main
5e6889cb1c am 8009752d: Merge "fix android beam demo path" into ics-mr0 
* commit '8009752da64f5c6ec4df4f1737032bba74ebb2a4':
  fix android beam demo path
 2011-10-17 07:07:05 -07:00
Justin Ho
8287825350 am 686420a4: Merge "Update rating star buttons" into ics-mr0 
* commit '686420a40e2bfd7c701cba9748d4771315dcd1cc':
  Update rating star buttons
 2011-10-17 07:07:04 -07:00
Justin Ho
98f05931ad am cd8f69dd: Merge "Update unlock halo asset" into ics-mr0 
* commit 'cd8f69dd84306267db23426c538f86b577d82511':
  Update unlock halo asset
 2011-10-17 07:07:02 -07:00
Justin Ho
73963d95ad am 269c64de: Merge "Update lockscreen assets" into ics-mr0 
* commit '269c64de8817e158e9ae49ea489344fbfc46f160':
  Update lockscreen assets
 2011-10-17 07:07:00 -07:00
Justin Ho
6e0747eaf4 am 41c5a607: Merge "Update bullet permission asset" into ics-mr0 
* commit '41c5a607498b8922105ba9dfeb6adf8dd0a82050':
  Update bullet permission asset
 2011-10-17 07:06:57 -07:00
Steve Block
b22a69f2ca Build fix 
Fix after https://android-git.corp.google.com/g/#/c/125775

Bug: 5461416
Change-Id: Ifee29b287c9fcd2a35b0b676db00ef2a4fc8c5a8
 2011-10-17 12:25:00 +01:00
Steve Block
cfece91c1e Merge "Improve documentation for WebChromeClient.onCreateWindow()" 2011-10-17 02:30:41 -07:00
Steve Block
3593414863 Merge "Clean up documentation for WebView.loadUrl()" 2011-10-17 02:30:00 -07:00
Steve Block
f71dea025a Clean up documentation for WebView.loadUrl() 
Bug: 5461416
Change-Id: I3bb6ac4abab7def8e06de087c5ae7be906bc962e
 2011-10-17 10:29:03 +01:00
Alex Sakhartchouk
a744ead977 Merge "Adding getter functions for script side RS objects. Multiproject change involving on device linker" 2011-10-16 12:13:18 -07:00
Dianne Hackborn
e6b680364d New aapt feature to do smarter filtering of configurations. 
This adds a --preferred-configurations flag that specifies the
specific configurations you would like to have.

It is smarter than "-c" because it will avoid stripping a
configuration if that would result in there being no value
for the resource.

It is dumber than "-c" because it can't process as many kinds
of resources.  It is really only intended for bitmaps and use
with density configs.

This required re-arranging AaptAssets to group files together
by config again, like they used to be.  I think this hasn't
broken anything.  Hopefully.

Change-Id: I4e9d12ff6e6dbd1abb8fd4cb1814c6674b19d0e5
 2011-10-16 11:52:17 -07:00
Alex Sakhartchouk
7e6aac1533 Adding getter functions for script side RS objects. 
Multiproject change involving on device linker

Change-Id: I321e8caa6ca23b3fe2c96c78cdcfc15e51f88823
 2011-10-15 09:33:05 -07:00
Uriel Rodriguez
d814d4fa0c Merge "going directly to backup after face unlock fails 15 times" into ics-mr0 2011-10-15 08:44:21 -07:00
Jeff Brown
6aa1e80e4f Merge "Use MatrixCursor instead of ArrayListCursor." 2011-10-14 21:06:31 -07:00
Jeff Brown
aac01f699f Merge "Add a CrossProcessCursorWrapper. Bug: 5220669" 2011-10-14 21:06:22 -07:00
Jeff Brown
04263dc591 Merge "AbstractWindowedCursor is not special." 2011-10-14 21:06:15 -07:00
Jeff Brown
d00851082f Merge "Make default implementation of fillWindow typesafe. Bug: 5218310" 2011-10-14 21:06:08 -07:00
Jeff Brown
a39a055304 Merge "Deprecate local-only CursorWindows." 2011-10-14 21:05:58 -07:00
Scott Main
f755a2e8aa Merge "docs: a couple notes for a11y methods in View and cleanup to the A11y service HTML to be semantically correct and thus improve its accessibility :)" into ics-mr0 2011-10-14 17:19:17 -07:00
Scott Main
b303d8381d docs: a couple notes for a11y methods in View and cleanup to the 
A11y service HTML to be semantically correct and thus improve its accessibility :)

Change-Id: I483a8a441d802b056f68f82e0e782d86a73298ac
 2011-10-14 17:03:35 -07:00
Jamie Gennis
de14ecaebc SurfaceFlinger: Remove display freezing code 
This change removes the dead code from SurfaceFlinger that resulted from
disabling support for freezing the display.

Change-Id: I4e5ff00c94b4c7a79af2f65c9850c135210068ed
 2011-10-14 16:44:08 -07:00
Jamie Gennis
4f1924380c SurfaceFlinger: add some layer update tests 
This change adds two tests for SurfaceFlinger's behavior when updating
the position and size of a layer.

Change-Id: Id5e3ca1d7e629a3bd2c2d28275d80c7f9256d6da
 2011-10-14 16:11:51 -07:00
Jamie Gennis
122aa6bae9 SurfaceFlinger: make sync transactions explicit 
This change enables a layer or orientation update transaction sent to
SurfaceFlinger to explicitly request a synchronous transaction.

Change-Id: I97cbba610c13679849f66114b216fa6dbf12f2a9
 2011-10-14 16:11:51 -07:00
Bart Sears
b227cce316 Merge "Check MediaPlayer state, do not teardown() from UI thread." into ics-mr0 2011-10-14 16:09:46 -07:00
Romain Guy
436e270fbb Merge "Disable hardware acceleration for apps in compatibility mode" 2011-10-14 15:48:40 -07:00
Romain Guy
856d4e1a87 Disable hardware acceleration for apps in compatibility mode 
Change-Id: I2d1c01a30c6fe6fff85c2a9bd6ee6de98e1ed422
 2011-10-14 15:47:55 -07:00
Mathias Agopian
57337eb78e Merge "Add a LayerScreenshot" into ics-mr0 2011-10-14 15:35:54 -07:00
Justin Ho
eaf4952410 Merge "Moving text cursor to nodpi" into ics-mr0 2011-10-14 15:12:13 -07:00
Peter Ng
a3ffec2317 Update stat_ icons 
Change-Id: Ibc74ba990303d05a34ab35fd0ce3b8ec530782cf
 2011-10-14 14:56:06 -07:00
Jim Miller
ff74b9c884 Merge "Fix 5458658: Fix memory leak in lock screen" into ics-mr0 2011-10-14 14:51:56 -07:00
Justin Ho
ccf29b4c03 Merge "Updating numberpicker assets" into ics-mr0 2011-10-14 14:41:45 -07:00
Justin Ho
a6389a9c1e Merge "Updated codelock assets" into ics-mr0 2011-10-14 14:41:37 -07:00
Justin Ho
af951c17e7 Merge "Update presence away asset" into ics-mr0 2011-10-14 14:41:28 -07:00