ADHOC/replicant-frameworks_native
3
0
Fork 0
Code Issues 1 Pull Requests Releases Wiki Activity
5,488 Commits 2 Branches 0 Tags 54 MiB
de3519363c
Commit Graph

5488 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Mark Wagner
ee908aa1f4 am fe6104fb: When manually setting the uri pass it through to the badge widget. 
Merge commit 'fe6104fbfbba0434e78f9e21f460c71cddfe8449' into eclair-plus-aosp

* commit 'fe6104fbfbba0434e78f9e21f460c71cddfe8449':
  When manually setting the uri pass it through to the badge widget.
 2009-09-21 13:53:37 -07:00
Jeff Sharkey
918acb9d76 am 88a83d3f: Update getDisplayLabel() API to support new types. 
Merge commit '88a83d3f108dcf01443b241439e14eedbd9615f5' into eclair-plus-aosp

* commit '88a83d3f108dcf01443b241439e14eedbd9615f5':
  Update getDisplayLabel() API to support new types.
 2009-09-21 13:36:58 -07:00
Christopher Tate
4e5f696f10 am 9568fb21: Merge change 26164 into eclair 
Merge commit '9568fb21766684083ec256303a6ed7949ada7d9f' into eclair-plus-aosp

* commit '9568fb21766684083ec256303a6ed7949ada7d9f':
  Reset backup tracking in response to transport data-wipe notification
 2009-09-21 13:21:40 -07:00
Android (Google) Code Review
24aa451138 Merge change 26164 into eclair 
* changes:
  Reset backup tracking in response to transport data-wipe notification
 2009-09-21 16:13:48 -04:00
Leon Scroggins
3ab54b8bd1 am d3997e55: Make scrolling textfields work better in the browser. 
Merge commit 'd3997e556eb0509248c72b668c2cd955b7842b55' into eclair-plus-aosp

* commit 'd3997e556eb0509248c72b668c2cd955b7842b55':
  Make scrolling textfields work better in the browser.
 2009-09-21 13:11:45 -07:00
Jaikumar Ganesh
3813093c80 am 163be61c: Merge change 25412 into eclair 
Merge commit '163be61ce5ea85181da3a8908adaa63b5ff56a7e' into eclair-plus-aosp

* commit '163be61ce5ea85181da3a8908adaa63b5ff56a7e':
  Make ParcelUuid helper functions consistent.
 2009-09-21 12:46:08 -07:00
Chia-chi Yeh
680e945278 am e3578d60: Merge change 26190 into eclair 
Merge commit 'e3578d60c6fbe17c116048a6b4de60b0ac42961f' into eclair-plus-aosp

* commit 'e3578d60c6fbe17c116048a6b4de60b0ac42961f':
  KeyStore: rename scan() to saw().
 2009-09-21 12:45:58 -07:00
Android (Google) Code Review
5f61d2f647 Merge change 25412 into eclair 
* changes:
  Make ParcelUuid helper functions consistent.
 2009-09-21 15:37:21 -04:00
Android (Google) Code Review
bb8f33277a Merge change 26190 into eclair 
* changes:
  KeyStore: rename scan() to saw().
 2009-09-21 15:06:18 -04:00
Chia-chi Yeh
ec102d90d8 am e045e129: Merge change 26188 into eclair 
Merge commit 'e045e129a98ae3a4e396abe377f1b00dff6a2460' into eclair-plus-aosp

* commit 'e045e129a98ae3a4e396abe377f1b00dff6a2460':
  keystore: rename scan() to saw().
 2009-09-21 12:04:55 -07:00
Leon Scroggins
247f375e67 am 83f7bd0a: Merge change 26170 into eclair 
Merge commit '83f7bd0a9bb563e18fc16fe60b923d65accd9dfe' into eclair-plus-aosp

* commit '83f7bd0a9bb563e18fc16fe60b923d65accd9dfe':
  Always interpret (0,0) scrolls as top of title bar.
 2009-09-21 12:00:00 -07:00
Android (Google) Code Review
b14d269317 Merge change 26188 into eclair 
* changes:
  keystore: rename scan() to saw().
 2009-09-21 14:58:43 -04:00
