9766 Commits

Author SHA1 Message Date
Bjorn Bringert
b1ef743df3 am a953ed4b: Merge change 26148 into eclair
Merge commit 'a953ed4bc08cf5fc98f17a399adbd8afdd8293d5' into eclair-plus-aosp

* commit 'a953ed4bc08cf5fc98f17a399adbd8afdd8293d5':
  Use icon URI as icon cache key in search dialog
2009-09-21 09:32:58 -07:00
Dmitri Plotnikov
15e2669fcd Moving DISPLAY_NAME to column "data1" to keep it "aligned" with other data types.
This is a minor optimization for the sake of the aggregator.  The aggregator now relies on the display name
instead of structured components. As a result, we only need one column from the data table
for the structured name.  For other data types it's data1. Might as well use the same column
for display name.

Change-Id: Ib22d1f1a7a91f12716d1a460e1578f01926c393a
2009-09-21 09:30:13 -07:00
Wink Saville
b14300140d Fix several CDMA call collision cases
1. Continous ringing after receiving a call waiting while in a call,
and before user answers the call waiting, the 1st call drops.  If another
MT call comes in, while it rings, it also drops, the phone will keep
ringing.

2. Data call is not re-initiated if emergency MO call collides with an MT call.

Bug: 2123287
Change-Id: I6b12a900ec60b478691544ab5326eac4952ce834
2009-09-21 09:25:45 -07:00
Android (Google) Code Review
e256c79731 Merge change 26053 into eclair
* changes:
  log hash of account name in sync event log
2009-09-21 12:21:14 -04:00
Leon Scroggins
22259abecc am b91dd357: am 03c87bf5: Allow a webpage that wants to scroll off the title bar to do so.
Merge commit 'b91dd357c3e0c0d1fb86c69644c177a00b47695b'

* commit 'b91dd357c3e0c0d1fb86c69644c177a00b47695b':
  Allow a webpage that wants to scroll off the title bar to do so.
2009-09-21 08:33:51 -07:00
Android (Google) Code Review
a953ed4bc0 Merge change 26148 into eclair
* changes:
  Use icon URI as icon cache key in search dialog
2009-09-21 11:29:51 -04:00
Leon Scroggins
b91dd357c3 am 03c87bf5: Allow a webpage that wants to scroll off the title bar to do so.
Merge commit '03c87bf51cdf5a105b53b5d6fbf9cfbc6c93751e' into eclair-plus-aosp

* commit '03c87bf51cdf5a105b53b5d6fbf9cfbc6c93751e':
  Allow a webpage that wants to scroll off the title bar to do so.
2009-09-21 08:24:54 -07:00
Leon Scroggins
03c87bf51c Allow a webpage that wants to scroll off the title bar to do so.
Slows down the animation so the user can see it slide away.  Also
move the animation to before we change to view coordinates so it
will not be dependent on the zoom level/screen resolution.

Change-Id: Icc54b2b26c08cd54d84b4e9892a316a5712534e4
2009-09-21 10:58:54 -04:00
Bjorn Bringert
6d318b4330 Use icon URI as icon cache key in search dialog
Fixes http://b/issue?id=2131078
"Incorrect icons shown in in-app search"

Change-Id: I88282d6323333796e66ca704390ad16016b846eb
2009-09-21 15:43:11 +01:00
Brad Fitzpatrick
3423c0e03d am 73d7ca9d: am 77fa24a5: Merge change 26136 into eclair
Merge commit '73d7ca9d56fc020d806db76fc7c0ef310731e0fd'

* commit '73d7ca9d56fc020d806db76fc7c0ef310731e0fd':
  Fix NPE crash-loop when cpufreq not available in the kernel.
2009-09-21 04:51:51 -07:00
Brad Fitzpatrick
73d7ca9d56 am 77fa24a5: Merge change 26136 into eclair
Merge commit '77fa24a5ef3ee3bc108d4bf3c77b7b4c7d0d5451' into eclair-plus-aosp

* commit '77fa24a5ef3ee3bc108d4bf3c77b7b4c7d0d5451':
  Fix NPE crash-loop when cpufreq not available in the kernel.
