Commit Graph

7066 Commits

Author SHA1 Message Date
Jack Wang
2ce6237fa0 am 8b7eadf7: am 1e09e9e0: Merge change 22650 into eclair
Merge commit '8b7eadf7ba1ddfa26d1593e62297204b1f243761'

* commit '8b7eadf7ba1ddfa26d1593e62297204b1f243761':
  Fix build break
2009-08-25 15:36:25 -07:00
Jack Wang
8b7eadf7ba am 1e09e9e0: Merge change 22650 into eclair
Merge commit '1e09e9e0d09602ee84a299f09b451db686ff6c40' into eclair-plus-aosp

* commit '1e09e9e0d09602ee84a299f09b451db686ff6c40':
  Fix build break
2009-08-25 15:34:21 -07:00
Android (Google) Code Review
1e09e9e0d0 Merge change 22650 into eclair
* changes:
  Fix build break - Introduced in 22109
2009-08-25 14:55:27 -07:00
Jason Sams
cde9ab93f7 am 7ebcbff6: am cf207b63: Merge change 22651 into eclair
Merge commit '7ebcbff63fc5c2528f226e78e96cb5a68a0ac01d'

* commit '7ebcbff63fc5c2528f226e78e96cb5a68a0ac01d':
  Implement java interface for RS shutdown and fix shutdown deadlock with the command fifo.
2009-08-25 14:54:06 -07:00
Jason Sams
7ebcbff63f am cf207b63: Merge change 22651 into eclair
Merge commit 'cf207b632500d18c9053aa01ea9a1d8ae2d92612' into eclair-plus-aosp

* commit 'cf207b632500d18c9053aa01ea9a1d8ae2d92612':
  Implement java interface for RS shutdown and fix shutdown deadlock with the command fifo.
2009-08-25 14:52:04 -07:00
Android (Google) Code Review
cf207b6325 Merge change 22651 into eclair
* changes:
  Implement java interface for RS shutdown and fix shutdown deadlock with the command fifo.
2009-08-25 14:49:55 -07:00
Jason Sams
f5b4596a38 Implement java interface for RS shutdown and fix shutdown deadlock with the command fifo. 2009-08-25 14:49:07 -07:00
Jack Wang
fa5382208b Fix build break
- Introduced in 22109
2009-08-25 14:47:44 -07:00
Andreas Huber
baba9a24a1 am 5c36cd2b: am f96d49a2: Merge change 22646 into eclair
Merge commit '5c36cd2bcb594c0ed4422a5074b70535bc132f3b'

* commit '5c36cd2bcb594c0ed4422a5074b70535bc132f3b':
  Make sure not to ask for more buffers when we know that there won't be any, added a quirk for the aac decoder.
2009-08-25 14:38:56 -07:00
Andreas Huber
5c36cd2bcb am f96d49a2: Merge change 22646 into eclair
Merge commit 'f96d49a277af9ec888bb7d15988b57989ccb39af' into eclair-plus-aosp

* commit 'f96d49a277af9ec888bb7d15988b57989ccb39af':
  Make sure not to ask for more buffers when we know that there won't be any, added a quirk for the aac decoder.
2009-08-25 14:36:40 -07:00
Android (Google) Code Review
f96d49a277 Merge change 22646 into eclair
* changes:
  Make sure not to ask for more buffers when we know that there won't be any, added a quirk for the aac decoder.
2009-08-25 14:35:12 -07:00
Andreas Huber
404cc418be Make sure not to ask for more buffers when we know that there won't be any, added a quirk for the aac decoder. 2009-08-25 14:26:05 -07:00
johnwang
39fe8bdb62 am c3b64a41: am 4b474440: Merge change 22566 into eclair
Merge commit 'c3b64a41d959428971c99185da3b629e1cbaeaf7'

* commit 'c3b64a41d959428971c99185da3b629e1cbaeaf7':
  Simplify CDMA Status Bar icons
2009-08-25 13:44:18 -07:00
johnwang
c3b64a41d9 am 4b474440: Merge change 22566 into eclair
Merge commit '4b474440cef8afa5e355a9406bb076af8e493ca7' into eclair-plus-aosp

