Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
30,421 Commits 3 Branches 0 Tags
681f68a72ef2124a79302ebc2e82282d14832c46
Commit Graph

30421 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Dmitry Shmidt
681f68a72e am 59a5d2d5: (-s ours) am d0f74ae0: Merge "Rename SETSUSPEND to SETSUSPENDOPT DO NOT MERGE" into gingerbread 
Merge commit '59a5d2d5772f41578c72f48df08c0af918b6519c'

* commit '59a5d2d5772f41578c72f48df08c0af918b6519c':
  Rename SETSUSPEND to SETSUSPENDOPT DO NOT MERGE
 2010-09-07 18:52:40 -07:00
Wei-Ta Chen
50cb7dc458 am a295a390: am b356f8ac: Merge "Rename LargeBitmap to BitmapRegionDecoder for having a better API." into gingerbread 
Merge commit 'a295a3908befeb9dd30203c612d95411d68492ed'

* commit 'a295a3908befeb9dd30203c612d95411d68492ed':
  Rename LargeBitmap to BitmapRegionDecoder for having a better API.
 2010-09-07 18:52:21 -07:00
Dianne Hackborn
347262622b am a1205f07: am 2d3739d4: Merge "Modify native ALooper to take an explicit ident." into gingerbread 
Merge commit 'a1205f07a6f0c745e8f42f16fe38c06af04143c7'

* commit 'a1205f07a6f0c745e8f42f16fe38c06af04143c7':
  Modify native ALooper to take an explicit ident.
 2010-09-07 18:52:06 -07:00
Kenny Root
7dea769319 am 000ef46f: am 25429378: Merge "Allow installd to handle large partitions" into gingerbread 
Merge commit '000ef46f5b0f84d08342711b00e8de560ea504af'

* commit '000ef46f5b0f84d08342711b00e8de560ea504af':
  Allow installd to handle large partitions
 2010-09-07 18:51:53 -07:00
Elliott Hughes
da2d18a055 am c50a4f37: am 45cda90b: Merge "Be brief." into gingerbread 
Merge commit 'c50a4f374adbdfe75621928fb3eb3583e4ff4e77'

* commit 'c50a4f374adbdfe75621928fb3eb3583e4ff4e77':
  Be brief.
 2010-09-07 18:51:16 -07:00
Ying Wang
7d8bb82dca Merge commit 'd348ea6e0ad3fc029a01c214da4ad4b8d856c4f9' into manual-merge 
Conflicts:
	core/res/res/values/public.xml

Change-Id: Id80cc50b669d7ea840d28839431126023980e5a1
 2010-09-07 18:39:03 -07:00
Dmitry Shmidt
59a5d2d577 am d0f74ae0: Merge "Rename SETSUSPEND to SETSUSPENDOPT DO NOT MERGE" into gingerbread 
Merge commit 'd0f74ae081bac9a9c8f7faf9288305647735d743' into gingerbread-plus-aosp

* commit 'd0f74ae081bac9a9c8f7faf9288305647735d743':
  Rename SETSUSPEND to SETSUSPENDOPT DO NOT MERGE
 2010-09-07 17:33:55 -07:00
Anatol Pomazau
c24ffe6fdc Fix header path. 
Now libbcc is located under framework/compile

Change-Id: I39cd0d27da73ce31e8cb92772bfda3a942ccd27c
 2010-09-07 17:33:01 -07:00
Dmitry Shmidt
d0f74ae081 Merge "Rename SETSUSPEND to SETSUSPENDOPT DO NOT MERGE" into gingerbread 2010-09-07 17:29:45 -07:00
Romain Guy
5ebac4cc97 Merge "Correctly set the viewport on window resize." 2010-09-07 17:17:12 -07:00
Romain Guy
53389bdcdf Correctly set the viewport on window resize. 
Change-Id: Idec325264d85feda76d4cda00fa511aaac82cf64
 2010-09-07 17:16:32 -07:00
Wei-Ta Chen
a295a3908b am b356f8ac: Merge "Rename LargeBitmap to BitmapRegionDecoder for having a better API." into gingerbread 
Merge commit 'b356f8acec9fdfd36f01e5cca4fe3a28ecd6e628' into gingerbread-plus-aosp

* commit 'b356f8acec9fdfd36f01e5cca4fe3a28ecd6e628':
  Rename LargeBitmap to BitmapRegionDecoder for having a better API.
 2010-09-07 17:07:12 -07:00
Wei-Ta Chen
b356f8acec Merge "Rename LargeBitmap to BitmapRegionDecoder for having a better API." into gingerbread 2010-09-07 17:01:57 -07:00
Irfan Sheriff
1907bd2f6c Rename SETSUSPEND to SETSUSPENDOPT DO NOT MERGE 
Bug: 2973101
Change-Id: I874381eeb12bb796382717285750d700e9b181ce
 2010-09-07 16:42:38 -07:00