2009-09-21 04:46:07 -07:00
Android (Google) Code Review
77fa24a5ef Merge change 26136 into eclair
* changes:
  Fix NPE crash-loop when cpufreq not available in the kernel.
2009-09-21 07:37:04 -04:00
Brad Fitzpatrick
2eb239f92d Fix NPE crash-loop when cpufreq not available in the kernel. 2009-09-21 15:30:21 +04:00
Bjorn Bringert
2438aaba2a am 6971f0be: am 5417f09c: Send action key and msg with GlobalSearch clicks
Merge commit '6971f0be53d90869ac2aeb6e8aa375e985cc5b8f'

* commit '6971f0be53d90869ac2aeb6e8aa375e985cc5b8f':
  Send action key and msg with GlobalSearch clicks
2009-09-21 04:03:47 -07:00
Bryan Mawhinney
e4ab6f1b8e am 3f1bf7d0: am 3c5767d8: Track search KeyEvents in SearchDialog.
Merge commit '3f1bf7d06732b0e9507fde5be680cf673bd30944'

* commit '3f1bf7d06732b0e9507fde5be680cf673bd30944':
  Track search KeyEvents in SearchDialog.
2009-09-21 03:58:59 -07:00
Bjorn Bringert
6971f0be53 am 5417f09c: Send action key and msg with GlobalSearch clicks
Merge commit '5417f09c141713c62be697fe10fe149d6d3d0eb4' into eclair-plus-aosp

* commit '5417f09c141713c62be697fe10fe149d6d3d0eb4':
  Send action key and msg with GlobalSearch clicks
2009-09-21 03:58:17 -07:00
Bjorn Bringert
5417f09c14 Send action key and msg with GlobalSearch clicks
Needed for QSB logging, http://b/issue?id=2097469

Change-Id: I817e5b26c9739ab05bd873675854478ce601d234
2009-09-21 11:52:24 +01:00
Bryan Mawhinney
3f1bf7d067 am 3c5767d8: Track search KeyEvents in SearchDialog.
Merge commit '3c5767d8fea785ec8d4ad6de96032cdfe752f5da' into eclair-plus-aosp

* commit '3c5767d8fea785ec8d4ad6de96032cdfe752f5da':
  Track search KeyEvents in SearchDialog.
2009-09-21 03:49:23 -07:00
Bryan Mawhinney
3c5767d8fe Track search KeyEvents in SearchDialog.
This fixes the bug preventing switching between global and in-app search,
and also enables long press for voice search (I think).

Bug: 2127442
Change-Id: I045a0f7b2c797c016191709a3983b6b33fc6186e
2009-09-21 11:04:51 +01:00
Bjorn Bringert
c6c41f9fa1 am f0e66e55: am f97f436e: Merge change 25918 into eclair
Merge commit 'f0e66e55a3e1d87d7cf68f699a0c4168faf4cf60'

* commit 'f0e66e55a3e1d87d7cf68f699a0c4168faf4cf60':
  Set intent_component of in-app shortcuts to app itself
2009-09-21 02:16:11 -07:00
Bjorn Bringert
f0e66e55a3 am f97f436e: Merge change 25918 into eclair
Merge commit 'f97f436ed6e14a680cef88a5a61b0b06f847a107' into eclair-plus-aosp

* commit 'f97f436ed6e14a680cef88a5a61b0b06f847a107':
  Set intent_component of in-app shortcuts to app itself
2009-09-21 02:11:06 -07:00
Android (Google) Code Review
f97f436ed6 Merge change 25918 into eclair
* changes:
  Set intent_component of in-app shortcuts to app itself
2009-09-21 05:02:18 -04:00
Chia-chi Yeh
e3e05cca34 am 1dd477b4: am 5feb428f: Merge change 26109 into eclair
Merge commit '1dd477b48537f263df97b2049b61e4d8b9228f5c'

* commit '1dd477b48537f263df97b2049b61e4d8b9228f5c':
  KeyStore: add java interface.