* commit '4b474440cef8afa5e355a9406bb076af8e493ca7':
  Simplify CDMA Status Bar icons
2009-08-25 13:42:02 -07:00
Android (Google) Code Review
4b474440ce Merge change 22566 into eclair
* changes:
  Simplify CDMA Status Bar icons
2009-08-25 13:39:34 -07:00
Jack Wang
49fba412e9 am d22f4d85: am c69a8807: Merge change 22109 into eclair
Merge commit 'd22f4d856e049b33f86c93761a38046644688d90'

* commit 'd22f4d856e049b33f86c93761a38046644688d90':
  Fix bug 1546445: Correct spelling errors in API
2009-08-25 12:50:39 -07:00
Jason Sams
29c5c2f6b5 am 5f090ccb: am 77f77f90: Merge change 22231 into eclair
Merge commit '5f090ccb453f23e4df2507f90f3c1305aaab1f22'

* commit '5f090ccb453f23e4df2507f90f3c1305aaab1f22':
  Add support for selecting the color bit depth and if the application used a depth buffer.
2009-08-25 12:50:36 -07:00
Jack Wang
d22f4d856e am c69a8807: Merge change 22109 into eclair
Merge commit 'c69a8807f3aae255c9fe61c4f61bc1ebdd355543' into eclair-plus-aosp

* commit 'c69a8807f3aae255c9fe61c4f61bc1ebdd355543':
  Fix bug 1546445: Correct spelling errors in API
2009-08-25 12:48:33 -07:00
Jason Sams
5f090ccb45 am 77f77f90: Merge change 22231 into eclair
Merge commit '77f77f904a8cb13dc2cd921b253658072389e95f' into eclair-plus-aosp

* commit '77f77f904a8cb13dc2cd921b253658072389e95f':
  Add support for selecting the color bit depth and if the application used a depth buffer.
2009-08-25 12:48:30 -07:00
Android (Google) Code Review
c69a8807f3 Merge change 22109 into eclair
* changes:
  Fix bug 1546445: Correct spelling errors in API - InstrumentationTestCase.injectInsrumentation - AndroidTestRunner.setInstrumentaiton
2009-08-25 12:47:11 -07:00
Jack Wang
7aba54b2ed Fix bug 1546445: Correct spelling errors in API
- InstrumentationTestCase.injectInsrumentation
- AndroidTestRunner.setInstrumentaiton
2009-08-25 12:44:56 -07:00
Android (Google) Code Review
77f77f904a Merge change 22231 into eclair
* changes:
  Add support for selecting the color bit depth and if the application used a depth buffer.
2009-08-25 12:41:37 -07:00
Cynthia Wong
426a89f9ba am a4490881: am 4025dbd9: Merge change 22618 into eclair
Merge commit 'a4490881a367ab38b29bf3480c035c62974a81b3'

* commit 'a4490881a367ab38b29bf3480c035c62974a81b3':
  Only try to sync to subscribedfeeds for google acounts.
2009-08-25 12:40:32 -07:00
johnwang
347c5a22a9 Simplify CDMA Status Bar icons
Update the RSSI display policy in CDMA.
1. Use single RSSI icon instead of two icons
2. If 3G(EV) and 1x network are available than 3G should be displayed,  Displayed RSSI should be from the EV side.
3. If a voice call is made then RSSI should switch to 1x.
2009-08-25 12:39:49 -07:00
Cynthia Wong
a4490881a3 am 4025dbd9: Merge change 22618 into eclair
Merge commit '4025dbd97e7e800e9a75f76664453bdb2971c132' into eclair-plus-aosp

* commit '4025dbd97e7e800e9a75f76664453bdb2971c132':
  Only try to sync to subscribedfeeds for google acounts.
2009-08-25 12:38:38 -07:00
Android (Google) Code Review
4025dbd97e Merge change 22618 into eclair
* changes:
  Only try to sync to subscribedfeeds for google acounts.
