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

26673 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Mathias Agopian
0779682a49 am 78983a91: am 4055b780: Merge "move native services under services/" into gingerbread 
Merge commit '78983a9133d3dd3f08b1ec462a7e2f9e7bfa9e2f'

* commit '78983a9133d3dd3f08b1ec462a7e2f9e7bfa9e2f':
  move native services under services/
 2010-07-14 18:48:58 -07:00
Mathias Agopian
78983a9133 am 4055b780: Merge "move native services under services/" into gingerbread 
Merge commit '4055b780bb7e85abcf4754b84e50bf407c45bec8' into gingerbread-plus-aosp

* commit '4055b780bb7e85abcf4754b84e50bf407c45bec8':
  move native services under services/
 2010-07-14 18:45:56 -07:00
Mathias Agopian
4055b780bb Merge "move native services under services/" into gingerbread 2010-07-14 18:42:54 -07:00
Guang Zhu
607d117aa3 Merge "add a paramter to control page-load-termination-on-JS-error" 2010-07-14 18:15:46 -07:00
Mathias Agopian
08e83bb3b7 move native services under services/ 
moved surfaceflinger, audioflinger, cameraservice

all native services should now reside in this location.

Change-Id: Iee42b83dd2a94c3bf5107ab0895fe2dfcd5337a8
 2010-07-14 17:59:35 -07:00
Dianne Hackborn
592eff0ba5 am 0a48a1f3: am ed86eaa7: Merge "Argh oops I didn\'t mean to delete this." into gingerbread 
Merge commit '0a48a1f31dcfb152c166ff5621942c950f8cca72'

* commit '0a48a1f31dcfb152c166ff5621942c950f8cca72':
  Argh oops I didn't mean to delete this.
 2010-07-14 17:42:52 -07:00
Guang Zhu
5d53c19a10 add a paramter to control page-load-termination-on-JS-error 
A previous change terminates page load if there's certain JS errors;
the intention was to speed up layout tests such that page accessing
non-existent test controllers/methods will get immediate termination
instead of waiting on timeout. However this causes problem for page
cycler because it may interrupt the test run too early. Also there
was a bug on bracketing on the termination conditions (operator
precendence issue).

Change-Id: I2f19e48fa0061286fddf0f7cbb4953d7f7d88f76
 2010-07-14 17:26:02 -07:00
Jim Miller
839458d8d4 resolved conflicts for merge of e03952c0 to master 
Change-Id: I414d934101d452a2c2500e539f0b0aff1e1b3ff0
 2010-07-14 17:21:00 -07:00
Dianne Hackborn
71ecab2d89 Argh oops I didn't mean to delete this. 
Change-Id: I8910eb8b6e898b77ee6fc63420d6954b496513ca
 2010-07-14 17:09:47 -07:00
Dianne Hackborn
0a48a1f31d am ed86eaa7: Merge "Argh oops I didn\'t mean to delete this." into gingerbread 
Merge commit 'ed86eaa7301d5509bce38dffce3f8ef11e4e4cd0' into gingerbread-plus-aosp

* commit 'ed86eaa7301d5509bce38dffce3f8ef11e4e4cd0':
  Argh oops I didn't mean to delete this.
 2010-07-14 17:04:58 -07:00
Dianne Hackborn
ed86eaa730 Merge "Argh oops I didn't mean to delete this." into gingerbread 2010-07-14 17:02:49 -07:00
Jim Miller
e03952c042 am 9d42c7f7: Merge "Fix 2797185: Re-enable thumbnail generation in framework" into gingerbread 
Merge commit '9d42c7f75cfd7544d6e3f253cedf9ac983fdc6b2' into gingerbread-plus-aosp

* commit '9d42c7f75cfd7544d6e3f253cedf9ac983fdc6b2':
  Fix 2797185: Re-enable thumbnail generation in framework
 2010-07-14 17:02:36 -07:00
Jim Miller
9d42c7f75c Merge "Fix 2797185: Re-enable thumbnail generation in framework" into gingerbread 2010-07-14 16:59:52 -07:00
Dianne Hackborn
251fd430c7 Argh oops I didn't mean to delete this. 
Change-Id: I3d0877d56f1abab3d0929a086621f4ef1212cecc
 2010-07-14 16:56:31 -07:00
Dianne Hackborn
4b85590f8d am 7417ae93: am ccc77328: Merge "Remove old glue code." into gingerbread 
Merge commit '7417ae9354e10971c0b5d41dc9194fab17b80ea1'

* commit '7417ae9354e10971c0b5d41dc9194fab17b80ea1':
  Remove old glue code.
 2010-07-14 16:51:33 -07:00
