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

12899 Commits

Author SHA1 Message Date
Gilles Debunne
511d444be0 am b318ef79: am 62dbd82a: Fix for IndexOutOfBounds in TextView getWordLimitsAt. 
Merge commit 'b318ef79d5018fdf492ba254438e2d9f1c0fff4c'

* commit 'b318ef79d5018fdf492ba254438e2d9f1c0fff4c':
  Fix for IndexOutOfBounds in TextView getWordLimitsAt.
 2010-08-26 15:51:56 -07:00
Adam Cohen
4252a5a4b4 Merge "-> Added the ability to specify an AdapterView's empty view through RemoteViews. An empty view is the view that appears in lieu of the collection when the collection is empty. -> Made StackViews start at their last item" 2010-08-26 15:41:59 -07:00
Adam Cohen
1480fddea8 -> Added the ability to specify an AdapterView's empty view 
through RemoteViews. An empty view is the view that appears
in lieu of the collection when the collection is empty.
-> Made StackViews start at their last item

Change-Id: Ica44e5e8f8f2a2e5589a6c74414ec4d08303887f
 2010-08-26 15:28:05 -07:00
Ben Dodson
e3f55d45cf Merge "Updated documentation for upcoming fix for @code tags" 2010-08-26 15:27:15 -07:00
Gilles Debunne
fc2563ba4e resolved conflicts for merge of f309c7a8 to master 
Change-Id: I80dfe8a0b142fa95fa83d46f3b60223c2991fce3
 2010-08-26 14:48:48 -07:00
Jim Miller
c70bd1921b Merge "Fix 2797185: Integrate 3D RecentApps View into system." 2010-08-26 14:24:44 -07:00
Chet Haase
d7c2f623fe Merge "Fix problems with early ending of Sequencer" 2010-08-26 14:20:01 -07:00
Ben Dodson
4e8620f868 Updated documentation for upcoming fix for @code tags 
Change-Id: Id7b163179132b9cf180afecb4e9e10ee39bcd415
 2010-08-26 14:02:20 -07:00
Chet Haase
f1b9b46421 Fix problems with early ending of Sequencer 
Change-Id: Ib7548059ee3d3d713b78f86a2d290be4397c167d
 2010-08-26 13:59:20 -07:00
Dianne Hackborn
5fcfa52d60 am efd05ea6: am 0a7f5fc4: Merge "Fix issue #2951784: Launcher crashes on startup" into gingerbread 
Merge commit 'efd05ea69a53d73d2dacacd74f6a420cac8ef97b'

* commit 'efd05ea69a53d73d2dacacd74f6a420cac8ef97b':
  Fix issue #2951784: Launcher crashes on startup
 2010-08-26 13:15:21 -07:00
Gilles Debunne
b318ef79d5 am 62dbd82a: Fix for IndexOutOfBounds in TextView getWordLimitsAt. 
Merge commit '62dbd82aad0f84c88212566321e3fb370affaf7c' into gingerbread-plus-aosp

* commit '62dbd82aad0f84c88212566321e3fb370affaf7c':
  Fix for IndexOutOfBounds in TextView getWordLimitsAt.
 2010-08-26 11:52:44 -07:00
Gilles Debunne
62dbd82aad Fix for IndexOutOfBounds in TextView getWordLimitsAt. 
Bug http://b/issue?id=2948904

Change-Id: I10008374da92d5a98ec567cc76732383e66c4c5b
 2010-08-26 11:12:16 -07:00
Shimeng (Simon) Wang
b79c271857 Merge "Restore zoom level when browser is restored." 2010-08-26 11:05:48 -07:00
Gilles Debunne
f309c7a869 am 1b400c77: Merge "Fix for NPE in TextView." into gingerbread 
Merge commit '1b400c7763e63505bafd496953764c3e97c2be5b' into gingerbread-plus-aosp

* commit '1b400c7763e63505bafd496953764c3e97c2be5b':
  Fix for NPE in TextView.
 2010-08-26 11:01:34 -07:00
Gilles Debunne
1b400c7763 Merge "Fix for NPE in TextView." into gingerbread 2010-08-26 10:58:58 -07:00
Shimeng (Simon) Wang
4ae1f6f2ae Restore zoom level when browser is restored. 
issue: 2950667
Change-Id: If335813eed6311d3d01354147bd62f90ffbdacfb
 2010-08-26 10:58:38 -07:00
Dianne Hackborn
efd05ea69a am 0a7f5fc4: Merge "Fix issue #2951784: Launcher crashes on startup" into gingerbread 
Merge commit '0a7f5fc474182c58b478d8f9017209dcf8d0ca0b' into gingerbread-plus-aosp

* commit '0a7f5fc474182c58b478d8f9017209dcf8d0ca0b':
  Fix issue #2951784: Launcher crashes on startup
 2010-08-26 10:50:11 -07:00
