Commit Graph

21057 Commits

Author SHA1 Message Date
Dmitry Shmidt
77b534aab2 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
f0b9cf3d6a Merge "Rename SETSUSPEND to SETSUSPENDOPT DO NOT MERGE" into gingerbread 2010-09-07 17:29:45 -07:00
Romain Guy
67a565f00c Merge "Correctly set the viewport on window resize." 2010-09-07 17:17:12 -07:00
Wei-Ta Chen
3aa370e3cd 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
4211ee8c3b Merge "Rename LargeBitmap to BitmapRegionDecoder for having a better API." into gingerbread 2010-09-07 17:01:57 -07:00
Dianne Hackborn
d1b5f0c4ae 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
9556ef4f84 Merge "Modify native ALooper to take an explicit ident." into gingerbread 2010-09-07 16:32:48 -07:00
Makoto Onuki
b1af18cd4c Merge "Add getApplicationContext to the mock implementation." 2010-09-07 15:59:07 -07:00
Dianne Hackborn
45e0acb41a 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
1e947e3650 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
dc3f166282 Merge "Allow installd to handle large partitions" into gingerbread 2010-09-07 15:38:31 -07:00
Makoto Onuki
c418d7e43d 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
f5ac5f1636 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
1cce37b477 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
3d2bca9abd 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
02d2d4ecd2 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
668c7150aa 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
6334b1860b Merge "Be brief." into gingerbread 2010-09-07 14:41:36 -07:00
Joe Onorato
df67235b0f Merge "Expose the TextAppearance.StatusBar.* styles." into gingerbread 2010-09-07 14:41:12 -07:00
Makoto Onuki
452fc5bbc3 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
32d9abcdc1 Merge "Don't fall through from TOKEN_EMAIL_LOOKUP" into gingerbread 2010-09-07 14:31:34 -07:00
Andreas Huber
bc5fd12317 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
2323b0e502 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
Dianne Hackborn
dd5572047a Merge "Fixes to battery stats debug output." into gingerbread 2010-09-07 14:10:38 -07:00
Vasu Nori
cb312ddcbf Merge "android change to handle Change-Id: Idbeed81b5b7349059e467b33a8641abf0b4aaeff" 2010-09-07 13:23:28 -07:00
Romain Guy
65d0f993e7 Merge "Use static final debug fields." 2010-09-07 12:42:43 -07:00
Dianne Hackborn
d8f1a656cb 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
2ecba081ad 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
bb39b9f17b Hopefully fix the build.
Change-Id: Id8cd92c0895c9939e1386ef488bd1309a3be3568
2010-09-07 12:32:19 -07:00
Alex Sakhartchouk
89bd68a25e Merge "Fixing a3d files to reflect the new element structure." 2010-09-07 12:13:15 -07:00
Alex Sakhartchouk
6ff7dcfdd9 Merge "Add arrays to elements." 2010-09-07 12:13:07 -07:00
Romain Guy
69dff4c449 Merge "Temporarily disable fading edges if solidColor=0 and hw is on." 2010-09-07 12:02:38 -07:00
Joe Onorato
bd526c7ba5 Merge "resolved conflicts for merge of 07990cf2 to master" 2010-09-07 11:54:27 -07:00
Joe Onorato
ce80df4a83 resolved conflicts for merge of 07990cf2 to master
Change-Id: I62cc2d14820e4cbe80ea433caf323be2df1fb9a8
2010-09-07 14:53:46 -04:00
Michael Kolb
3af86a6f62 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
Dianne Hackborn
c21e0e2d0c 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
Dianne Hackborn
bd89ff87d2 Merge "Add system property to turn off scheduling groups." into gingerbread 2010-09-07 11:27:26 -07:00
Dianne Hackborn
7b0d45c346 Add system property to turn off scheduling groups.
Do this:

adb shell setprop debug.sys.noschedgroups 1

