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

12445 Commits

Author SHA1 Message Date
Konstantin Lopyrev
ea5282cf90 Merge "resolved conflicts for merge of f00ee0f7 to master" 2010-08-10 21:49:04 -07:00
Konstantin Lopyrev
ecb1d5ded9 resolved conflicts for merge of f00ee0f7 to master 
Change-Id: I13b968bde37fad8fffdaa9bb94a0f1da9b2e6e0c
 2010-08-10 21:47:34 -07:00
Romain Guy
9e187ed821 Merge "Add extra blending modes." 2010-08-10 21:43:09 -07:00
Romain Guy
48daa54d31 Add extra blending modes. 
This change adds the following blending modes for shaders and color filters:
Add
Multiply
Screen
Overlay
Darken
Lighten

Change-Id: Iff22f5ce6041b43c71b1857d73013f5010ab3413
 2010-08-10 21:42:40 -07:00
Konstantin Lopyrev
f00ee0f762 am f39d5987: Merge "Categorizing exported view properties." into gingerbread 
Merge commit 'f39d5987b977fdff8c34a2ddabaec31d1e909db3' into gingerbread-plus-aosp

* commit 'f39d5987b977fdff8c34a2ddabaec31d1e909db3':
  Categorizing exported view properties.
 2010-08-10 17:52:32 -07:00
Konstantin Lopyrev
f39d5987b9 Merge "Categorizing exported view properties." into gingerbread 2010-08-10 17:48:27 -07:00
Konstantin Lopyrev
bea95162ca Categorizing exported view properties. 
Change-Id: I79c42019836973d80662c21d195d088ae01537a0
 2010-08-10 17:45:03 -07:00
Adam Powell
42c0fe8652 Fix bug 2908851 - ActionBar does not get initialized if 
set/addContentView is never called.

Fix bugs around lazy initialization of ActionBar in Activities.

Change-Id: I39a4216a7f6b0051adc4a669b8f921f94148e1db
 2010-08-10 17:08:30 -07:00
Adam Powell
368f384377 Merge "Fix bug 2908822 - open/closePanel should do the right thing with ActionBars" 2010-08-10 16:58:44 -07:00
Adam Powell
4c9073a9a4 Merge "Fix bug 2908823" 2010-08-10 16:58:37 -07:00
Adam Cohen
eeca7df892 Merge "Fixing StackView crash associated with DataSetObserver" 2010-08-10 16:55:15 -07:00
Adam Cohen
8322834a25 Fixing StackView crash associated with DataSetObserver 
Change-Id: Idbc8ed09ee8a58757b7383d6331a4c0357a6fb1f
 2010-08-10 16:48:33 -07:00
Jeff Brown
ea48ff4ba4 am 95105f3c: am c3fc2d03: Fix safe mode and KeyEvent.getMaxKeyCode(). 
Merge commit '95105f3c25110f28b236cfa71e9ad74533eef854'

* commit '95105f3c25110f28b236cfa71e9ad74533eef854':
  Fix safe mode and KeyEvent.getMaxKeyCode().
 2010-08-10 16:39:10 -07:00
Jeff Brown
fb8e05b154 am d3cf0544: am d98d0fc6: Merge "Optimize VelocityTracker to run in linear time." into gingerbread 
Merge commit 'd3cf0544cc7eec8ace3dc3b7fc17b7dac69e0aab'

* commit 'd3cf0544cc7eec8ace3dc3b7fc17b7dac69e0aab':
  Optimize VelocityTracker to run in linear time.
 2010-08-10 16:38:58 -07:00
Jeff Brown
95105f3c25 am c3fc2d03: Fix safe mode and KeyEvent.getMaxKeyCode(). 
Merge commit 'c3fc2d03d58a258c53c9265a70143d4af076b764' into gingerbread-plus-aosp

* commit 'c3fc2d03d58a258c53c9265a70143d4af076b764':
  Fix safe mode and KeyEvent.getMaxKeyCode().
 2010-08-10 16:33:47 -07:00
Jeff Brown
d3cf0544cc am d98d0fc6: Merge "Optimize VelocityTracker to run in linear time." into gingerbread 
Merge commit 'd98d0fc6e9172d3f130794e499462c911920adf6' into gingerbread-plus-aosp

* commit 'd98d0fc6e9172d3f130794e499462c911920adf6':
  Optimize VelocityTracker to run in linear time.
 2010-08-10 16:31:04 -07:00
Jeff Brown
c3fc2d03d5 Fix safe mode and KeyEvent.getMaxKeyCode(). 
Bug: 2901731
Change-Id: I78617c1b9dee3790fc590e5af4b5083368873184
 2010-08-10 16:28:03 -07:00