Dianne Hackborn
a1205f07a6 am 2d3739d4: Merge "Modify native ALooper to take an explicit ident." into gingerbread 
Merge commit '2d3739d479d67ba736cefbdd6087a11eadfb14ea' into gingerbread-plus-aosp

* commit '2d3739d479d67ba736cefbdd6087a11eadfb14ea':
  Modify native ALooper to take an explicit ident.
 2010-09-07 16:38:45 -07:00
Dianne Hackborn
2d3739d479 Merge "Modify native ALooper to take an explicit ident." into gingerbread 2010-09-07 16:32:48 -07:00
Makoto Onuki
5c3ae02d10 Merge "Add getApplicationContext to the mock implementation." 2010-09-07 15:59:07 -07:00
Dianne Hackborn
42c03e579a Modify native ALooper to take an explicit ident. 
The ALooper API now uses an explicit "identifier" for the integer
that is returned rather than implicitly using the fd.  This allows
the APIs that had the fd to be a little more sane.

Change-Id: I8507f535ad484c0bdc4a1bd016d87bb09acd7ff0
 2010-09-07 15:46:55 -07:00
Kenny Root
000ef46f5b am 25429378: Merge "Allow installd to handle large partitions" into gingerbread 
Merge commit '254293782a94652fd601d6b3f04ad447c072f714' into gingerbread-plus-aosp

* commit '254293782a94652fd601d6b3f04ad447c072f714':
  Allow installd to handle large partitions
 2010-09-07 15:42:02 -07:00
Kenny Root
254293782a Merge "Allow installd to handle large partitions" into gingerbread 2010-09-07 15:38:31 -07:00
Makoto Onuki
1006c842f1 am 3f6e4d56: am 1cc86da6: Merge "Don\'t fall through from TOKEN_EMAIL_LOOKUP" into gingerbread 
Merge commit '3f6e4d56bba393ac556a672202e00bc417784ce8'

* commit '3f6e4d56bba393ac556a672202e00bc417784ce8':
  Don't fall through from TOKEN_EMAIL_LOOKUP
 2010-09-07 15:16:44 -07:00
Dianne Hackborn
d0438da05c am 75f0024c: am 6e86915e: Merge "Fixes to battery stats debug output." into gingerbread 
Merge commit '75f0024cf40eadb2cdaa6ae53409c515b68f21c1'

* commit '75f0024cf40eadb2cdaa6ae53409c515b68f21c1':
  Fixes to battery stats debug output.
 2010-09-07 15:16:38 -07:00
Dianne Hackborn
6aa616c94a am 05dff838: am 11bbe200: Hopefully fix the build. 
Merge commit '05dff838946abb01caa3c3172cf0f367964a0b6d'

* commit '05dff838946abb01caa3c3172cf0f367964a0b6d':
  Hopefully fix the build.
 2010-09-07 14:48:28 -07:00
Dianne Hackborn
4970675316 am b8bcfed5: am f703b77c: Merge "Add system property to turn off scheduling groups." into gingerbread 
Merge commit 'b8bcfed5524a37ee51e3f1129f1df91bc4a59cb4'

* commit 'b8bcfed5524a37ee51e3f1129f1df91bc4a59cb4':
  Add system property to turn off scheduling groups.
 2010-09-07 14:47:51 -07:00
Elliott Hughes
c50a4f374a am 45cda90b: Merge "Be brief." into gingerbread 
Merge commit '45cda90bdc178e253049c7067c78bf4b1204ba82' into gingerbread-plus-aosp

* commit '45cda90bdc178e253049c7067c78bf4b1204ba82':
  Be brief.
 2010-09-07 14:46:15 -07:00
Joe Onorato
d348ea6e0a am 1f6a21c2: Merge "Expose the TextAppearance.StatusBar.* styles." into gingerbread 
Merge commit '1f6a21c2377f33a754222a34fa98ea1e21a6d27d' into gingerbread-plus-aosp

* commit '1f6a21c2377f33a754222a34fa98ea1e21a6d27d':
  Expose the TextAppearance.StatusBar.* styles.
 2010-09-07 14:46:08 -07:00
Elliott Hughes
45cda90bdc Merge "Be brief." into gingerbread 2010-09-07 14:41:36 -07:00
Joe Onorato
1f6a21c237 Merge "Expose the TextAppearance.StatusBar.* styles." into gingerbread 2010-09-07 14:41:12 -07:00
Kenny Root
3e319a9962 Allow installd to handle large partitions 
Use int64_t because we're RPCing over to Java which uses a Long to
represent the filesystem space.

Change-Id: I842b2cf9f2ff8f980ff5895c1c8eb9ebefa1ea31
 2010-09-07 14:35:47 -07:00
Makoto Onuki
3f6e4d56bb am 1cc86da6: Merge "Don\'t fall through from TOKEN_EMAIL_LOOKUP" into gingerbread 
Merge commit '1cc86da61a361c84ef81e893440c500e33fae312' into gingerbread-plus-aosp