Dianne Hackborn
7417ae9354 am ccc77328: Merge "Remove old glue code." into gingerbread 
Merge commit 'ccc77328da66436010f3bca000c4b4665270500a' into gingerbread-plus-aosp

* commit 'ccc77328da66436010f3bca000c4b4665270500a':
  Remove old glue code.
 2010-07-14 16:49:05 -07:00
Dianne Hackborn
ccc77328da Merge "Remove old glue code." into gingerbread 2010-07-14 16:46:37 -07:00
Mathias Agopian
764f436cb9 am db386f2c: am c9a11088: Merge "first step at implementing the native sensor support" into gingerbread 
Merge commit 'db386f2c263c6e9e4b825d4c9a320849f8f2c916'

* commit 'db386f2c263c6e9e4b825d4c9a320849f8f2c916':
  first step at implementing the native sensor support
 2010-07-14 16:39:55 -07:00
Mathias Agopian
172b79e9df am 98704f14: am 38eea8bf: Merge "Remove the YV16 format for simplicity\'s sake." into gingerbread 
Merge commit '98704f14eaeef6c9bcb73fea162f4941dd9bbd87'

* commit '98704f14eaeef6c9bcb73fea162f4941dd9bbd87':
  Remove the YV16 format for simplicity's sake.
 2010-07-14 16:39:42 -07:00
Adam Powell
0d60b96a8f Merge "Bug 2841148 - Add accessors for action bar context mode state." 2010-07-14 16:39:04 -07:00
Mathias Agopian
db386f2c26 am c9a11088: Merge "first step at implementing the native sensor support" into gingerbread 
Merge commit 'c9a11088e503b9e3ae52a3f671b2d21f5cd54f06' into gingerbread-plus-aosp

* commit 'c9a11088e503b9e3ae52a3f671b2d21f5cd54f06':
  first step at implementing the native sensor support
 2010-07-14 16:36:19 -07:00
Mathias Agopian
98704f14ea am 38eea8bf: Merge "Remove the YV16 format for simplicity\'s sake." into gingerbread 
Merge commit '38eea8bf990540360b45b963195a7766c30b55d2' into gingerbread-plus-aosp

* commit '38eea8bf990540360b45b963195a7766c30b55d2':
  Remove the YV16 format for simplicity's sake.
 2010-07-14 16:35:55 -07:00
Romain Guy
7ba6617a53 Merge "Do not apply transforms when using drawColor()." 2010-07-14 16:35:37 -07:00
Romain Guy
3d58c03de0 Do not apply transforms when using drawColor(). 
This fixes an issue in the way the clip transformations were applied.

Change-Id: I91e7b5d15baf244d1280e48938282bb33609081d
 2010-07-14 16:35:43 -07:00
Mathias Agopian
c9a11088e5 Merge "first step at implementing the native sensor support" into gingerbread 2010-07-14 16:32:04 -07:00
Mathias Agopian
38eea8bf99 Merge "Remove the YV16 format for simplicity's sake." into gingerbread 2010-07-14 16:30:41 -07:00
Adam Powell
29ed7575c2 Bug 2841148 - Add accessors for action bar context mode state. 
Change-Id: I04f3efce5a692b346756cc80c8d15f3abba10558
 2010-07-14 16:26:28 -07:00
The Android Open Source Project
a51eb0bb2f am 50576fa8: merge from open-source master 
Merge commit '50576fa8152557a25e1a231c66d694fffbab34d6'

* commit '50576fa8152557a25e1a231c66d694fffbab34d6':
  Start app with several activities with intent filter [Main, Launcher] was broken
 2010-07-14 16:14:06 -07:00
The Android Open Source Project
50576fa815 merge from open-source master 
Change-Id: I20cf00dba6908eeee12645e6878db7becdc2a5f9
 2010-07-14 16:11:13 -07:00
Konstantin Lopyrev
738afc5c1b am 975ecddc: am 6e0f65fd: Adding focus change notification 
Merge commit '975ecddc9e72b8217d36e653fb9deabb9fd5b859'

* commit '975ecddc9e72b8217d36e653fb9deabb9fd5b859':
  Adding focus change notification
 2010-07-14 16:07:47 -07:00
Konstantin Lopyrev
975ecddc9e am 6e0f65fd: Adding focus change notification 
Merge commit '6e0f65fd9c8bea91d9143f77a85b6d9c097fb3f1' into gingerbread-plus-aosp

* commit '6e0f65fd9c8bea91d9143f77a85b6d9c097fb3f1':
  Adding focus change notification
 2010-07-14 16:04:44 -07:00