2009-09-21 01:43:09 -07:00
Chia-chi Yeh
34b994d4c8 am 965056f6: am 25a13907: Merge change 26105 into eclair
Merge commit '965056f63c0d61213a8b27bfcd6aa804e94ce756'

* commit '965056f63c0d61213a8b27bfcd6aa804e94ce756':
  keystore: enable delete(), scan(), exist() when keystore is locked.
2009-09-21 01:42:59 -07:00
Chia-chi Yeh
1dd477b485 am 5feb428f: Merge change 26109 into eclair
Merge commit '5feb428f349a3d9f481ba98b8ce11d25e05f2eb3' into eclair-plus-aosp

* commit '5feb428f349a3d9f481ba98b8ce11d25e05f2eb3':
  KeyStore: add java interface.
2009-09-21 01:31:04 -07:00
Chia-chi Yeh
965056f63c am 25a13907: Merge change 26105 into eclair
Merge commit '25a13907aa8e4478e29237641f8a47b862ff7e92' into eclair-plus-aosp

* commit '25a13907aa8e4478e29237641f8a47b862ff7e92':
  keystore: enable delete(), scan(), exist() when keystore is locked.
2009-09-21 01:30:54 -07:00
Android (Google) Code Review
5feb428f34 Merge change 26109 into eclair
* changes:
  KeyStore: add java interface.
2009-09-21 04:25:28 -04:00
Chia-chi Yeh
4403917262 KeyStore: add java interface. 2009-09-21 15:52:00 +08:00
Megha Joshi
2acda4bead Uri encode phone number before passing it to query.
Fixes bug 2122926
2009-09-20 23:48:02 -07:00
Chia-chi Yeh
3e194eb4b4 am b2b4b8a7: am f9a8ecc4: Merge change 25737 into eclair
Merge commit 'b2b4b8a7ef79ca922864350d05e115d65402c960'

* commit 'b2b4b8a7ef79ca922864350d05e115d65402c960':
  keystore: switch to multi-user version.
2009-09-20 23:06:36 -07:00
Bjorn Bringert
0e62e2df36 Set intent_component of in-app shortcuts to app itself
Fixes http://b/issue?id=2130474
"Shortcuts created by pivoted-in search do not
have intent_component_name set"

Change-Id: I702fe39348b762393ed08ce9905771eb892bf782
2009-09-21 06:47:57 +01:00
Wei Huang
02b5948a43 make PhoneNumberUtils.compareLoosely use MIN_MATCH of 7 instead of 5.
Change-Id: Id4a08c3834b727e253ab189293d5715ffbbe8f35
2009-09-20 21:13:45 -07:00
Android (Google) Code Review
25a13907aa Merge change 26105 into eclair
* changes:
  keystore: enable delete(), scan(), exist() when keystore is locked.
2009-09-20 23:52:33 -04:00
Chia-chi Yeh
b2b4b8a7ef am f9a8ecc4: Merge change 25737 into eclair
Merge commit 'f9a8ecc457144769cffef39af538186215e00d7a' into eclair-plus-aosp

* commit 'f9a8ecc457144769cffef39af538186215e00d7a':
  keystore: switch to multi-user version.
2009-09-20 20:46:54 -07:00
Android (Google) Code Review
f9a8ecc457 Merge change 25737 into eclair
* changes:
  keystore: switch to multi-user version.
2009-09-20 23:41:13 -04:00
Chia-chi Yeh
626c46b016 keystore: enable delete(), scan(), exist() when keystore is locked.
Also check end-of-file explicitly.
2009-09-21 11:36:33 +08:00
Mike LeBeau
c48869e4d0 am 00de43e0: am ca488232: Merge change 26104 into eclair
Merge commit '00de43e0a72b954497596b6053123e5ea54a7ed0'

* commit '00de43e0a72b954497596b6053123e5ea54a7ed0':
  Unhide themes TextAppearance.SearchResult.Title and TextAppearance.SearchResult.Subtitle.
2009-09-20 20:36:25 -07:00
Mike LeBeau
00de43e0a7 am ca488232: Merge change 26104 into eclair
Merge commit 'ca4882322f25c95786383df18f843bc688e03351' into eclair-plus-aosp

