Commit Graph

1265 Commits

Author SHA1 Message Date
Mathias Agopian
f909cb6c69 remove some spurious debuging LOGD 2009-06-03 18:30:22 -07:00
Mathias Agopian
acdebe352d fix/clean these Android.mk following dbort and joeo's comments 2009-06-03 18:26:58 -07:00
Mathias Agopian
e92c713cb6 when looking for an EGLConfig always pick the first one that matches, not the last one 2009-06-03 14:49:08 -07:00
Mathias Agopian
6457359fa5 Merge commit 'goog/master' into merge_master 2009-06-01 14:30:08 -07:00
Android (Google) Code Review
d23399d0ff am b249890b: Merge change 2835 into donut
Merge commit 'b249890bc6740531898d94aaecac34d5736106bc'

* commit 'b249890bc6740531898d94aaecac34d5736106bc':
  Add framework support for scrolling to the "More results..." list item
2009-06-01 14:23:46 -07:00
Android (Google) Code Review
cbcbfc5c32 Merge change 2835 into donut
* changes:
  Add framework support for scrolling to the "More results..." list item when it is clicked.
2009-06-01 14:21:54 -07:00
Mathias Agopian
c6a5a5183b move utils/Pipe.h to the simulator 2009-06-01 14:06:02 -07:00
Guang Zhu
b20e25a624 am 892771ab: Rename WRITE_SDCARD to WRITE_EXTERNAL_STORAGE in browser test app
Merge commit '892771ab81f79a6b0cf9735701760c5a12d6ab85'

* commit '892771ab81f79a6b0cf9735701760c5a12d6ab85':
  Rename WRITE_SDCARD to WRITE_EXTERNAL_STORAGE in browser test app
2009-06-01 14:01:11 -07:00
Android (Google) Code Review
1c22c0adeb Merge change 2836
* changes:
  get rid of TimerProbe which is never used
2009-06-01 13:56:03 -07:00
Mathias Agopian
294423e148 get rid of TimerProbe which is never used 2009-06-01 13:55:28 -07:00
Android (Google) Code Review
e376902a53 am ff0d9147: Merge change 2766 into donut
Merge commit 'ff0d91479d3c8523bc290bd1b65fcd2546be1d40'

* commit 'ff0d91479d3c8523bc290bd1b65fcd2546be1d40':
  Manually merge a few fixes from cupcake and cupcake_dcm.
2009-06-01 12:42:57 -07:00
Android (Google) Code Review
106ab9f9e1 Merge change 2766 into donut
* changes:
  Manually merge a few fixes from cupcake and cupcake_dcm.
2009-06-01 12:41:41 -07:00
Guang Zhu
9acdceb098 am 40d87ee4: Removing @Override to fix the build
Merge commit '40d87ee4867baa25fd7a824f324ea7040bf5bc23'

* commit '40d87ee4867baa25fd7a824f324ea7040bf5bc23':
  Removing @Override to fix the build
2009-06-01 12:38:38 -07:00
Android (Google) Code Review
3b7294521f am 50566b35: Merge change 2816 into donut
Merge commit '50566b3554f440d6b84a696875147d8d21682b10'

* commit '50566b3554f440d6b84a696875147d8d21682b10':
  Update reliability test code. Use a separate activity with simpler calback mechanism.
2009-06-01 11:39:01 -07:00
Android (Google) Code Review
5c6b111462 Merge change 2816 into donut
* changes:
  Update reliability test code. Use a separate activity with simpler calback mechanism.
2009-06-01 11:38:16 -07:00
Android (Google) Code Review
0f343cba7f am fa30c0ee: Merge change 2548 into donut
Merge commit 'fa30c0eed3386af37be0f0df7aeaa886a8e6095d'

* commit 'fa30c0eed3386af37be0f0df7aeaa886a8e6095d':
  Fix a bug in AppSecurityPermissions where it wouldn't display permissions used by an app if it uses a shared user id.
2009-06-01 10:22:35 -07:00
Android (Google) Code Review
1cecebfe0d Merge change 2548 into donut
* changes:
  Fix a bug in AppSecurityPermissions where it wouldn't display permissions used by an app if it uses a shared user id. Remove the else clause and always get the list of requested permissions first before adding the permissions obtained via the shared user id. Also change an if condition and comments for better readability
2009-06-01 10:21:05 -07:00
Android (Google) Code Review
c8b674ae88 am 162c9d0e: Merge change 2805 into donut
Merge commit '162c9d0e90eaa71adc8c7d1456d1a9a95e638c47'

* commit '162c9d0e90eaa71adc8c7d1456d1a9a95e638c47':
  base: Rename WRITE_SDCARD -> WRITE_EXTERNAL_STORAGE