Dianne Hackborn
1e86ce6ed2 Remove old glue code. 
Change-Id: Ic4a9c1f09d9bd4258d9766d546b0999b79997635
 2010-07-14 15:58:30 -07:00
Charles Chen
3f4c2cb8ac Merge "Adding the old legacy method for getTtsEngine for Froyo compatibility." 2010-07-14 15:37:50 -07:00
Konstantin Lopyrev
6e0f65fd9c Adding focus change notification 
Change-Id: I49709c97aaf63bcd44695d99c61dbbee228416f4
 2010-07-14 15:31:39 -07:00
Charles Chen
039a9ae320 Adding the old legacy method for getTtsEngine for Froyo compatibility. 
Change-Id: I1f29f1b670137daff0c153e9f7ecdb7bfb2b5ff6
 2010-07-14 15:21:56 -07:00
Mathias Agopian
058d0390a4 Remove the YV16 format for simplicity's sake. 
Change-Id: Iee03d100933ba0c67b13d51e0435be3b4cd953cf
 2010-07-14 15:12:05 -07:00
Adam Powell
1f5dddc85c Merge "Fix bug 2835056 - ActionBar doesn't update title properly when set in onCreate" 2010-07-14 14:51:12 -07:00
Adam Powell
e92ea3474d Fix bug 2835056 - ActionBar doesn't update title properly when set in onCreate 
Change-Id: I593315db8df0190c2702a87ebef293e5f798823d
 2010-07-14 14:46:37 -07:00
Adam Powell
92db56f78c Merge "Fix bug 2838426 - timing issue with starting/finishing action bar context modes" 2010-07-14 14:25:48 -07:00
Mike Lockwood
e31135a05e Merge "MtpDatabase: Implement getObjectProperty" 2010-07-14 12:44:41 -07:00
Mike Lockwood
b2cada9034 MtpDatabase: Implement getObjectProperty 
Change-Id: Iab5f2c0e0b2b3effa3eaa3cb18415d28db5c790a
Signed-off-by: Mike Lockwood <lockwood@android.com>
 2010-07-14 15:44:06 -04:00
The Android Open Source Project
a2d423a40f am d7da5164: merge from open-source master 
Merge commit 'd7da5164ba7744992fbc893c1c812614b0d57d8c'

* commit 'd7da5164ba7744992fbc893c1c812614b0d57d8c':
  Telephony: Process MT SMS with MTI set to 3
 2010-07-14 12:23:12 -07:00
The Android Open Source Project
d7da5164ba merge from open-source master 
Change-Id: I0bbbd7f9b6f84e1682793e239997838c24d17244
 2010-07-14 12:18:01 -07:00
Dianne Hackborn
72c9265ac5 Merge "Fix fragment index expunging." 2010-07-14 12:17:24 -07:00
Dianne Hackborn
9e14e9f33a Fix fragment index expunging. 
Change-Id: If37e58dfa998575530305584d3aa756bb5a61d7b
 2010-07-14 12:14:24 -07:00
Adam Powell
3461b32a1c Fix bug 2838426 - timing issue with starting/finishing action bar context modes 
Change-Id: Ie29b0bea96be02675a2104f07c912700c2823abc
 2010-07-14 11:35:47 -07:00
Steve Howard
756088482f am 57de95a5: am 05940b2c: Merge "Download manager support for file URIs + last modified time" into gingerbread 
Merge commit '57de95a51ff5d98fcad0a7735c496be5f647d66f'

* commit '57de95a51ff5d98fcad0a7735c496be5f647d66f':
  Download manager support for file URIs + last modified time
 2010-07-14 11:25:32 -07:00
Steve Howard
57de95a51f am 05940b2c: Merge "Download manager support for file URIs + last modified time" into gingerbread 
Merge commit '05940b2c04041d6b3b8d222f4acfd12faeeb6c9c' into gingerbread-plus-aosp

* commit '05940b2c04041d6b3b8d222f4acfd12faeeb6c9c':
  Download manager support for file URIs + last modified time
 2010-07-14 11:22:20 -07:00
Steve Howard
05940b2c04 Merge "Download manager support for file URIs + last modified time" into gingerbread 2010-07-14 11:19:38 -07:00
Jean-Michel Trivi
0224a00421 am 5473434f: am 97eb728a: Use the OpenSL ES definition of SL_IID_EQUALIZER for the EQ effect UUID instead of defining it locally. 
Merge commit '5473434f060d8c036a30a1992b036a2f70da265d'

* commit '5473434f060d8c036a30a1992b036a2f70da265d':
  Use the OpenSL ES definition of SL_IID_EQUALIZER for the EQ
 2010-07-14 11:15:31 -07:00