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

27683 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Gilles Debunne
b0dde8e9b5 Move pngs from drawable to drawable-mdpi in project frameworks/base 
After error during file transfer...

Change-Id: I21da694f81a4290e9af1f7647a8ceb6c6d3d806b
 2010-08-02 15:21:27 -07:00
Mike Lockwood
2b51f47a4c Merge changes Iccc3a445,I82ce80a4 
* changes:
  MTP: Implement GetNumObjects
  Clean up MtpDatabase API.
 2010-08-02 08:38:02 -07:00
Maksymilian Osowski
13ee57e89e Merge "Time-out mechanism and state machine." 2010-08-02 08:24:11 -07:00
Maksymilian Osowski
42bee9cf76 Time-out mechanism and state machine. 
Change-Id: I47c4342c02ea152b1503b9d5268900df3b40683c
 2010-08-02 16:22:28 +01:00
Brad Fitzpatrick
8b13ed701b am 4edd80db: am ee34a49f: Add missing word from docs. 
Merge commit '4edd80db956a6a3fc1142371d098ad2abd06ac9c'

* commit '4edd80db956a6a3fc1142371d098ad2abd06ac9c':
  Add missing word from docs.
 2010-08-02 08:09:07 -07:00
Brad Fitzpatrick
4edd80db95 am ee34a49f: Add missing word from docs. 
Merge commit 'ee34a49ffc92590cb59f3e17a3df136b67701529' into gingerbread-plus-aosp

* commit 'ee34a49ffc92590cb59f3e17a3df136b67701529':
  Add missing word from docs.
 2010-08-02 08:02:05 -07:00
Brad Fitzpatrick
ee34a49ffc Add missing word from docs. 
My mistaker from an earlier commit.

Change-Id: Ic04b3c411da32f7dca03d23d39182915e3567172
 2010-08-02 07:54:18 -07:00
Mike Lockwood
7a047c8986 MTP: Implement GetNumObjects 
Change-Id: Iccc3a445f9a1eab7bb76eddd567c6a3a8f155b2b
Signed-off-by: Mike Lockwood <lockwood@android.com>
 2010-08-02 10:52:20 -04:00
Mike Lockwood
59c777a24a Clean up MtpDatabase API. 
Return MTP response codes instead of booleans for success or failure.
Remove some unused code.

Change-Id: I82ce80a4d7779233264e3caf139ebd0cece12f5c
Signed-off-by: Mike Lockwood <lockwood@android.com>
 2010-08-02 10:37:41 -04:00
Dianne Hackborn
37b4a3c2f2 am f4e145fd: am 543f250d: Merge "Make the systemui process persistent." into gingerbread 
Merge commit 'f4e145fd123a6941348e16a595107b155bd880e8'

* commit 'f4e145fd123a6941348e16a595107b155bd880e8':
  Make the systemui process persistent.
 2010-07-31 12:19:39 -07:00
Mathias Agopian
5688ac84bd am 67e4ff76: am 4d7fc365: Merge "remove copybit hack from software opengl (libagl)" into gingerbread 
Merge commit '67e4ff768d71088a64fbac3b8e398e2e16dd84ec'

* commit '67e4ff768d71088a64fbac3b8e398e2e16dd84ec':
  remove copybit hack from software opengl (libagl)
 2010-07-31 12:19:26 -07:00
Dirk Dougherty
cb2d4c2771 am bd502940: am 483b20e5: am 2ff1ba01: Doc change: Cleanup for licensing doc. 
Merge commit 'bd5029403e0f9d93086604df6dbb1b989e58e964'

* commit 'bd5029403e0f9d93086604df6dbb1b989e58e964':
  Doc change: Cleanup for licensing doc.
 2010-07-31 12:19:18 -07:00
Romain Guy
eb4e0c3c1c Merge "Refactor Skia shaders handling." 2010-07-30 19:20:09 -07:00
Romain Guy
06f96e2652 Refactor Skia shaders handling. 
With this change, Skia shaders can easily be applied to any mesh. This change also
supports ComposeShader. For instance, this can be used to blend a gradient and a
bitmap togehter and paint a string of text with the result.

Change-Id: I701c2f9cf7f89b2ff58005e8a1d0d80ccf4a4aea
 2010-07-30 19:18:16 -07:00
Dianne Hackborn
f4e145fd12 am 543f250d: Merge "Make the systemui process persistent." into gingerbread 
Merge commit '543f250d9cb05ebca4fb4dacce37545c0bb9a8ca' into gingerbread-plus-aosp

* commit '543f250d9cb05ebca4fb4dacce37545c0bb9a8ca':
  Make the systemui process persistent.
 2010-07-30 19:12:50 -07:00
