9791 Commits

Author SHA1 Message Date
Daisuke Miyakawa
6a857d957e Fix test for phone number comparation. Now that there are two algorithms, we should consider them in Java layer.
Uguu.

Internal issue number: 2134367
2009-09-21 10:49:44 -07:00
Christopher Tate
d55e18acbe Reset backup tracking in response to transport data-wipe notification
When attempting a backup, the transport may inform us that the backend is in an
uninitialized state.  This typically means that the device's data has been wiped
after a period [e.g. 90 days] of inactivity.  This means that we need to
re-store all data subject to backup, and all of our incremental state tracking
on the device is now stale.

In response, we wipe all of our recorded backup state and restart the backup
pass on all participants.
2009-09-21 10:19:17 -07:00
Grace Kloba
0b2c989f8a am cf16d7a6: am f8d8b46a: Add a tip toast for double tap.
Merge commit 'cf16d7a684a01a3f2d9e18999c5ecce32568a864'

* commit 'cf16d7a684a01a3f2d9e18999c5ecce32568a864':
  Add a tip toast for double tap.
2009-09-21 10:17:53 -07:00
Megha Joshi
28bd7cf4dd am a39a17d7: am d5ffa12d: Merge change 26127 into eclair
Merge commit 'a39a17d7a5e49150a778132809b9a8540a5fbe01'

* commit 'a39a17d7a5e49150a778132809b9a8540a5fbe01':
  Uri encode phone number before passing it to query.
2009-09-21 10:17:42 -07:00
Wei Huang
ecbe986e63 am 9da7d547: am 5ef75b68: Merge change 26125 into eclair
Merge commit '9da7d5476c476dbe13cdabe21b560c368a0aef56'

* commit '9da7d5476c476dbe13cdabe21b560c368a0aef56':
  make PhoneNumberUtils.compareLoosely use MIN_MATCH of 7 instead of 5.
2009-09-21 10:14:35 -07:00
Dmitri Plotnikov
68b4480961 am c1ddb155: am 483a599c: Merge change 25954 into eclair
Merge commit 'c1ddb155b86a916b5e0c712493949c582ab495c2'

* commit 'c1ddb155b86a916b5e0c712493949c582ab495c2':
  Moving DISPLAY_NAME to column "data1" to keep it "aligned" with other data types.
2009-09-21 10:14:24 -07:00
Cary Clark
98890a2d31 am 6b267cce: am 3f06a9b9: Merge change 26150 into eclair
Merge commit '6b267ccec19a9ece5340281bf3035a366861990c'

* commit '6b267ccec19a9ece5340281bf3035a366861990c':
  Account for find dialog height in content height
2009-09-21 10:14:14 -07:00
Chia-chi Yeh
709e3a9d93 am 5f1b3e37: am 596edaf3: Merge change 26156 into eclair
Merge commit '5f1b3e37f24b32f81d5792da1f620bc61e05a402'

* commit '5f1b3e37f24b32f81d5792da1f620bc61e05a402':
  keystore: exclude builds for simulator.
2009-09-21 10:14:05 -07:00
Grace Kloba
cf16d7a684 am f8d8b46a: Add a tip toast for double tap.
Merge commit 'f8d8b46a2c684d51cd661a9d479dd895420a90b2' into eclair-plus-aosp

* commit 'f8d8b46a2c684d51cd661a9d479dd895420a90b2':
  Add a tip toast for double tap.
2009-09-21 10:11:54 -07:00
Megha Joshi
a39a17d7a5 am d5ffa12d: Merge change 26127 into eclair
Merge commit 'd5ffa12dea99233e6a75048d82ad4daf0373191f' into eclair-plus-aosp

* commit 'd5ffa12dea99233e6a75048d82ad4daf0373191f':
  Uri encode phone number before passing it to query.
2009-09-21 10:11:44 -07:00
Grace Kloba
f8d8b46a2c Add a tip toast for double tap.
Fix http://b/issue?id=2059934
2009-09-21 10:10:11 -07:00
Wei Huang
9da7d5476c am 5ef75b68: Merge change 26125 into eclair
Merge commit '5ef75b68fe6ed46213e3499910f389d2c6fda85a' into eclair-plus-aosp

