Commit Graph

3148 Commits

Author SHA1 Message Date
Mathias Agopian
5d7126b625 resolved conflicts for merge of ac38dfc5 to master 2009-07-28 14:20:21 -07:00
Android (Google) Code Review
5fb9d7d1c1 am 50f05b8f: Merge change 8825 into donut
Merge commit '50f05b8ffd2c4f4d877c4564b2339ca0ccca6ec1'

* commit '50f05b8ffd2c4f4d877c4564b2339ca0ccca6ec1':
  Fixes 2017393. Correctly apply gravity in RelativeLayout.
2009-07-28 11:29:34 -07:00
Android (Google) Code Review
3816dd3968 am c6590d6f: Merge change 8759 into donut
Merge commit 'c6590d6f390fc69fe15a9a565327a8f8c97f107b'

* commit 'c6590d6f390fc69fe15a9a565327a8f8c97f107b':
  Cancel search on BACK if IME is obscured.
2009-07-28 11:29:15 -07:00
Eric Fischer
95493dafb1 resolved conflicts for merge of cdb9e971 to master 2009-07-28 11:27:07 -07:00
Android (Google) Code Review
792561dab0 Merge change 8817 into donut
* changes:
  fix [2017532] Partial Update leaves residual image.
2009-07-28 11:24:39 -07:00
Android (Google) Code Review
f009db3720 Merge change 8825 into donut
* changes:
  Fixes 2017393. Correctly apply gravity in RelativeLayout.
2009-07-28 11:19:19 -07:00
Mathias Agopian
970112231e fix [2017532] Partial Update leaves residual image. 2009-07-28 10:57:27 -07:00
Android (Google) Code Review
2f682da1f2 Merge change 8759 into donut
* changes:
  Cancel search on BACK if IME is obscured.
2009-07-28 10:45:35 -07:00
Android (Google) Code Review
8da338380f Merge change 8806 into donut
* changes:
  Mark the the airplane mode internal strings as not translatable.
2009-07-28 10:27:56 -07:00
Android (Google) Code Review
3c59370570 am 1dd6936a: Merge change 8728 into donut
Merge commit '1dd6936a862be97efca02e4b7582a9fca1fcc269'

* commit '1dd6936a862be97efca02e4b7582a9fca1fcc269':
  Fix resource code and version attributes
2009-07-28 10:21:45 -07:00
Android (Google) Code Review
5eb259b2d7 Merge change 8728 into donut
* changes:
  Fix resource code and version attributes Create a new package setting object for updated system apps rather than moving around the same setting. This updates the resource, code and version correctly. For updating system packages, disable the package first which removes the entry from internal structures, create a new package setting, add it to list of user id's then rest of installation steps, kill the process if needed via ActivityManager then add this setting if everything was successful. This also fixes issues with updating values prematurely.
2009-07-28 10:18:47 -07:00
Android (Google) Code Review
5cbbfceb58 Merge change 8742
* changes:
  Modify BluetoothPbap for a few wrong wordings
2009-07-28 10:05:35 -07:00
Android (Google) Code Review
1c2c714130 Merge change 8770
* changes:
  Fix issue 2004229: DTMF tones play through earpiece (G1).
2009-07-28 09:46:28 -07:00
Android (Google) Code Review
4ae22256db Merge change 8779
* changes:
  Fix issue 2015322	mediaframeworktest.MediaAudioTrackTest fails.
2009-07-28 09:15:45 -07:00
Android (Google) Code Review
e9ad2550a2 Merge change 8735
* changes:
  ContactsContract: Renaming Aggregates to Contacts
2009-07-28 09:01:51 -07:00
Android (Google) Code Review
19bb52028d am 738b4c00: Merge change 8773 into donut
Merge commit '738b4c000bab8414fa2969db489d7abce20e0af6'

* commit '738b4c000bab8414fa2969db489d7abce20e0af6':
  Only dismiss search on suggestion click in in-app search
2009-07-28 07:21:09 -07:00
Android (Google) Code Review
026c79caa5 Merge change 8773 into donut
* changes:
  Only dismiss search on suggestion click in in-app search
2009-07-28 07:19:26 -07:00
Eric Laurent
d55d179e95 Fix issue 2004229: DTMF tones play through earpiece (G1). 2009-07-28 06:11:55 -07:00
Chung-yih Wang
728d0c2a7f am 19145237: Forgot to convert the jstring to char* in certificate request.
Merge commit '191452378639f1135c9591e21911ce250d140769'