Chia-chi Yeh
1cdc2a4b81 keystore: rename scan() to saw(). 2009-09-22 02:57:52 +08:00
Evan Millar
6babc84ca7 am 3242cbbf: Merge change 26181 into eclair 
Merge commit '3242cbbf82b515397151522d0a6228403e9eec23' into eclair-plus-aosp

* commit '3242cbbf82b515397151522d0a6228403e9eec23':
  Make background color pure black.
 2009-09-21 11:54:58 -07:00
Android (Google) Code Review
afd6d3d4a8 Merge change 26170 into eclair 
* changes:
  Always interpret (0,0) scrolls as top of title bar.
 2009-09-21 14:53:19 -04:00
Android (Google) Code Review
e9410afff5 Merge change 26181 into eclair 
* changes:
  Make background color pure black.
 2009-09-21 14:47:52 -04:00
Daisuke Miyakawa
06887754a6 am a13ccc90: Merge change 26175 into eclair 
Merge commit 'a13ccc908ee54d6c606b5a73b3a57e4dda13e44a' into eclair-plus-aosp

* commit 'a13ccc908ee54d6c606b5a73b3a57e4dda13e44a':
  Fix test for phone number comparation. Now that there are two algorithms, we should consider them in Java layer.
 2009-09-21 10:58:23 -07:00
Wink Saville
76acbf5b5c am 8451c25b: Merge change 26171 into eclair 
Merge commit '8451c25b919ecef694d293d6bbd84d08d5fb60be' into eclair-plus-aosp

* commit '8451c25b919ecef694d293d6bbd84d08d5fb60be':
  Fix several CDMA call collision cases
 2009-09-21 10:58:13 -07:00
Android (Google) Code Review
fde637477f Merge change 26175 into eclair 
* changes:
  Fix test for phone number comparation. Now that there are two algorithms, we should consider them in Java layer. Uguu.
 2009-09-21 13:52:02 -04:00
Android (Google) Code Review
f46ca7fa8c Merge change 26171 into eclair 
* changes:
  Fix several CDMA call collision cases
 2009-09-21 13:50:27 -04:00
Grace Kloba
5080d7b4eb 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
42fc4a1e99 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
Wei Huang
475fba9173 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
4654d31432 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
7500a58b89 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
52c265af42 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
9467f7242c 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
9bce0c61cb 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
819e3cd278 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
773ee615cf Merge change 26150 into eclair 
* changes:
  Account for find dialog height in content height
 2009-09-21 12:53:04 -04:00
Android (Google) Code Review
c204933821 Merge change 26156 into eclair 
* changes:
  keystore: exclude builds for simulator.
 2009-09-21 12:47:41 -04:00
Chia-chi Yeh
c5dbc5e98a keystore: exclude builds for simulator. 2009-09-22 00:43:13 +08:00
Doug Zongker
3f154dbaff 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
143af38f50 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
Android (Google) Code Review
9c203eb27e Merge change 26053 into eclair 
* changes:
  log hash of account name in sync event log
 2009-09-21 12:21:14 -04:00
Android (Google) Code Review
b00928c82e 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
7d4391010d 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
Brad Fitzpatrick
69dcbaa42a 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
15b047cfb2 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
Bjorn Bringert
3a4c149b6b 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
Bryan Mawhinney
fe70dc2f8b 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
Bjorn Bringert
dd17e448c5 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
5b3a237751 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
19a8448af0 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
72bc4b830e 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
25967c26be Merge change 26109 into eclair 
* changes:
  KeyStore: add java interface.
 2009-09-21 04:25:28 -04:00
Android (Google) Code Review
ed4ab787dc 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
20773a80f3 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
b964d98ad3 Merge change 25737 into eclair 
* changes:
  keystore: switch to multi-user version.
 2009-09-20 23:41:13 -04:00
Chia-chi Yeh
dd2a71eebc keystore: enable delete(), scan(), exist() when keystore is locked. 
Also check end-of-file explicitly.
 2009-09-21 11:36:33 +08:00