Dianne Hackborn
0a7f5fc474 Merge "Fix issue #2951784: Launcher crashes on startup" into gingerbread 2010-08-26 10:47:48 -07:00
Dianne Hackborn
9dae48e399 Fix issue #2951784: Launcher crashes on startup 
Change-Id: I98aedacce9a7d6b8bc168f39ea5489b40dc0ec8d
 2010-08-26 10:20:01 -07:00
Robert Greenwalt
4ea54f442e Merge "resolved conflicts for merge of b998f311 to gingerbread-plus-aosp" into gingerbread-plus-aosp 2010-08-26 08:29:10 -07:00
Dianne Hackborn
c8f8497b9c resolved conflicts for merge of 66d633d2 to master 
Change-Id: I6c38d7c4d127954dfca17082215c587a3cd4a586
 2010-08-25 23:14:44 -07:00
Dianne Hackborn
66d633d208 am 3003a017: Merge "Don\'t retain global ref to last inflated context." into gingerbread 
Merge commit '3003a017d312a55e3804d6cf4a80044b1f1d7993' into gingerbread-plus-aosp

* commit '3003a017d312a55e3804d6cf4a80044b1f1d7993':
  Don't retain global ref to last inflated context.
 2010-08-25 22:02:18 -07:00
Dianne Hackborn
3003a017d3 Merge "Don't retain global ref to last inflated context." into gingerbread 2010-08-25 22:00:28 -07:00
Dianne Hackborn
7e269644fc Don't retain global ref to last inflated context. 
Also rework URI permission granting to support upcoming
clipboard use.

Change-Id: I9842920350955531c5a511c2ecc5215e8c783343
 2010-08-25 21:50:54 -07:00
Jim Miller
e6ad1a8ba2 Fix 2797185: Integrate 3D RecentApps View into system. 
This adds 3D recents to the platform.  Enabling it is a
matter of setting 'config_enableRecentApps3D' on devices
capable of supporting it (those with OGLES2.0 at the moment).

Change-Id: Ife7bfe8ca02e7657821b68f915e31b0dab50cd2c
 2010-08-25 20:43:00 -07:00
Gilles Debunne
df4ee43062 Fix for NPE in TextView. 
Bug http://b/issue?id=2941549

Change-Id: Id5cbf0a3b2b68f450a9271333b96d41b01aa9f5c
 2010-08-25 19:15:10 -07:00
Robert Greenwalt
b21b62327c resolved conflicts for merge of b998f311 to gingerbread-plus-aosp 
Change-Id: I7ceb0b624e78d85542d1c36bfabeb5dc31961505
 2010-08-25 17:48:47 -07:00
Konstantin Lopyrev
261d509270 am 5a54e980: am 6947cc59: Merge "Preventing the hierarchy viewer from getting stuck, once when trying to load the window data for SurfaceView and the Wallpaper, and in the case the captured node has disappeared." into gingerbread 
Merge commit '5a54e98022d640900f94102c077d8dff447f3c76'

* commit '5a54e98022d640900f94102c077d8dff447f3c76':
  Preventing the hierarchy viewer from getting stuck, once when trying to load the window data for SurfaceView and the Wallpaper, and in the case the captured node has disappeared.
 2010-08-25 17:41:02 -07:00
Konstantin Lopyrev
5a54e98022 am 6947cc59: Merge "Preventing the hierarchy viewer from getting stuck, once when trying to load the window data for SurfaceView and the Wallpaper, and in the case the captured node has disappeared." into gingerbread 
Merge commit '6947cc594276df899a0c4662224455f40846bd0a' into gingerbread-plus-aosp

* commit '6947cc594276df899a0c4662224455f40846bd0a':
  Preventing the hierarchy viewer from getting stuck, once when trying to load the window data for SurfaceView and the Wallpaper, and in the case the captured node has disappeared.
 2010-08-25 17:37:45 -07:00
Konstantin Lopyrev
6947cc5942 Merge "Preventing the hierarchy viewer from getting stuck, once when trying to load the window data for SurfaceView and the Wallpaper, and in the case the captured node has disappeared." into gingerbread 2010-08-25 17:35:50 -07:00
Chet Haase
673e42fafd Fix for end events from Sequencer objects 
Change-Id: I8947d8b016b880f9f54f2bf6ab22b4e188cdb29a
 2010-08-25 17:32:27 -07:00
Mathias Agopian
dcde3a8abe am a62dfe9e: am 94e939e8: Merge "Improve Sensors documentation a bit" into gingerbread 
Merge commit 'a62dfe9e49ea785c4be2173479e4472767771ce5'

* commit 'a62dfe9e49ea785c4be2173479e4472767771ce5':
  Improve Sensors documentation a bit
 2010-08-25 16:40:40 -07:00
Brad Fitzpatrick
4cbc4f1067 am 49209cbc: am d0e6598b: Merge "Start of SharedPreferences.startCommit()" into gingerbread 
Merge commit '49209cbcef37c4b20c9d0649ba284a51144b3930'