2009-08-25 12:35:55 -07:00
Jaikumar Ganesh
84a652cc57 am 88ccc8fb: am 617b22dc: Merge change 22520 into eclair
Merge commit '88ccc8fbfb9ec23fe4f31798787b05e9e75f2fe9'

* commit '88ccc8fbfb9ec23fe4f31798787b05e9e75f2fe9':
  Add local frames for parsing properties and processing events.
2009-08-25 12:11:45 -07:00
Jaikumar Ganesh
88ccc8fbfb am 617b22dc: Merge change 22520 into eclair
Merge commit '617b22dc075bbf704421adf15f39388ec098b4fd' into eclair-plus-aosp

* commit '617b22dc075bbf704421adf15f39388ec098b4fd':
  Add local frames for parsing properties and processing events.
2009-08-25 12:09:54 -07:00
Android (Google) Code Review
617b22dc07 Merge change 22520 into eclair
* changes:
  Add local frames for parsing properties and processing events.
2009-08-25 12:07:53 -07:00
Jaikumar Ganesh
6d56b530e1 Add local frames for parsing properties and processing events.
We were running out of local refs when there are lots of devices.
Instead of deleting every single local ref, create a local stack frame.
This operation is inexpensive so doesn't add a high overload and keeps
the code clean instead of deleting every single local ref.
2009-08-25 12:02:34 -07:00
Fred Quintana
5a8bbb903e am ab3996f2: am 5fe00057: Merge change 22549 into eclair
Merge commit 'ab3996f2c6c7c6e3e18e11fa32dac5c5d546ea67'

* commit 'ab3996f2c6c7c6e3e18e11fa32dac5c5d546ea67':
  - make it ok to modify the accounts before boot
2009-08-25 11:50:59 -07:00
Fred Quintana
ab3996f2c6 am 5fe00057: Merge change 22549 into eclair
Merge commit '5fe00057dd611fda30f44edb98771e38bf452ecd' into eclair-plus-aosp

* commit '5fe00057dd611fda30f44edb98771e38bf452ecd':
  - make it ok to modify the accounts before boot
2009-08-25 11:49:22 -07:00
Android (Google) Code Review
5fe00057dd Merge change 22549 into eclair
* changes:
  - make it ok to modify the accounts before boot - allow packages in the system image to access any authtokens they wish
2009-08-25 11:47:11 -07:00
Cynthia Wong
c30d4aff04 Only try to sync to subscribedfeeds for google acounts. 2009-08-25 11:46:00 -07:00
Jason Sams
b13ada5071 Add support for selecting the color bit depth and if the application used a depth buffer. 2009-08-25 11:44:30 -07:00
Mike Reed
458a7fb3da am 9bace916: am dbade9d6: expose runtime changes to gamma
Merge commit '9bace91641df27c5b238fe5fc340e25827382473'

* commit '9bace91641df27c5b238fe5fc340e25827382473':
  expose runtime changes to gamma
2009-08-25 11:00:36 -07:00
Mike Reed
9bace91641 am dbade9d6: expose runtime changes to gamma
Merge commit 'dbade9d6a075b1d5b8ebe10ee8961a5de296c93b' into eclair-plus-aosp

* commit 'dbade9d6a075b1d5b8ebe10ee8961a5de296c93b':
  expose runtime changes to gamma
2009-08-25 10:58:07 -07:00
Mike Reed
dbade9d6a0 expose runtime changes to gamma 2009-08-25 13:47:47 -04:00
Yu Shan Emily Lau
c2c4a53783 am 2bfe8ffa: am 523018f1: am b56de747: Revert " modified: MediaFrameworkTest/src/com/android/mediaframeworktest/functional/MediaPlayerApiTest.java"
Merge commit '2bfe8ffab5af1ea7cba35436ddbae4cc821bb2ba'

* commit '2bfe8ffab5af1ea7cba35436ddbae4cc821bb2ba':
  Revert "	modified:   MediaFrameworkTest/src/com/android/mediaframeworktest/functional/MediaPlayerApiTest.java"