* commit 'ca4882322f25c95786383df18f843bc688e03351':
  Unhide themes TextAppearance.SearchResult.Title and TextAppearance.SearchResult.Subtitle.
2009-09-20 20:31:28 -07:00
Android (Google) Code Review
ca4882322f Merge change 26104 into eclair
* changes:
  Unhide themes TextAppearance.SearchResult.Title and TextAppearance.SearchResult.Subtitle. We had discussed doing this in Donut but looks like it never happened. We need these attributes for voice search so now's as good a time as any.
2009-09-20 23:23:25 -04:00
Mike LeBeau
894bedacc4 Unhide themes TextAppearance.SearchResult.Title and TextAppearance.SearchResult.Subtitle.
We had discussed doing this in Donut but looks like it never happened. We need these
attributes for voice search so now's as good a time as any.

Followup CL to 25911.
2009-09-20 20:21:48 -07:00
Christopher Tate
f3ea558d8c am 752e5500: am e705ca96: Merge change 26103 into eclair
Merge commit '752e55006f6bdc35781111c7735b97fd6fb1e15d'

* commit '752e55006f6bdc35781111c7735b97fd6fb1e15d':
  Handle restore of the original naive wallpaper backup schema
2009-09-20 20:08:31 -07:00
Christopher Tate
752e55006f am e705ca96: Merge change 26103 into eclair
Merge commit 'e705ca961f6c4f76f5b403d8556ee38305553aa7' into eclair-plus-aosp

* commit 'e705ca961f6c4f76f5b403d8556ee38305553aa7':
  Handle restore of the original naive wallpaper backup schema
2009-09-20 19:58:24 -07:00
Android (Google) Code Review
e705ca961f Merge change 26103 into eclair
* changes:
  Handle restore of the original naive wallpaper backup schema
2009-09-20 22:49:44 -04:00
Christopher Tate
7c2bb66db7 Handle restore of the original naive wallpaper backup schema 2009-09-20 19:47:46 -07:00
Jaikumar Ganesh
f751881fdb am 4fe6f603: am 718970bc: Merge change 26061 into eclair
Merge commit '4fe6f603cafd2f1b54051809182c308a4077b783'

* commit '4fe6f603cafd2f1b54051809182c308a4077b783':
  Send the UUID intent even if apps have not requested for it.
2009-09-20 17:51:57 -07:00
Jaikumar Ganesh
4fe6f603ca am 718970bc: Merge change 26061 into eclair
Merge commit '718970bcf35252451ae15a326bd897b436ba93f3' into eclair-plus-aosp

* commit '718970bcf35252451ae15a326bd897b436ba93f3':
  Send the UUID intent even if apps have not requested for it.
2009-09-20 17:42:29 -07:00
Android (Google) Code Review
718970bcf3 Merge change 26061 into eclair
* changes:
  Send the UUID intent even if apps have not requested for it.
2009-09-20 20:36:54 -04:00
Mathias Agopian
40dedc6a54 am 3b7868c9: am c6a22bef: Merge change 26081 into eclair
Merge commit '3b7868c9b754ab0f908114456c23bee64266e5b5'

* commit '3b7868c9b754ab0f908114456c23bee64266e5b5':
  workaround for [2113743] Sholes: frozen then runtime restart going to list view
2009-09-20 17:28:07 -07:00
Amith Yamasani
2f55de1e8e am 09481271: am 5ea916b1: Merge change 26050 into eclair
Merge commit '09481271507cfac0db2f27b878f4a453ed919fb1'

* commit '09481271507cfac0db2f27b878f4a453ed919fb1':
  Track CPU speed stepping to get more accurate CPU cost per app.
2009-09-20 17:18:15 -07:00
Mathias Agopian
3b7868c9b7 am c6a22bef: Merge change 26081 into eclair
Merge commit 'c6a22beff2af0590c1d76342bf57853f2bc85ff8' into eclair-plus-aosp

* commit 'c6a22beff2af0590c1d76342bf57853f2bc85ff8':
  workaround for [2113743] Sholes: frozen then runtime restart going to list view
2009-09-20 17:18:05 -07:00