Dianne Hackborn
543f250d9c Merge "Make the systemui process persistent." into gingerbread 2010-07-30 19:10:01 -07:00
Daniel Sandler
e2e5e6746b Merge "Fix Proguard flags causing crash in system bar." 2010-07-30 19:02:57 -07:00
Daniel Sandler
aee242d3ec Fix Proguard flags causing crash in system bar. 
Bug: 2869888
Change-Id: I32198676732a1f272b12154d87d7917f354bb91c
 2010-07-30 22:01:34 -04:00
Mathias Agopian
67e4ff768d am 4d7fc365: Merge "remove copybit hack from software opengl (libagl)" into gingerbread 
Merge commit '4d7fc3651bd93d588d2b8580010414b59bc67729' into gingerbread-plus-aosp

* commit '4d7fc3651bd93d588d2b8580010414b59bc67729':
  remove copybit hack from software opengl (libagl)
 2010-07-30 18:03:17 -07:00
Mathias Agopian
4d7fc3651b Merge "remove copybit hack from software opengl (libagl)" into gingerbread 2010-07-30 18:01:25 -07:00
Nipun Kwatra
51c2ec2411 Adding getSupportedPictureSizes which returns a Vector of supported Sizes. 
Also added a struct 'Size' containing a width and a height field.
Modified parse_size to optionally set an end pointer pointing to the
character after the found size.

Change-Id: I51a56bbf2cb7c91d7b80a28e6bd6a559f40a1333
 2010-07-30 17:51:59 -07:00
Dirk Dougherty
bd5029403e am 483b20e5: am 2ff1ba01: Doc change: Cleanup for licensing doc. 
Merge commit '483b20e5ae65495d841de1844d97d79fbc0c1866' into gingerbread-plus-aosp

* commit '483b20e5ae65495d841de1844d97d79fbc0c1866':
  Doc change: Cleanup for licensing doc.
 2010-07-30 17:40:28 -07:00
Dirk Dougherty
483b20e5ae am 2ff1ba01: Doc change: Cleanup for licensing doc. 
Merge commit '2ff1ba012c59169c9719cfab4516b9149414380b' into gingerbread

* commit '2ff1ba012c59169c9719cfab4516b9149414380b':
  Doc change: Cleanup for licensing doc.
 2010-07-30 17:37:39 -07:00
Dianne Hackborn
26755a347c Make the systemui process persistent. 
This ensures that the system won't kill it for memory,
the user can't stop services inside of it, etc.

Change-Id: I923c376afa1133bccc000253f5bba851f9119a52
 2010-07-30 17:24:38 -07:00
Adam Powell
26fda2340a Merge "Add action mode decor to layout.screen_simple" 2010-07-30 17:14:52 -07:00
Chet Haase
4de823a759 Merge "Fix problems with moving Views around (invalidation, conflict with layout)" 2010-07-30 17:14:29 -07:00
Kenny Root
98b557de31 am 9117669c: am 8b61b68b: Merge "Only install after MCS success" into gingerbread 
Merge commit '9117669c7de41799535dfa88e5d68a30d7674733'

* commit '9117669c7de41799535dfa88e5d68a30d7674733':
  Only install after MCS success
 2010-07-30 17:03:51 -07:00
Kenny Root
9117669c7d am 8b61b68b: Merge "Only install after MCS success" into gingerbread 
Merge commit '8b61b68b648985df37197de204398f608c4ad8b1' into gingerbread-plus-aosp

* commit '8b61b68b648985df37197de204398f608c4ad8b1':
  Only install after MCS success
 2010-07-30 17:00:01 -07:00
Kenny Root
8b61b68b64 Merge "Only install after MCS success" into gingerbread 2010-07-30 16:55:37 -07:00
Kenny Root
6f89fa07b4 Only install after MCS success 
If MCS dies in the middle of a call during install, only proceed if the
call was successful. Otherwise wait for the max retries to be reached
and run the failure handling code there.

Change-Id: I00a27ea91046ea6521a3cff5e5ffe2c71b2b5bb4
 2010-07-30 16:35:04 -07:00
Tadashi G. Takaoka
c8f5e43719 Merge "Fix KeyboardView's verticalCorrection handling" 2010-07-30 16:34:06 -07:00
Tadashi G. Takaoka
0972d071cd Fix KeyboardView's verticalCorrection handling 
Do not correct the touch point if it is within the range of
verticalCorrection from the top of KeyboardView, so that the touch
point will not have negative y-axis value.

Bug: 2659128

Change-Id: I91a3e65fc5dee1383dbbfb45690e307fc0adc1d1
 2010-07-30 16:08:47 -07:00
Dirk Dougherty
2ff1ba012c Doc change: Cleanup for licensing doc. 
Change-Id: Iff046768d70adf0489f5241212061045cef2572f
 2010-07-30 16:00:18 -07:00
Brad Fitzpatrick
86dde2d64c am e2d33bbc: am d2165cfc: Merge "StrictMode: time violations in Binder calls" into gingerbread 
Merge commit 'e2d33bbc496192d49c1e48baad446d8d0720d301'

* commit 'e2d33bbc496192d49c1e48baad446d8d0720d301':
  StrictMode: time violations in Binder calls
 2010-07-30 15:27:56 -07:00