* commit '49209cbcef37c4b20c9d0649ba284a51144b3930':
  Start of SharedPreferences$Editor.startCommit()
 2010-08-25 16:40:06 -07:00
Mathias Agopian
a62dfe9e49 am 94e939e8: Merge "Improve Sensors documentation a bit" into gingerbread 
Merge commit '94e939e8794727f4f74839de23c5ac5f0d9f84b3' into gingerbread-plus-aosp

* commit '94e939e8794727f4f74839de23c5ac5f0d9f84b3':
  Improve Sensors documentation a bit
 2010-08-25 16:07:25 -07:00
Mathias Agopian
94e939e879 Merge "Improve Sensors documentation a bit" into gingerbread 2010-08-25 16:03:58 -07:00
Mike Lockwood
48114f72fd Merge "MTP: work in progress on expanded property support" 2010-08-25 15:44:03 -07:00
Mike Lockwood
828d19dd96 MTP: work in progress on expanded property support 
GetObjectPropValue and SetObjectPropValue are disabled until I figure out
why Windows doesn't like what I have done.

Change-Id: I74e945ef3ea031f6d46f4ebaa8df815da0a5c3ed
Signed-off-by: Mike Lockwood <lockwood@android.com>
 2010-08-25 18:42:22 -04:00
Brad Fitzpatrick
49209cbcef am d0e6598b: Merge "Start of SharedPreferences.startCommit()" into gingerbread 
Merge commit 'd0e6598b4a32f3000247341414449a3aa4d9f7f4' into gingerbread-plus-aosp

* commit 'd0e6598b4a32f3000247341414449a3aa4d9f7f4':
  Start of SharedPreferences$Editor.startCommit()
 2010-08-25 15:19:57 -07:00
Brad Fitzpatrick
d0e6598b4a Merge "Start of SharedPreferences$Editor.startCommit()" into gingerbread 2010-08-25 15:15:30 -07:00
Romain Guy
dc9e486e0a Merge "Only destroy the GL Canvas when necessary." 2010-08-25 14:46:24 -07:00
Romain Guy
4caa4ed120 Only destroy the GL Canvas when necessary. 
Change-Id: I6caf4873b02dc4a6d7c8c91925d2447b3b0e0593
 2010-08-25 14:46:24 -07:00
Sascha Brawer
df195b1ddb Merge "Generated Romansh messages from Unicode CLDR." 2010-08-25 14:40:45 -07:00
Mathias Agopian
43c87e44fc Improve Sensors documentation a bit 
Change-Id: I6f4f9ebfaf1e7f461a795f717b9913e3a021e9d4
 2010-08-25 14:35:54 -07:00
Cary Clark
7462fc738f Merge "simplify cursor ring draw state; fix null check" 2010-08-25 14:03:36 -07:00
Cary Clark
1ef41605bb am d64f4a98: DO NOT MERGE fix null check 
Merge commit 'd64f4a983df4fd11795e04896d8c48852f6b1777' into gingerbread-plus-aosp

* commit 'd64f4a983df4fd11795e04896d8c48852f6b1777':
  DO NOT MERGE fix null check
 2010-08-25 13:53:05 -07:00
Konstantin Lopyrev
43b9b48f79 Preventing the hierarchy viewer from getting stuck, once when trying to load the window data for SurfaceView and the Wallpaper, and in the case the captured node has disappeared. 
Change-Id: Iaff6bd501a2bb3faa7a394fff740479f6a95e899
 2010-08-25 13:38:27 -07:00
Adam Cohen
6587045a84 Merge "Cleanup and bug fixes in StackView -> pushed functionality from AdapterViewAnimator to StackView -> only modifying clipping flags as far up the view hierarchy as needed -> still need framework level solution for drawing outside bounds" 2010-08-25 13:24:37 -07:00
Cary Clark
d64f4a983d DO NOT MERGE fix null check 
Check to see if the WebChromeClient is null.

Checked into master in change 63008

Change-Id: If2ef1889ce3633c0b35c078a46bde84982dd1eb3
http://b/2945171
 2010-08-25 16:22:15 -04:00
Adam Cohen
9b073948cf Cleanup and bug fixes in StackView 
-> pushed functionality from AdapterViewAnimator to StackView
-> only modifying clipping flags as far up the view
   hierarchy as needed
-> still need framework level solution for drawing outside bounds

ViewGroup touch dispatch temp fix
-> Touch event was being modified and not reset in some
   code paths.

Change-Id: I8135b62e2d73f239b9df407b0fa93bc434796989
 2010-08-25 13:16:14 -07:00
Brad Fitzpatrick
edf32d0131 Start of SharedPreferences$Editor.startCommit() 
No implementation yet, just the interface.

Change-Id: Idf9934b445da1fb72b79f0192218b47c0a7f5a34
 2010-08-25 13:13:36 -07:00