2009-06-01 10:01:08 -07:00
Android (Google) Code Review
c5e09948ad Merge change 2805 into donut
* changes:
  base: Rename WRITE_SDCARD -> WRITE_EXTERNAL_STORAGE
2009-06-01 09:58:44 -07:00
Android (Google) Code Review
dd1d220d53 am 450ad31b: Merge change 2774 into donut
Merge commit '450ad31b62af468aa0fb308a5c983b8f8334ae4e'

* commit '450ad31b62af468aa0fb308a5c983b8f8334ae4e':
  Limit check on maxChannels for SoundPool.
2009-06-01 09:58:43 -07:00
Android (Google) Code Review
07626bf63d am 10d273bb: Merge change 2591 into donut
Merge commit '10d273bb69016f7eb056d7ea1f3a929a5f5a3314'

* commit '10d273bb69016f7eb056d7ea1f3a929a5f5a3314':
  Check if the ownerView is still attached to window in
2009-06-01 09:58:38 -07:00
Android (Google) Code Review
a46712b06a Merge change 2774 into donut
* changes:
  Limit check on maxChannels for SoundPool. Bug 1838724
2009-06-01 09:57:24 -07:00
Android (Google) Code Review
60c647b3c8 Merge change 2591 into donut
* changes:
  Check if the ownerView is still attached to window in refreshPositionVariables.
2009-06-01 09:55:44 -07:00
Mathias Agopian
1bc9c93faf get rid of sleepForInterval() which didn't seem to be used anywhere in the source tree. Also get rid of ported.h which seem to be used only (possibly) in the sim. moved the implementation there. 2009-05-31 23:45:01 -07:00
Android (Google) Code Review
ad736fb165 Merge change 2792
* changes:
  get rid of utils.h
2009-05-31 22:44:44 -07:00
Christopher Tate
483470d467 am 181fafaf: Retool the backup process to use a new \'BackupAgent\' class
Merge commit '181fafaf48208978b8ba2022683ffa78aaeddde1'

* commit '181fafaf48208978b8ba2022683ffa78aaeddde1':
  Retool the backup process to use a new 'BackupAgent' class
2009-05-31 19:44:35 -07:00
Doug Kramer
5f431e4a1e am c01159bb: am 7363e049: AI 149404: Am sending again with the latest changes Publish Activity and Task Design Guidelines http://doog:9000/guide/practices/ui_guidelines/activity_task_design.html
Merge commit 'c01159bb00f7273f9b051dfbbe6bc10d54d3a846'

* commit 'c01159bb00f7273f9b051dfbbe6bc10d54d3a846':
  AI 149404: Am sending again with the latest changes
2009-05-31 19:44:30 -07:00
Mathias Agopian
e0c322049a get rid of utils.h 2009-05-31 19:13:00 -07:00
Mathias Agopian
d07f2a523f get rid of utils/executablepath.h, which now lives in the simulator 2009-05-31 18:49:44 -07:00
Mathias Agopian
e839d82680 merge master to master_gl 2009-05-31 01:16:45 -07:00
Doug Kramer
927080e365 am 7363e049: AI 149404: Am sending again with the latest changes Publish Activity and Task Design Guidelines http://doog:9000/guide/practices/ui_guidelines/activity_task_design.html
Merge commit '7363e049ec7c2f490acf783a979ea101df35a055' into donut

* commit '7363e049ec7c2f490acf783a979ea101df35a055':
  AI 149404: Am sending again with the latest changes
2009-05-30 11:58:57 -07:00
Android (Google) Code Review
8ae930e706 am 11b1675a: Merge change 2626 into donut
Merge commit '11b1675a9348adabd9370ac01ae9c614ca4af384'

* commit '11b1675a9348adabd9370ac01ae9c614ca4af384':
  Adding TTS error code to signal missing resources (for instance missing language files).
2009-05-29 17:19:25 -07:00
Android (Google) Code Review
d6389ade17 Merge change 2626 into donut
* changes:
  Adding TTS error code to signal missing resources (for instance missing language files).
2009-05-29 17:18:12 -07:00
Android (Google) Code Review
2ab4b86258 am 6190fe6e: Merge change 2758 into donut
Merge commit '6190fe6e7d7c8a917472637f5ab2fb21fc8a6eea'

* commit '6190fe6e7d7c8a917472637f5ab2fb21fc8a6eea':
  Fix concat SMS for GSM.
2009-05-29 17:15:10 -07:00
Android (Google) Code Review
7851d244fb Merge change 2758 into donut
* changes:
  Fix concat SMS for GSM.
