Commit Graph

1177 Commits

Author SHA1 Message Date
Jack Palevich
6cbca50b6a Clean up trivial Eclipse warnings and fix whitespace.
Added @Override to overridden methods.
Removed unused imports.
Converted tabs to spaces.
Removed \r characters from end-of-lines.
Add .gitignore file to ignore the .class files that are
generated when the "gen" script is run.
2009-04-13 16:40:25 -07:00
Yu Shan Emily Lau
a7fa858d50 Merge branch 'readonly-p4-donut' into donut 2009-04-13 16:09:27 -07:00
Dan Bornstein
c5273b8731 Merge branch 'readonly-p4-donut' into donut 2009-04-13 16:06:39 -07:00
Brett Chabot
edf53b615c Merge branch 'readonly-p4-donut' into donut 2009-04-13 16:03:16 -07:00
Android (Google) Code Review
08be29fb3e Merge change 65 into donut
* changes:
  Remove references to android.util.Config
2009-04-13 14:13:14 -07:00
Android (Google) Code Review
b3d1c948df Merge change 64 into donut
* changes:
  Remove references to android.util.Config
2009-04-13 14:13:00 -07:00
Android (Google) Code Review
81d108cc38 Merge change 63 into donut
* changes:
  Remove references to android.util.Config
2009-04-13 14:12:27 -07:00
Lorenzo Colitti
df92bfc072 Merge branch 'readonly-p4-donut' into donut 2009-04-13 13:54:13 -07:00
Jeffrey Sharkey
7940d198ee Merge branch 'readonly-p4-donut' into donut 2009-04-13 08:56:31 -07:00
Dianne Hackborn
fb7cab7f63 Merge branch 'readonly-p4-donut' into donut 2009-04-13 08:53:57 -07:00
Dirk Dougherty
b4f65ceb2b Merge branch 'readonly-p4-donut' into donut 2009-04-13 08:51:20 -07:00
Andy Stadler
0be4690849 Merge branch 'readonly-p4-donut' into donut 2009-04-10 16:26:11 -07:00
Andy Stadler
bc0caf802e AI 145778: Manual merge changes 145382-145384 from cupcake.
Automated import of CL 145778
2009-04-10 16:24:47 -07:00
Jack Palevich
1fc1d60798 Merge branch 'readonly-p4-donut' into donut 2009-04-09 18:47:55 -07:00
Jack Palevich
e3b21c013d Merge branch 'readonly-p4-donut' into donut 2009-04-09 18:04:34 -07:00
Android (Google) Code Review
bb26e32154 Merge change 67 into donut
* changes:
  Integrate new power connnect/disconnect broadcasts
2009-04-09 16:21:51 -07:00
Jack Palevich
6684173667 Merge branch 'readonly-p4-donut' into donut 2009-04-09 15:01:54 -07:00
Jack Palevich
4f60b17331 Merge branch 'readonly-p4-donut' into donut 2009-04-09 14:52:42 -07:00
Eric Fischer
0448391039 Merge branch 'readonly-p4-donut' into donut 2009-04-09 14:33:58 -07:00
Dianne Hackborn
490b2ba510 AI 145382: API review: change new media keycode names to avoid ambiguity.
Updates the key maps.  During this I noticed that the dream keymap didn't have all of the media buttons like the sapphire key map...!  So this is now changed to match.
  BUG=1779435

Automated import of CL 145382
2009-04-09 12:31:13 -07:00
Nick Pelly
4fea662b0f Merge branch 'readonly-p4-donut' into donut 2009-04-08 15:10:29 -07:00
Romain Guy
885d9a3fce Merge branch 'readonly-p4-donut' into donut 2009-04-08 14:23:53 -07:00
Android (Google) Code Review
ad632d282b Merge change 38 into donut
* changes:
  Fix issue #1769910 (Track activity launch times)
2009-04-08 13:42:34 -07:00
Cynthia Wong
b5ded5f81b Merge branch 'readonly-p4-donut' into donut 2009-04-07 17:25:27 -07:00
Android (Google) Code Review
24870c82c9 Merge change 37 into donut
* changes:
  Preserve an Activity's setIntent() state across relaunches
2009-04-07 16:54:26 -07:00
Jack Palevich
c893868227 AI 144282: Tweak this tool to work with the current directory structure.
Also leave the "generated" directory around if it contains files that
  need to be checked in.

Automated import of CL 144282
2009-04-02 13:38:26 -07:00
Nick Pelly
819aa237a5 AI 144151: am: CL 144150 Fix heap corruption.
Take mutex in close(), and skip write path after turning bluetooth off.
  Original author: npelly
  Merged from: //branches/cupcake/...

Automated import of CL 144151
2009-04-02 01:21:13 -07:00
Nick Pelly
cb5883ecc5 AI 144150: Fix heap corruption.
Take mutex in close(), and skip write path after turning bluetooth off.
  BUG=1751710