* commit '1cc86da61a361c84ef81e893440c500e33fae312':
  Don't fall through from TOKEN_EMAIL_LOOKUP
 2010-09-07 14:34:19 -07:00
Makoto Onuki
1cc86da61a Merge "Don't fall through from TOKEN_EMAIL_LOOKUP" into gingerbread 2010-09-07 14:31:34 -07:00
Makoto Onuki
8e34203c41 Add getApplicationContext to the mock implementation. 
So that it'll be compatible with Loaders, which uses this method.
(Otherwise MockContext.getApplicationContext(), which just throws
an exception, will be used.)

Change-Id: I529b60466cf086b514fcddbef4583d1c5b750b9c
 2010-09-07 14:27:25 -07:00
Andreas Huber
babb35ed75 Merge "Don't assert on unexpected surface flinger dequeue/enqueueBuffer errors, log a warning and ignore them instead." 2010-09-07 14:17:49 -07:00
Dianne Hackborn
75f0024cf4 am 6e86915e: Merge "Fixes to battery stats debug output." into gingerbread 
Merge commit '6e86915e8f5dfffa60ae5d1a4ca9aa74912fd026' into gingerbread-plus-aosp

* commit '6e86915e8f5dfffa60ae5d1a4ca9aa74912fd026':
  Fixes to battery stats debug output.
 2010-09-07 14:15:17 -07:00
Joe Onorato
ccfc1c1ea1 Expose the TextAppearance.StatusBar.* styles. 
Change-Id: I6e1e68ab26495290d480f4fb75facedd6cd62908
 2010-09-07 17:12:10 -04:00
Andreas Huber
94e6b66237 Don't assert on unexpected surface flinger dequeue/enqueueBuffer errors, log a warning and ignore them instead. 
Change-Id: Ia45887df82d66f393520e5a4308f430010402d5e
related-to-bug: 2976248
 2010-09-07 14:11:47 -07:00
Dianne Hackborn
6e86915e8f Merge "Fixes to battery stats debug output." into gingerbread 2010-09-07 14:10:38 -07:00
Dianne Hackborn
b5e3165129 Fixes to battery stats debug output. 
Change-Id: I32e7cad9633b8c517a74573069e426d9f835a83d
 2010-09-07 14:09:36 -07:00
Vasu Nori
2e8b36cc01 Merge "android change to handle Change-Id: Idbeed81b5b7349059e467b33a8641abf0b4aaeff" 2010-09-07 13:23:28 -07:00
Vasu Nori
422dad0f50 android change to handle Change-Id: Idbeed81b5b7349059e467b33a8641abf0b4aaeff 
Change-Id: Icf221a8e8d4c281f7719875816835ad7dfe7f3d1
 2010-09-07 12:56:57 -07:00
Romain Guy
018b0d2918 Merge "Use static final debug fields." 2010-09-07 12:42:43 -07:00
Romain Guy
5429e1d102 Use static final debug fields. 
Change-Id: I304c39f54f609729bcec581091f285b2baa6fefa
 2010-09-07 12:39:45 -07:00
Dianne Hackborn
05dff83894 am 11bbe200: Hopefully fix the build. 
Merge commit '11bbe200cba150cfa5593bb87b54f3072a5ab2c5' into gingerbread-plus-aosp

* commit '11bbe200cba150cfa5593bb87b54f3072a5ab2c5':
  Hopefully fix the build.
 2010-09-07 12:36:33 -07:00
Adam Cohen
cf393c52f9 Merge "-> Implemented new visualization for StackView -> Cleaning up the method for creating the blue outline -> Reimplmented onMeasure for StackView and AdapterViewAnimator" 2010-09-07 12:32:45 -07:00
Dianne Hackborn
11bbe200cb Hopefully fix the build. 
Change-Id: Id8cd92c0895c9939e1386ef488bd1309a3be3568
 2010-09-07 12:32:19 -07:00
Alex Sakhartchouk
aa860df538 Merge "Fixing a3d files to reflect the new element structure." 2010-09-07 12:13:15 -07:00
Alex Sakhartchouk
65cb3bae15 Merge "Add arrays to elements." 2010-09-07 12:13:07 -07:00
Alex Sakhartchouk
db6f11bd30 Fixing a3d files to reflect the new element structure. 
Change-Id: I44d95c9411706813dde815c5f052f3615e8b483e
 2010-09-07 12:10:18 -07:00
Jason Sams
70d4e50242 Add arrays to elements. 
Change-Id: I624b03bfc1fd26136afd9305a96026b91b1fad3c
 2010-09-07 12:06:05 -07:00
Romain Guy
e04a3811f2 Merge "Temporarily disable fading edges if solidColor=0 and hw is on." 2010-09-07 12:02:38 -07:00