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

13484 Commits

Author SHA1 Message Date
Brad Fitzpatrick
0486f78ef3 am b1657b2b: resolved conflicts for merge of 64591009 to gingerbread-plus-aosp 
Merge commit 'b1657b2bd6aea0c22b48e2cdd25dcc57581a3f3d'

* commit 'b1657b2bd6aea0c22b48e2cdd25dcc57581a3f3d':
  Fix a race between requesting/loading/writing SharedPreferences.
 2010-09-07 22:10:41 -07:00
Wei-Ta Chen
8fc6f8b215 am 1b214be9: Merge "Revert "Rename LargeBitmap to BitmapRegionDecoder for having a better API."" into gingerbread 
Merge commit '1b214be92ac206d8ac6ef4967db6e2859d91ab49' into gingerbread-plus-aosp

* commit '1b214be92ac206d8ac6ef4967db6e2859d91ab49':
  Revert "Rename LargeBitmap to BitmapRegionDecoder for having a better API."
 2010-09-07 21:48:48 -07:00
Brad Fitzpatrick
b1657b2bd6 resolved conflicts for merge of 64591009 to gingerbread-plus-aosp 
Change-Id: Id9ebca9993f97a79cb2a6c41a7566d473ccc5b7e
 2010-09-07 21:41:09 -07:00
Adam Powell
2b6230e0de Reworking the ActionBar tab API 
Change-Id: Ifbcdc61b4a24633cc1a329c73923b95b03e9ecf0
 2010-09-07 21:02:12 -07:00
Neal Nguyen
6aec225010 Merge "Adding Download Manager Integration, stress, and hosts-based tests." into gingerbread 2010-09-07 20:55:22 -07:00
Wei-Ta Chen
1b214be92a Merge "Revert "Rename LargeBitmap to BitmapRegionDecoder for having a better API."" into gingerbread 2010-09-07 20:36:13 -07:00
Brad Fitzpatrick
6459100940 Merge "Fix a race between requesting/loading/writing SharedPreferences." into gingerbread 2010-09-07 20:06:26 -07:00
Wei-Ta Chen
340ce75b44 Revert "Rename LargeBitmap to BitmapRegionDecoder for having a better API." 
This reverts commit 50ba3d2c09a9131f3578d271adf2bc8258ca1742.
 2010-09-08 10:44:21 +08:00
Gilles Debunne
5c69544826 am cf86bc1d: am 883bbb72: Merge "Hide mCursorController field in ArrowKeyMovementMethod." into gingerbread 
Merge commit 'cf86bc1d92128455c06ed8b0a338e7b3145d11a7'

* commit 'cf86bc1d92128455c06ed8b0a338e7b3145d11a7':
  Hide mCursorController field in ArrowKeyMovementMethod.
 2010-09-07 19:05:18 -07:00
Gilles Debunne
cf86bc1d92 am 883bbb72: Merge "Hide mCursorController field in ArrowKeyMovementMethod." into gingerbread 
Merge commit '883bbb72284736b5601f9e96d1116969c51b75de' into gingerbread-plus-aosp

* commit '883bbb72284736b5601f9e96d1116969c51b75de':
  Hide mCursorController field in ArrowKeyMovementMethod.
 2010-09-07 18:59:22 -07:00
Gilles Debunne
2ae3718b44 am dbd25cdb: Made text selection work in ExtractEditText. DO NOT MERGE 
Merge commit 'dbd25cdbc3dcad573aaeaf493bc186006bce3d8e' into gingerbread-plus-aosp

* commit 'dbd25cdbc3dcad573aaeaf493bc186006bce3d8e':
  Made text selection work in ExtractEditText. DO NOT MERGE
 2010-09-07 18:59:10 -07:00
Gilles Debunne
883bbb7228 Merge "Hide mCursorController field in ArrowKeyMovementMethod." into gingerbread 2010-09-07 18:53:55 -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
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
Gilles Debunne
49271c941e Hide mCursorController field in ArrowKeyMovementMethod. 
Made the field private and added a description of its use.

Bug http://b/issue?id=2975284

Change-Id: Id8acf756218915cb2ae756789b62cfe7201a5c67
 2010-09-07 18:32:28 -07:00
Gilles Debunne
dbd25cdbc3 Made text selection work in ExtractEditText. DO NOT MERGE 
Change insertion point on tap is no longer handled by the CommitSelectionReceiver
(as it is not called by ExtractEditText).

Fixed a bug to handle drawing positions when the internal TextView scroller is used.

Change-Id: I87398c7109c5527d21dee6abbdb925848244d594
 2010-09-07 18:07:30 -07:00
Brad Fitzpatrick
6194c53754 Fix a race between requesting/loading/writing SharedPreferences. 
Part of the race existed before, but it was made much worse with
apply().

Corresponding CTS test is Icc6e638a6a

Change-Id: Ic5cfa467fb7f1859cb7b44d417412219c0621965
 2010-09-07 18:00:33 -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
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
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
Elliott Hughes
edf7223bc2 Remove dead code: NIOBuffer. 
Working on speeding up our NIO implementation, I came across this suboptimal
code. Happily, it turns out to be unused.

Bug: 2935622
Change-Id: I07ae6e573d63e439f496d55af215b34598d8258a
 2010-09-07 15:42:23 -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
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
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
Joe Onorato
1f6a21c237 Merge "Expose the TextAppearance.StatusBar.* styles." into gingerbread 2010-09-07 14:41:12 -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
Neal Nguyen
40ef0f49ea Adding Download Manager Integration, stress, and hosts-based tests. 
Change-Id: If75021380f4aee9c650f6e34093779e85cc4e5d8
 2010-09-07 14:27:16 -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
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
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
Romain Guy
e04a3811f2 Merge "Temporarily disable fading edges if solidColor=0 and hw is on." 2010-09-07 12:02:38 -07:00
Romain Guy
14cd0653e4 Temporarily disable fading edges if solidColor=0 and hw is on. 
Change-Id: I430d8d4d00cbabc99644b98ea832460339c196d8
 2010-09-07 12:01:38 -07:00
Michael Kolb
d9b447ca28 Merge "Add setting for on screen zoom buttons enables to use pinch to zoom without showing the on screen buttons" 2010-09-07 11:50:54 -07:00
Michael Kolb
6fe3b421fd Add setting for on screen zoom buttons 
enables to use pinch to zoom without
  showing the on screen buttons

Change-Id: Ifd08d11232e2a32178a89e559b6f1f645bf627b9
 2010-09-07 11:46:57 -07:00
Dianne Hackborn
b8bcfed552 am f703b77c: Merge "Add system property to turn off scheduling groups." into gingerbread 
Merge commit 'f703b77c96a6d133fda534158eaf6190ff7c87f7' into gingerbread-plus-aosp

* commit 'f703b77c96a6d133fda534158eaf6190ff7c87f7':
  Add system property to turn off scheduling groups.
 2010-09-07 11:30:08 -07:00