* commit '5ef75b68fe6ed46213e3499910f389d2c6fda85a':
  make PhoneNumberUtils.compareLoosely use MIN_MATCH of 7 instead of 5.
2009-09-21 10:06:36 -07:00
Android (Google) Code Review
d5ffa12dea Merge change 26127 into eclair
* changes:
  Uri encode phone number before passing it to query.
2009-09-21 13:05:10 -04:00
Dmitri Plotnikov
c1ddb155b8 am 483a599c: Merge change 25954 into eclair
Merge commit '483a599c0330da087502b5b75bbe82fe8236cbec' into eclair-plus-aosp

* commit '483a599c0330da087502b5b75bbe82fe8236cbec':
  Moving DISPLAY_NAME to column "data1" to keep it "aligned" with other data types.
2009-09-21 10:01:26 -07:00
Cary Clark
6b267ccec1 am 3f06a9b9: Merge change 26150 into eclair
Merge commit '3f06a9b931f6e3d12215a959f427bc373dacf7cc' into eclair-plus-aosp

* commit '3f06a9b931f6e3d12215a959f427bc373dacf7cc':
  Account for find dialog height in content height
2009-09-21 10:01:16 -07:00
Chia-chi Yeh
5f1b3e37f2 am 596edaf3: Merge change 26156 into eclair
Merge commit '596edaf343b5b3b39b0a32d9a61210cdf6f6cfa0' into eclair-plus-aosp

* commit '596edaf343b5b3b39b0a32d9a61210cdf6f6cfa0':
  keystore: exclude builds for simulator.
2009-09-21 10:01:06 -07:00
Android (Google) Code Review
5ef75b68fe Merge change 26125 into eclair
* changes:
  make PhoneNumberUtils.compareLoosely use MIN_MATCH of 7 instead of 5.
2009-09-21 12:59:57 -04:00
Android (Google) Code Review
483a599c03 Merge change 25954 into eclair
* changes:
  Moving DISPLAY_NAME to column "data1" to keep it "aligned" with other data types.
2009-09-21 12:54:20 -04:00
Android (Google) Code Review
3f06a9b931 Merge change 26150 into eclair
* changes:
  Account for find dialog height in content height
2009-09-21 12:53:04 -04:00
Cary Clark
5bb6b52bf3 Account for find dialog height in content height
Use the set dialog height when the find dialog is up so that
found items at the bottom of the screen are scrolled into view.

This requires a companion change to set the dialog height in
the browser app.

Fixes http://b/issue?id=2122916
2009-09-21 12:48:50 -04:00
Android (Google) Code Review
596edaf343 Merge change 26156 into eclair
* changes:
  keystore: exclude builds for simulator.
2009-09-21 12:47:41 -04:00
Doug Zongker
4ad677c778 am cc36254b: am e256c797: Merge change 26053 into eclair
Merge commit 'cc36254b1639f40bcf4ed27855c1ef92faa89082'

* commit 'cc36254b1639f40bcf4ed27855c1ef92faa89082':
  log hash of account name in sync event log
2009-09-21 09:43:32 -07:00
Bjorn Bringert
021ea92c14 am b1ef743d: am a953ed4b: Merge change 26148 into eclair
Merge commit 'b1ef743df3a436e04f61386151b962d210c6c2ac'

* commit 'b1ef743df3a436e04f61386151b962d210c6c2ac':
  Use icon URI as icon cache key in search dialog
2009-09-21 09:43:22 -07:00
Chia-chi Yeh
0af607264e keystore: exclude builds for simulator. 2009-09-22 00:43:13 +08:00
Doug Zongker
cc36254b16 am e256c797: Merge change 26053 into eclair
Merge commit 'e256c79731ecd412fbf0d566ea6c844ea8e972a1' into eclair-plus-aosp

* commit 'e256c79731ecd412fbf0d566ea6c844ea8e972a1':
  log hash of account name in sync event log
2009-09-21 09:33:08 -07:00
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