2009-05-29 17:13:34 -07:00
Android (Google) Code Review
6296c388f4 am afbc9ab3: Merge change 2692 into donut
Merge commit 'afbc9ab3707cc8b1954333f258f220800b3cc104'

* commit 'afbc9ab3707cc8b1954333f258f220800b3cc104':
  * Chagned RecognitionService interface to use more complex RecognitionResult instead of String.
2009-05-29 17:10:38 -07:00
Android (Google) Code Review
711c27dec8 Merge change 2692 into donut
* changes:
  * Chagned RecognitionService interface to use more complex RecognitionResult instead of String.
2009-05-29 17:09:19 -07:00
Android (Google) Code Review
c10609a36f am c3b7e4e7: Merge change 2736 into donut
Merge commit 'c3b7e4e7dda7a81e7f1017f17adb717ffb3d50d2'

* commit 'c3b7e4e7dda7a81e7f1017f17adb717ffb3d50d2':
  Telephony support for SMS memory reporting to the network.
2009-05-29 15:17:27 -07:00
Android (Google) Code Review
3961e2414a Merge change 2736 into donut
* changes:
  Telephony support for SMS memory reporting to the network.
2009-05-29 15:16:22 -07:00
Android (Google) Code Review
6ac4836a38 am f422dc49: Merge change 2566 into donut
Merge commit 'f422dc495ae092e8354b383a21f47b43ea698939'

* commit 'f422dc495ae092e8354b383a21f47b43ea698939':
  Fix javadoc typos. No code changes.
2009-05-29 15:10:11 -07:00
Android (Google) Code Review
f524fe04ef Merge change 2566 into donut
* changes:
  Fix javadoc typos. No code changes.
2009-05-29 15:07:45 -07:00
Android (Google) Code Review
7477657d60 am 2d75410f: Merge change 2748 into donut
Merge commit '2d75410f20653858f358237ae9bd09b053fe8f8f'

* commit '2d75410f20653858f358237ae9bd09b053fe8f8f':
  Fix the build.
2009-05-29 15:04:50 -07:00
Android (Google) Code Review
e1695e5e27 Merge change 2748 into donut
* changes:
  Fix the build.
2009-05-29 15:03:25 -07:00
Android (Google) Code Review
c20e4ebef2 am b61ae351: Merge change 2747 into donut
Merge commit 'b61ae351256518add7bcb40e0bf18337dd87195c'

* commit 'b61ae351256518add7bcb40e0bf18337dd87195c':
  log the geomerty of surfaces causing an out of memory in SurfaceFlinger.
2009-05-29 14:57:33 -07:00
Android (Google) Code Review
489d3953f0 Merge change 2747 into donut
* changes:
  log the geomerty of surfaces causing an out of memory in SurfaceFlinger.
2009-05-29 14:55:48 -07:00
Mathias Agopian
3c4d8c83da log the geomerty of surfaces causing an out of memory in SurfaceFlinger. 2009-05-29 14:55:06 -07:00
Android (Google) Code Review
c61218f33f am a5f50b8f: Merge change 2746 into donut
Merge commit 'a5f50b8f49cc9b34b1de462e11498d92c692b978'

* commit 'a5f50b8f49cc9b34b1de462e11498d92c692b978':
  Modify the base gestures API to use streams instead of files. Adds new wrappers to easily load/save gestures from files, resources, etc. Do the same for the letters recognizer.
2009-05-29 14:47:16 -07:00
Android (Google) Code Review
811eeff577 Merge change 2746 into donut
* changes:
  Modify the base gestures API to use streams instead of files. Adds new wrappers to easily load/save gestures from files, resources, etc. Do the same for the letters recognizer.
2009-05-29 14:46:02 -07:00
Android (Google) Code Review
3d6cbbd342 am 0f5179c7: Merge change 2716 into donut
Merge commit '0f5179c7d333ddab729b5943766637c21d1b74db'

* commit '0f5179c7d333ddab729b5943766637c21d1b74db':
  Update MediaPlayer to allow setVideoSurface calls after prepare. Also allow
2009-05-29 14:18:55 -07:00
Android (Google) Code Review
f93f7a3844 Merge change 2716 into donut
* changes:
  Update MediaPlayer to allow setVideoSurface calls after prepare. Also allow passing a null surface. The API is now enabled to change the surface while the video is playing. This could allow orientation changes during playback or to allow the audio track from a video to play in the background. NOTE: There are still changes required to pmem driver to allow remapping shared physical memory into a process in order for this to work. This change only enables the API to send the appropriate calls when the lower level code supports it.
2009-05-29 14:17:44 -07:00