Jeff Brown
d98d0fc6e9 Merge "Optimize VelocityTracker to run in linear time." into gingerbread 2010-08-10 16:26:56 -07:00
Adam Powell
f75eeb28de Fix bug 2908822 - open/closePanel should do the right thing with ActionBars 
Change-Id: Ic77f9dee864d17046f69c78a1e6d96a49b5c6180
 2010-08-10 15:59:40 -07:00
Adam Powell
9b4c804b98 Fix bug 2908823 
Change-Id: Ia20d47ff4e2a09cc0e1ac47cd02a5f152f57073c
 2010-08-10 15:36:44 -07:00
Adam Powell
7c312bbd53 Merge "Fix bug 2888333" 2010-08-10 15:35:10 -07:00
Adam Powell
749b0eb2c9 Fix bug 2888333 
Change-Id: I2e9053e9c68cef447f47d181bfe0ddacc5f7167a
 2010-08-10 15:31:02 -07:00
Adam Cohen
8a06cf708b Merge "Preliminary implementation of StackView, which extends AdapterViewAnimator." 2010-08-10 15:10:59 -07:00
Adam Cohen
44729e3d1c Preliminary implementation of StackView, which extends AdapterViewAnimator. 
Change-Id: I3e9d1203fc8848835f28d6bc1c9dc0a3fcf7f242
 2010-08-10 15:09:31 -07:00
Romain Guy
7a70374606 Merge "Fast text selection drawing." 2010-08-10 14:59:18 -07:00
Romain Guy
a48a1a87ba Fast text selection drawing. 
Change-Id: I93fb1312b47bc05345defa9b6cfe47c0658bb329
 2010-08-10 14:59:15 -07:00
Jeff Hamilton
b721b47811 Add a constructor from CursorAdapter to ResourceCursorAdapter. 
Change-Id: I423bab1907c24a718a8575d5cbe0cee0e5e4968e
 2010-08-10 16:17:09 -05:00
Romain Guy
623ee2a569 Merge "Fix tons of bugs and add new text rendering support." 2010-08-10 12:23:49 -07:00
Romain Guy
61c8c9c5b2 Fix tons of bugs and add new text rendering support. 
Change-Id: I326c66b10784006f6df2f12d38e120cef94cd0d7
 2010-08-10 12:22:01 -07:00
Eric Fischer
8c9d61c459 Merge "Import revised translations." 2010-08-10 12:18:50 -07:00
Eric Fischer
28269e91d1 Import revised translations. 
Change-Id: Idaaed3b13133d531dfd6055809c66df3fba250bb
 2010-08-10 12:10:18 -07:00
Eric Rowe
542cf2c9cf am 7cb0fc58: am edae848e: am 301c437b: Remove @LargeTest annotations 
Merge commit '7cb0fc588042f7642f13ea2cc404eae04bd5509a'

* commit '7cb0fc588042f7642f13ea2cc404eae04bd5509a':
  Remove @LargeTest annotations
 2010-08-10 12:04:04 -07:00
Eric Fischer
c7af4c5c5a am 605f4027: Merge "Import revised translations. DO NOT MERGE" into gingerbread 
Merge commit '605f402796afa9c88e2f91284e98d1f59a0726aa' into gingerbread-plus-aosp

* commit '605f402796afa9c88e2f91284e98d1f59a0726aa':
  Import revised translations.  DO NOT MERGE
 2010-08-10 12:00:12 -07:00
Eric Rowe
7cb0fc5880 am edae848e: am 301c437b: Remove @LargeTest annotations 
Merge commit 'edae848eb62e27b8e987aa89557d1456304fada7' into gingerbread-plus-aosp

* commit 'edae848eb62e27b8e987aa89557d1456304fada7':
  Remove @LargeTest annotations
 2010-08-10 12:00:07 -07:00
Eric Fischer
605f402796 Merge "Import revised translations. DO NOT MERGE" into gingerbread 2010-08-10 11:54:24 -07:00
Eric Rowe
edae848eb6 am 301c437b: Remove @LargeTest annotations 
Merge commit '301c437b554e2152f3f6fffadc680f5cbf8e8231' into gingerbread

* commit '301c437b554e2152f3f6fffadc680f5cbf8e8231':
  Remove @LargeTest annotations
 2010-08-10 11:53:59 -07:00
Eric Fischer
06a43dcf48 Import revised translations. DO NOT MERGE 
Change-Id: I24dd4ee2c61694e917db02c92396134df65c0218
 2010-08-10 11:50:15 -07:00