* commit '191452378639f1135c9591e21911ce250d140769':
  Forgot to convert the jstring to char* in certificate request.
2009-07-28 00:30:03 -07:00
Android (Google) Code Review
a6fdb5fa17 am d0021dca: Merge change 8740 into donut
Merge commit 'd0021dcae7f474c062f23a449bdd18be5e882d7e'

* commit 'd0021dcae7f474c062f23a449bdd18be5e882d7e':
  Fix issue #1991230: DisplayMetrics.displayHeight is not updated with orientation change
2009-07-28 00:29:58 -07:00
Android (Google) Code Review
276d65fa2e Merge change 8740 into donut
* changes:
  Fix issue #1991230: DisplayMetrics.displayHeight is not updated with orientation change
2009-07-27 22:15:35 -07:00
Dianne Hackborn
cb9c44cc84 am 20583ff9: Fix issue #2015611: layering problem when moving an activity to the foreground.
Merge commit '20583ff9d49257bd4ccc60e7b6337661e34ed887'

* commit '20583ff9d49257bd4ccc60e7b6337661e34ed887':
  Fix issue #2015611: layering problem when moving an activity to the foreground.
2009-07-27 22:14:41 -07:00
Android (Google) Code Review
509f3c8372 Merge change 8745
* changes:
  Refix the MT call screen stuck issue. The issue this change fixes can be reproduced by following steps: 1. Originate and connect a call to remote party #1 that is not in Contacts. 2. Receive a call from the remote party #2 that is not in Contacts, the call waiting tone is sounded and the call waiting screen is displayed. 3. Press menu key and ignore the call, and the call waiting screen is dismissed and the remote party #2 is forwarded to voice mail. When we ignore the incoming call, Phone gets stuck with incoming call screen.
2009-07-27 22:03:25 -07:00
Android (Google) Code Review
48caf0e6bb am ecbbecf6: Merge change 8620 into donut
Merge commit 'ecbbecf6c535e7f3e1d072d43766a95aa18ee464'

* commit 'ecbbecf6c535e7f3e1d072d43766a95aa18ee464':
  Fix swapped gsm/cdma function dispatch, and 7bit text fragmentation.
2009-07-27 19:48:49 -07:00
Android (Google) Code Review
560fe236e8 Merge change 8620 into donut
* changes:
  Fix swapped gsm/cdma function dispatch, and 7bit text fragmentation.
2009-07-27 19:46:35 -07:00
Android (Google) Code Review
bf7d89b666 Merge change 8695
* changes:
  ContactsContract: Renaming CONTACT_ID to RAW_CONTACT_ID
2009-07-27 17:03:21 -07:00
Android (Google) Code Review
d7ae25df65 Merge change 8688
* changes:
  Fix the issue of new call failing in 3-way call scenario.
2009-07-27 16:07:24 -07:00
Android (Google) Code Review
4148cb775d am 79858fe2: Merge change 8678 into donut
Merge commit '79858fe2f5b088ad93e461ea94e544bfce3c2e09'

* commit '79858fe2f5b088ad93e461ea94e544bfce3c2e09':
  Fixing bug #2008185 - problem with the TTS dropping
2009-07-27 15:09:59 -07:00
Android (Google) Code Review
e4c77a5dd2 Merge change 8678 into donut
* changes:
  Fixing bug #2008185 - problem with the TTS dropping utterances under heavy load was caused by the speech queue being locked. Switched to using a timeout with tryLock so that the TTS service does not give up immediately.
2009-07-27 15:08:03 -07:00
Android (Google) Code Review
d100f772ad Merge change 8683
* changes:
  Fix a bug that was causing ArrayIndexOutOfBoutExceptions when obtaining a MotionEvent from an older one that had a number of time samples.
2009-07-27 15:03:12 -07:00
Android (Google) Code Review
f4ed15592f am 95fa929e: Merge change 8682 into donut
Merge commit '95fa929ebe55b3745eb59a1c4b8f21cb9f8e6b1d'

* commit '95fa929ebe55b3745eb59a1c4b8f21cb9f8e6b1d':
  New small rating stars from the UI designers.
2009-07-27 14:38:24 -07:00
Android (Google) Code Review
d63a5c3986 am 1fcabd7b: (-s ours) Merge change 8677 into donut
Merge commit '1fcabd7b328ddde7008d4ba2c401aa7db371ae74'

* commit '1fcabd7b328ddde7008d4ba2c401aa7db371ae74':
  DO NOT MERGE.