2009-08-25 10:45:28 -07:00
Yu Shan Emily Lau
2bfe8ffab5 am 523018f1: am b56de747: Revert " modified: MediaFrameworkTest/src/com/android/mediaframeworktest/functional/MediaPlayerApiTest.java"
Merge commit '523018f1828884e96b1265f3e347410280577945' into eclair-plus-aosp

* commit '523018f1828884e96b1265f3e347410280577945':
  Revert "	modified:   MediaFrameworkTest/src/com/android/mediaframeworktest/functional/MediaPlayerApiTest.java"
2009-08-25 10:44:04 -07:00
Yu Shan Emily Lau
523018f182 am b56de747: Revert " modified: MediaFrameworkTest/src/com/android/mediaframeworktest/functional/MediaPlayerApiTest.java"
Merge commit 'b56de7474d93e634f77be58a794fbd1b0e68f6a8' into eclair

* commit 'b56de7474d93e634f77be58a794fbd1b0e68f6a8':
  Revert "	modified:   MediaFrameworkTest/src/com/android/mediaframeworktest/functional/MediaPlayerApiTest.java"
2009-08-25 10:42:02 -07:00
Amith Yamasani
7f48e806a7 am 657bf5b7: am 91ba1c3f: Merge change 22521 into eclair
Merge commit '657bf5b751b7d2008dff0f91082a75bc1d699fa9'

* commit '657bf5b751b7d2008dff0f91082a75bc1d699fa9':
  Revert volume if it wasn't okayed by user.
2009-08-25 10:27:42 -07:00
Amith Yamasani
657bf5b751 am 91ba1c3f: Merge change 22521 into eclair
Merge commit '91ba1c3f9d000928a4ba12d45d609b1c2e7066e7' into eclair-plus-aosp

* commit '91ba1c3f9d000928a4ba12d45d609b1c2e7066e7':
  Revert volume if it wasn't okayed by user.
2009-08-25 10:25:20 -07:00
Android (Google) Code Review
91ba1c3f9d Merge change 22521 into eclair
* changes:
  Revert volume if it wasn't okayed by user.
2009-08-25 10:23:29 -07:00
Yu Shan Emily Lau
b56de7474d Revert " modified: MediaFrameworkTest/src/com/android/mediaframeworktest/functional/MediaPlayerApiTest.java"
This reverts commit 051d8d6692.
2009-08-25 10:21:31 -07:00
Karl Rosaen
2856d1143e am 16077822: am 678771b8: New strings and utlity method tweaks associated with updated account unlock screen flow.
Merge commit '1607782261f4213aa9b4b7b1cf492d51849cdda5'

* commit '1607782261f4213aa9b4b7b1cf492d51849cdda5':
  New strings and utlity method tweaks associated with updated account unlock screen flow.
2009-08-25 09:35:27 -07:00
Karl Rosaen
1607782261 am 678771b8: New strings and utlity method tweaks associated with updated account unlock screen flow.
Merge commit '678771b8118c3289aff6814775cbb30fa8aada29' into eclair-plus-aosp

* commit '678771b8118c3289aff6814775cbb30fa8aada29':
  New strings and utlity method tweaks associated with updated account unlock screen flow.
2009-08-25 09:32:52 -07:00
Karl Rosaen
678771b811 New strings and utlity method tweaks associated with updated account unlock screen flow.
- 'setPermanentlyLocked(false)' no longer automatically resets the pattern
- new string for "waiting to verify account" progress dialog
- new string for account unlock screen title when you aren't past the too many
attempts, but just hit the 'forgot pattern' button
2009-08-25 08:26:38 -07:00
Eric Laurent
1d8a95f141 Fix issue 2076322: AudioService, too many stream volume steps.
MAX_STREAM_VOLUME[] now contains the maximum valid index instead of the number of indexes for all stream types.
2009-08-25 06:30:59 -07:00
Chih-Chung Chang
3429d3439c am c607435c: am 4804c3e2: Merge change 22564 into eclair
Merge commit 'c607435cae64d2f9c7af408e10e1e72eb637c458'

* commit 'c607435cae64d2f9c7af408e10e1e72eb637c458':
  Add an extra intent parameter for recording duration limit.
2009-08-25 00:00:50 -07:00