Change-Id: I6e06a74205fd45ee1526ce71fe33944465d39984
2010-09-07 11:19:11 -07:00
Joe Onorato
b03f95294f am 1f689f7e: Merge "When notifications are updated, don\'t re-show the ticker unless the text has changed." into gingerbread
Merge commit '1f689f7e35464b1ccd3ce3307b6d92283ee1290d' into gingerbread-plus-aosp

* commit '1f689f7e35464b1ccd3ce3307b6d92283ee1290d':
  When notifications are updated, don't re-show the ticker unless the text has changed.
2010-09-07 11:18:46 -07:00
Brad Fitzpatrick
4a633d5817 am c19c9e4e: am b1104b37: Merge "Make SharedPreferencesBackupHelper wait for async SharedPreference writes" into gingerbread
Merge commit 'c19c9e4ee20512ba29e6e54aee06aa16413901f1'

* commit 'c19c9e4ee20512ba29e6e54aee06aa16413901f1':
  Make SharedPreferencesBackupHelper wait for async SharedPreference writes
2010-09-07 11:18:39 -07:00
Brad Fitzpatrick
6c59532b39 am b1104b37: Merge "Make SharedPreferencesBackupHelper wait for async SharedPreference writes" into gingerbread
Merge commit 'b1104b3713febb75164938a465c3022e1879245f' into gingerbread-plus-aosp

* commit 'b1104b3713febb75164938a465c3022e1879245f':
  Make SharedPreferencesBackupHelper wait for async SharedPreference writes
2010-09-07 11:15:01 -07:00
Joe Onorato
5ad6c91cef Merge "When notifications are updated, don't re-show the ticker unless the text has changed." into gingerbread 2010-09-07 11:14:56 -07:00
Eric Fischer
5d9765c93d am aab73757: (-s ours) am 745e751b: Merge "Preserve old translations for changed strings. DO NOT MERGE" into gingerbread
Merge commit 'aab7375799e76ec2e429fbd8224d0c6e8cc96463'

* commit 'aab7375799e76ec2e429fbd8224d0c6e8cc96463':
  Preserve old translations for changed strings.  DO NOT MERGE
2010-09-07 11:14:28 -07:00
Brad Fitzpatrick
df9177bc18 Merge "Make SharedPreferencesBackupHelper wait for async SharedPreference writes" into gingerbread 2010-09-07 11:12:51 -07:00
Eric Fischer
ff154165d7 am 745e751b: Merge "Preserve old translations for changed strings. DO NOT MERGE" into gingerbread
Merge commit '745e751b251baa38e94dfce1fe264574d0204cc2' into gingerbread-plus-aosp

* commit '745e751b251baa38e94dfce1fe264574d0204cc2':
  Preserve old translations for changed strings.  DO NOT MERGE
2010-09-07 11:08:19 -07:00
Eric Fischer
5987f041e5 Merge "Preserve old translations for changed strings. DO NOT MERGE" into gingerbread 2010-09-07 11:03:26 -07:00
Steve Block
0354109ac2 Merge "Adds a test case for WebAddress where the path component does not have a leading slash" 2010-09-07 10:59:18 -07:00
Kenny Root
afb22d0a54 am f17bd19a: am 2cb3e836: Merge "Use new nativeLibraryPath field for NativeActivity" into gingerbread
Merge commit 'f17bd19acbb88429b50a1497bfec0752b456d5c6'

* commit 'f17bd19acbb88429b50a1497bfec0752b456d5c6':
  Use new nativeLibraryPath field for NativeActivity
2010-09-07 10:52:13 -07:00
Kenny Root
391e3cefd1 am 2cb3e836: Merge "Use new nativeLibraryPath field for NativeActivity" into gingerbread
Merge commit '2cb3e83654c99e202c170d9d0237d8d1f4054354' into gingerbread-plus-aosp

* commit '2cb3e83654c99e202c170d9d0237d8d1f4054354':
  Use new nativeLibraryPath field for NativeActivity
2010-09-07 10:49:22 -07:00
Kenny Root
a25be22632 Merge "Use new nativeLibraryPath field for NativeActivity" into gingerbread 2010-09-07 10:46:14 -07:00