2009-07-27 14:38:19 -07:00
Android (Google) Code Review
cb83e259de Merge change 8682 into donut
* changes:
  New small rating stars from the UI designers.
2009-07-27 14:31:33 -07:00
Android (Google) Code Review
8b9292c10d Merge change 8677 into donut
* changes:
  DO NOT MERGE.
2009-07-27 13:55:18 -07:00
Android (Google) Code Review
706416a8d0 Merge change 8593
* changes:
  When you double-tap a word in an EditText, select the word.
2009-07-27 13:49:21 -07:00
Android (Google) Code Review
ccb530a5c9 Merge change 8642
* changes:
  Fix issue 2001517: AudioTrack compatibility issue.
2009-07-27 13:19:35 -07:00
Android (Google) Code Review
5d27812160 Merge change 8651
* changes:
  Backup manager should default to not "provisioned" so backups don't start until the setup wizard is done.
2009-07-27 12:55:08 -07:00
Android (Google) Code Review
a0fbae65f4 am ef9fd18d: Merge change 8616 into donut
Merge commit 'ef9fd18d90829ecbd37769cc05a8d5288aff821c'

* commit 'ef9fd18d90829ecbd37769cc05a8d5288aff821c':
  Fiddle with default densities to try to sanitize the API.
2009-07-27 12:05:44 -07:00
Android (Google) Code Review
55d8837073 Merge change 8616 into donut
* changes:
  Fiddle with default densities to try to sanitize the API.
2009-07-27 12:03:36 -07:00
Android (Google) Code Review
2db9172ee4 am ba989ad0: Merge change 8648 into donut
Merge commit 'ba989ad0ed91beda010d44945fa015d75d99cf67'

* commit 'ba989ad0ed91beda010d44945fa015d75d99cf67':
  Use the old string for bookmarks permissions.
2009-07-27 10:50:53 -07:00
Android (Google) Code Review
c05c1c14be Merge change 8648 into donut
* changes:
  Use the old string for bookmarks permissions.
2009-07-27 10:49:07 -07:00
Android (Google) Code Review
59c1cb8db5 Merge change 8177
* changes:
  Added patch support based on serializer state in the android client
2009-07-27 10:33:43 -07:00
Android (Google) Code Review
60cb46edda Merge change 8639
* changes:
  explicitly set the hinting level for android apps (to match the old default)
2009-07-27 09:57:35 -07:00
Bjorn Bringert
c6d3219f36 am 5b11a0f3: DPAD_DOWN moves from search/voice search key to drop-down
Merge commit '5b11a0f3e1d8e2681cfd3326b6808b894bb9c2c3'

* commit '5b11a0f3e1d8e2681cfd3326b6808b894bb9c2c3':
  DPAD_DOWN moves from search/voice search key to drop-down
2009-07-27 09:51:53 -07:00
Bjorn Bringert
c4e71c4d4c am 9377738c: Remove search dialog PRE_CLOSE event
Merge commit '9377738cdbb7eb0a1267cb536443cbed700ff5e9'

* commit '9377738cdbb7eb0a1267cb536443cbed700ff5e9':
  Remove search dialog PRE_CLOSE event
2009-07-27 09:42:19 -07:00
Bjorn Bringert
835d7bdb41 am 6ddaa349: Send max displayed position in search dialog click event
Merge commit '6ddaa3497ce7af2c303771365449501e2be52511'

* commit '6ddaa3497ce7af2c303771365449501e2be52511':
  Send max displayed position in search dialog click event
2009-07-27 09:42:14 -07:00
Android (Google) Code Review
5439bd89e7 am 0fdedd00: Merge change 8612 into donut
Merge commit '0fdedd00c510e62223e47d0c5e605b2350d2d304'

* commit '0fdedd00c510e62223e47d0c5e605b2350d2d304':
  Remove visibility checks from SearchManager tests
2009-07-27 09:42:09 -07:00
Android (Google) Code Review
59df6cdd1f Merge change 8594
* changes:
  Renaming ContactsContract.Contacts to ContactsContract.RawContacts
2009-07-27 09:37:02 -07:00
Android (Google) Code Review
3edf4bed0a Merge change 8621
* changes:
  Fix issue 2004738: Settings Backup Agent consistently throws ArrayIndexOutOfBoundsException during restore.
2009-07-27 09:36:50 -07:00
Android (Google) Code Review
b04a95876e Merge change 8569
* changes:
  Fix 1993520 where page cycler fails.
2009-07-27 08:53:46 -07:00