Automated import of CL 144150
2009-04-01 16:40:01 -07:00
Eric Laurent
34c594bde9 AI 143775: am: CL 143620 Attempt for fixing crash in AudioFlinger::MixerThread::dumpTracks() seen in bug report for issue 1747119.
AudioFlinger::MixerThread::dumpTracks() was reading mTracks[] vector instead of mActiveTracks[] when dumping active tracks.
  Original author: elaurent
  Merged from: //branches/cupcake/...

Automated import of CL 143775
2009-03-31 14:33:34 -07:00
Eric Laurent
3c52588ca9 AI 143620: Attempt for fixing crash in AudioFlinger::MixerThread::dumpTracks() seen in bug report for issue 1747119.
AudioFlinger::MixerThread::dumpTracks() was reading mTracks[] vector instead of mActiveTracks[] when dumping active tracks.
  BUG=1747119

Automated import of CL 143620
2009-03-31 09:38:57 -07:00
Eric Laurent
cbcb00eb73 AI 143177: am: CL 142889 Fix issue #1736153 Camera shutter sound can be muted by new AlarmClock setting.
Current implementation of Camera service plays the camera shutter sound over the ALARM stream so that it cannot be muted by silent mode in order to comply to some country specific requirement. A recent change made it possible for the user to mute the ALARM stream thus making this stream not suitable any more for the camera shutter sound.
  The fix consists in creating a new stream type only accessible by native code and that cannot be muted and use it to play camera sounds.
  Original author: elaurent
  Merged from: //branches/cupcake/...

Automated import of CL 143177
2009-03-27 16:27:16 -07:00
Mathias Agopian
816c5e2314 AI 143172: am: CL 142875 [1732012] for some reason these files didn't go through in the preview check-in.
Original author: mathias
  Merged from: //branches/cupcake/...

Automated import of CL 143172
2009-03-27 16:13:24 -07:00
Mathias Agopian
24fd77d440 AI 143171: am: CL 142873 fix [1732012] Only show screen rotation animation when triggered by sensor
Original author: mathias
  Merged from: //branches/cupcake/...

Automated import of CL 143171
2009-03-27 16:10:37 -07:00
Mathias Agopian
ecbeaa0cf1 AI 143160: am: CL 142856 new-new-new-new rotation animation. it may still change one more time.
Original author: mathias
  Merged from: //branches/cupcake/...

Automated import of CL 143160
2009-03-27 15:36:09 -07:00
Eric Laurent
b1596ee235 Automated import from //branches/cupcake/...@142889,142889 2009-03-26 01:57:59 -07:00
Mathias Agopian
192f79fe71 Automated import from //branches/cupcake/...@142875,142875 2009-03-25 23:26:39 -07:00
Mathias Agopian
ceff6e1874 Automated import from //branches/cupcake/...@142873,142873 2009-03-25 23:18:56 -07:00
Mathias Agopian
262453cecb Automated import from //branches/cupcake/...@142856,142856 2009-03-25 21:42:35 -07:00
Dianne Hackborn
c1992a6f75 Automated import from //branches/donutburger/...@142727,142727 2009-03-25 17:24:35 -07:00
Dianne Hackborn
11d93f968c Automated import from //branches/cupcake/...@142663,142663 2009-03-25 15:32:28 -07:00
Jack Palevich
87d80228cc Automated import from //branches/donutburger/...@142484,142484 2009-03-24 22:48:26 -07:00
Mathias Agopian
74c770be33 Automated import from //branches/donutburger/...@142446,142446 2009-03-24 22:43:22 -07:00
Mathias Agopian
6219dd7d3a Automated import from //branches/donutburger/...@142430,142430 2009-03-24 22:42:15 -07:00
Andy McFadden
4442661817 Automated import from //branches/donutburger/...@141992,141992 2009-03-24 21:16:04 -07:00
Niko Catania
c8f10f8374 Automated import from //branches/donutburger/...@141782,141782 2009-03-24 20:53:55 -07:00
Andreas Huber
a26e6060f3 Automated import from //branches/donutburger/...@141711,141711 2009-03-24 20:47:19 -07:00
Wu-cheng Li
aab44b8cca Automated import from //branches/donutburger/...@141614,141614 2009-03-24 20:39:09 -07:00
Jason Sams
9e431ace32 Automated import from //branches/donutburger/...@141598,141598 2009-03-24 20:36:57 -07:00
Mathias Agopian
3df5e433a2 Automated import from //branches/donutburger/...@141502,141502 2009-03-24 20:25:29 -07:00
Jason Sams
78b877e7e6 Automated import from //branches/donutburger/...@141469,141469 2009-03-24 20:21:36 -07:00