Brad Fitzpatrick
e2d33bbc49 am d2165cfc: Merge "StrictMode: time violations in Binder calls" into gingerbread 
Merge commit 'd2165cfce7911dac66d1195ed9123e79b086d22b' into gingerbread-plus-aosp

* commit 'd2165cfce7911dac66d1195ed9123e79b086d22b':
  StrictMode: time violations in Binder calls
 2010-07-30 15:23:19 -07:00
Brad Fitzpatrick
d2165cfce7 Merge "StrictMode: time violations in Binder calls" into gingerbread 2010-07-30 15:20:28 -07:00
Adam Powell
b8863d96ef Add action mode decor to layout.screen_simple 
Change-Id: I30ae9bcd484b33a4f64de94f82cc302189e50b9a
 2010-07-30 15:10:33 -07:00
Chet Haase
8fbf8d2b08 Fix problems with moving Views around (invalidation, conflict with layout) 
Change-Id: I38f8f8a4e8082854a53a2975da258b5d946ed525
 2010-07-30 15:01:32 -07:00
James Dong
e1c5dae372 am 7600f934: am f0aa24d9: Merge "Added damr box for AMR (NB and WB) sample entry" into gingerbread 
Merge commit '7600f934015cff4d678b0f4e8df0eb93749be7bb'

* commit '7600f934015cff4d678b0f4e8df0eb93749be7bb':
  Added damr box for AMR (NB and WB) sample entry
 2010-07-30 14:54:26 -07:00
Jeff Brown
bc6ed6c9f6 am 3b724c83: am 00e5c613: Merge "Improve thread safety of input mappers." into gingerbread 
Merge commit '3b724c836b13b320b2b2c492c28660617e0d503e'

* commit '3b724c836b13b320b2b2c492c28660617e0d503e':
  Improve thread safety of input mappers.
 2010-07-30 14:52:12 -07:00
James Dong
7600f93401 am f0aa24d9: Merge "Added damr box for AMR (NB and WB) sample entry" into gingerbread 
Merge commit 'f0aa24d91d23195f811e317c4cc4ddbe06db8974' into gingerbread-plus-aosp

* commit 'f0aa24d91d23195f811e317c4cc4ddbe06db8974':
  Added damr box for AMR (NB and WB) sample entry
 2010-07-30 14:52:05 -07:00
Jeff Brown
3b724c836b am 00e5c613: Merge "Improve thread safety of input mappers." into gingerbread 
Merge commit '00e5c61366d3d3d62c259277823ea15a14f68ad4' into gingerbread-plus-aosp

* commit '00e5c61366d3d3d62c259277823ea15a14f68ad4':
  Improve thread safety of input mappers.
 2010-07-30 14:49:43 -07:00
James Dong
f0aa24d91d Merge "Added damr box for AMR (NB and WB) sample entry" into gingerbread 2010-07-30 14:49:23 -07:00
Jeff Brown
00e5c61366 Merge "Improve thread safety of input mappers." into gingerbread 2010-07-30 14:48:25 -07:00
Jeff Brown
6328cdc89e Improve thread safety of input mappers. 
Also fixed bug where old touch screen size could be reported by
getMotionRange if an orientation change occurred but the user has not
yet touched the screen.

Bug: 2877345
Change-Id: I7878f47458f310ed6ebe6a5d1b2c9bec2c598ab9
 2010-07-30 14:43:58 -07:00
James Dong
aea75231a5 am e915b0ef: am d973a533: Merge "Lower the lower bound for max file duration check" into gingerbread 
Merge commit 'e915b0ef5d574022dfeffc9b2b61e21c1433c89c'

* commit 'e915b0ef5d574022dfeffc9b2b61e21c1433c89c':
  Lower the lower bound for max file duration check
 2010-07-30 14:33:05 -07:00
James Dong
e915b0ef5d am d973a533: Merge "Lower the lower bound for max file duration check" into gingerbread 
Merge commit 'd973a533da16a1fbf13aa1b58ddf60d7d7c9b4ec' into gingerbread-plus-aosp

* commit 'd973a533da16a1fbf13aa1b58ddf60d7d7c9b4ec':
  Lower the lower bound for max file duration check
 2010-07-30 14:30:31 -07:00
Brad Fitzpatrick
cb9ceb1029 StrictMode: time violations in Binder calls 
Change-Id: I5796993dce98be722cf679b78acaf0c9de0ba461
 2010-07-30 14:28:55 -07:00
James Dong
d973a533da Merge "Lower the lower bound for max file duration check" into gingerbread 2010-07-30 14:28:26 -07:00
James Dong
c80218a966 Added damr box for AMR (NB and WB) sample entry 
- Some players, like QT, sometimes are picky about the missing sample entry

Change-Id: Ia32d78e48ac9fd8af8285dbc67f0d69142ba98b4
 2010-07-30 13:55:18 -07:00