Chet Haase
fd2b002bcf Add 3D rotation to View 
Change-Id: I4aa2542eb821e82d44e13d69b0938de13ffd4f0d
 2010-08-10 10:36:21 -07:00
Brett Chabot
4f94181282 am e967ee49: Merge "Fix gingerbread FrameworkCoreTests makefile." into gingerbread 
Merge commit 'e967ee49b5a86de2be11dd1d28283c337b01e537' into gingerbread-plus-aosp

* commit 'e967ee49b5a86de2be11dd1d28283c337b01e537':
  Fix gingerbread FrameworkCoreTests makefile.
 2010-08-10 10:30:32 -07:00
Jeff Hamilton
f0cfe3438a Add a few helpful APIs. 
Change-Id: Ie57aa71eb77a1e0fb058f4eb6f40d4144a6dfce7
 2010-08-10 10:13:18 -05:00
Mike Lockwood
ff68468f1b Merge changes I4f117090,Ifd449c4e 
* changes:
  MTP: Push queries for supported formats and properties up to Java.
  MTP: turn off verbose logging
 2010-08-10 06:13:35 -07:00
Mike Lockwood
4b322ce4fb MTP: Push queries for supported formats and properties up to Java. 
Change-Id: I4f117090340e3916afda3d194521a6092a672ddc
Signed-off-by: Mike Lockwood <lockwood@android.com>
 2010-08-10 09:00:30 -04:00
Steve Block
68dede3d66 Hook up mock for testing DeviceOrientation in DRT 
Change-Id: I99fbe328807428aa0d94893545bad0697ccb71d7
 2010-08-10 12:00:35 +01:00
Adam Powell
dec9dfd0f9 Support ActionBar in Dialogs 
Dialogs planning on using an ActionBar must have an appropriate
theme. (Later on this will likely be default.)

Change-Id: I7fbf5f76eed3d10765fddeaf211e4decb4e89f87
 2010-08-09 22:18:24 -07:00
Jaikumar Ganesh
feb1a4e5e0 am 4a671a74: am 745d1e90: Merge "Update javadoc for the API and change return of getBondedDevices()." into gingerbread 
Merge commit '4a671a745202cb15cc668d46400731a03b068558'

* commit '4a671a745202cb15cc668d46400731a03b068558':
  Update javadoc for the API and change return of getBondedDevices().
 2010-08-09 20:00:53 -07:00
Konstantin Lopyrev
6f4169cb28 am 75493be9: am 63cca691: Merge "Make sure profiling is done only for views that are actually measured, laid out and drawn." into gingerbread 
Merge commit '75493be9c0b4dd24fc5cddce6ee993ce5f0b2887'

* commit '75493be9c0b4dd24fc5cddce6ee993ce5f0b2887':
  Make sure profiling is done only for views that are actually measured, laid out and drawn.
 2010-08-09 20:00:44 -07:00
Jaikumar Ganesh
39e8a8a04d am 4e25db6a: am cbaef518: Merge "Check whether Bluetooth is enabled before making any API calls." into gingerbread 
Merge commit '4e25db6a51c4182139b85e3b01317d161f944bbb'

* commit '4e25db6a51c4182139b85e3b01317d161f944bbb':
  Check whether Bluetooth is enabled before making any API calls.
 2010-08-09 20:00:36 -07:00
Jaikumar Ganesh
4a671a7452 am 745d1e90: Merge "Update javadoc for the API and change return of getBondedDevices()." into gingerbread 
Merge commit '745d1e905886ed0d8fa0a8590463093d125bc53a' into gingerbread-plus-aosp

* commit '745d1e905886ed0d8fa0a8590463093d125bc53a':
  Update javadoc for the API and change return of getBondedDevices().
 2010-08-09 19:53:57 -07:00
Konstantin Lopyrev
75493be9c0 am 63cca691: Merge "Make sure profiling is done only for views that are actually measured, laid out and drawn." into gingerbread 
Merge commit '63cca69157eae17da2a5492d1bcb7330061a52ac' into gingerbread-plus-aosp

* commit '63cca69157eae17da2a5492d1bcb7330061a52ac':
  Make sure profiling is done only for views that are actually measured, laid out and drawn.
 2010-08-09 19:53:44 -07:00
Jaikumar Ganesh
4e25db6a51 am cbaef518: Merge "Check whether Bluetooth is enabled before making any API calls." into gingerbread 
Merge commit 'cbaef51847ab8d8c4d039f0e425d434811f77f0d' into gingerbread-plus-aosp

* commit 'cbaef51847ab8d8c4d039f0e425d434811f77f0d':
  Check whether Bluetooth is enabled before making any API calls.
 2010-08-09 19:53:16 -07:00