drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
28,803 Commits 1 Branch 0 Tags
Commit Graph

10120 Commits

Author SHA1 Message Date
Nick Pelly
4c8fda62e1 am 79e76f52: Merge "Fixed NdefTag parcelable conversion methods." into gingerbread 
Merge commit '79e76f52a6235c01aec64a978e33b89cbb9e1c2e' into gingerbread-plus-aosp

* commit '79e76f52a6235c01aec64a978e33b89cbb9e1c2e':
  Fixed NdefTag parcelable conversion methods.
 2010-10-25 09:09:37 -07:00
Sylvain Fonteneau
e2e4ea9ea8 Fixed NdefTag parcelable conversion methods. 
Also removed call to obsolete openTagConnection() method which was crashing.

Change-Id: Iffd46bd5cad877bb3a82ede298e65ae98322dca9
Signed-off-by: Nick Pelly <npelly@google.com>
 2010-10-25 08:55:36 -07:00
Nick Pelly
d6abaf326b am 145550a0: Merge "Document getPollBytes() and getActivationBytes()." into gingerbread 
Merge commit '145550a00ea59ff20133acc95315e463628e16db' into gingerbread-plus-aosp

* commit '145550a00ea59ff20133acc95315e463628e16db':
  Document getPollBytes() and getActivationBytes().
 2010-10-24 22:11:52 -07:00
Nick Pelly
145550a00e Merge "Document getPollBytes() and getActivationBytes()." into gingerbread 2010-10-24 22:06:15 -07:00
Nick Pelly
416d72f4b6 Document getPollBytes() and getActivationBytes(). 
No code change.

Change-Id: Ideb427b2684b9f9296abefb7c97eabc52db73ee0
Signed-off-by: Nick Pelly <npelly@google.com>
 2010-10-24 22:03:04 -07:00
Dianne Hackborn
c2f78020d3 am 23656899: Merge "Fix issue #3126018: No way to specify NativeActivity\'s native method" into gingerbread 
Merge commit '236568999411214ef440cabc6d12e3bf5f19d8f4' into gingerbread-plus-aosp

* commit '236568999411214ef440cabc6d12e3bf5f19d8f4':
  Fix issue #3126018: No way to specify NativeActivity's native method
 2010-10-24 18:38:11 -07:00
Dianne Hackborn
e21d91c694 Fix issue #3126018: No way to specify NativeActivity's native method 
Change-Id: I59de6a543e7f7f45d963a905829a3f56f32bf8cf
 2010-10-24 14:56:38 -07:00
Nick Pelly
f5b5d177a9 am 07f3bee2: Push Tag/NdefTag implementation details into the service. 
Merge commit '07f3bee2db8b6e93ebbf7222676bd9f468e85569' into gingerbread-plus-aosp

* commit '07f3bee2db8b6e93ebbf7222676bd9f468e85569':
  Push Tag/NdefTag implementation details into the service.
 2010-10-22 18:20:52 -07:00
Nick Pelly
07f3bee2db Push Tag/NdefTag implementation details into the service. 
Tag/NdefTag objects should just be simple data objects. Push the mapping of
internal tag type to public rawTarget/ndefTarget into Nfc Service.

This gives an oppurtunity to clean up some Tag/NdefTag API methods. Most
significantly, adding createMockTag() and createMockNdefTag() to help with
application testing.

There will probably be some more tweaking of the types/targets in
Tag/NdefTag to come, this commit makes that a lot easier.

Also:
- Introduce getActivationBytes() and getPollBytes(). These are just stubs
for NFC service to implement, we have feedback these are really important
to help identify NFC tags.
- Based on outside advice, remove 3B_PRIME (roll into 3B) and TOPAZ (roll
into 3A).

Change-Id: I3e6789c047f6ee5c298bf76c65e0885cf3c15d97
Signed-off-by: Nick Pelly <npelly@google.com>
 2010-10-22 16:29:43 -07:00
Dianne Hackborn
9c7489f8bd am 38993d8d: Merge "Fix issue #3122240: Expose xlarge in GB." into gingerbread 2010-10-22 14:03:08 -07:00
Dianne Hackborn
5383f502e4 Fix issue #3122240: Expose xlarge in GB. 
Plus some other small API cleanup.

Change-Id: I1a3c60f510f99224cccac9cc3f838f04141064f8
 2010-10-22 12:59:20 -07:00
Jeff Hamilton
8783b0e20c am 7c68bc38: Merge "Unhide some NFC APIs that are required for the Tag app." into gingerbread 2010-10-22 12:11:23 -07:00
Jeff Hamilton
da83f513ca Unhide some NFC APIs that are required for the Tag app. 
Change-Id: Ic64e00476132dbf4644de5c465e06fe11a264508
 2010-10-21 23:43:22 -05:00
Jeff Hamilton
de8635e4c4 am 389a440a: Backport ParcelFileDescriptor.createPipe() from master. 
Merge commit '389a440ad13f7b16e8f7c7f1670bdd55f1e2112a' into gingerbread-plus-aosp

* commit '389a440ad13f7b16e8f7c7f1670bdd55f1e2112a':
  Backport ParcelFileDescriptor.createPipe() from master.
 2010-10-21 21:08:20 -07:00
Jeff Hamilton
389a440ad1 Backport ParcelFileDescriptor.createPipe() from master. 
This allows content providers to expose arbitraty data
through the ContentResolver open* APIs.

Change-Id: I408a0b7cee9cdba5654a962098386c012d6b3549
 2010-10-21 22:39:41 -05:00
Dianne Hackborn
101f14b275 am ba501785: Merge "Implement issue #3116702: New manifest tags for supported screen sizes DO NOT MERGE" into gingerbread 
Merge commit 'ba501785c7b298198d1c6e4787fd40e98f97da67' into gingerbread-plus-aosp

* commit 'ba501785c7b298198d1c6e4787fd40e98f97da67':
  Implement issue #3116702: New manifest tags for supported screen sizes  DO NOT MERGE
 2010-10-21 20:17:56 -07:00
Dianne Hackborn
ba501785c7 Merge "Implement issue #3116702: New manifest tags for supported screen sizes DO NOT MERGE" into gingerbread 2010-10-21 19:20:49 -07:00
Jeff Brown
482284ad0e am 6b3178a6: Merge "Fix a race condition in wallpaper move throttling." into gingerbread 
Merge commit '6b3178a6323e015644590ebaee86523e4bb81773' into gingerbread-plus-aosp

* commit '6b3178a6323e015644590ebaee86523e4bb81773':
  Fix a race condition in wallpaper move throttling.
 2010-10-21 18:05:53 -07:00
Jeff Brown
6b3178a632 Merge "Fix a race condition in wallpaper move throttling." into gingerbread 2010-10-21 18:02:54 -07:00
Jeff Brown
840db1f678 Fix a race condition in wallpaper move throttling. 
Bug: 3099316
Change-Id: Ia3221975b5be7fae8359d6ab531bbecd0e29aee9
 2010-10-21 17:36:54 -07:00
Dianne Hackborn
2f1eee3470 am e9dbf208: Merge "Fix issue #3117472: Format storage dialog still broken" into gingerbread 
Merge commit 'e9dbf208e4f72b41dc3961d9d4570d5b69126307' into gingerbread-plus-aosp

* commit 'e9dbf208e4f72b41dc3961d9d4570d5b69126307':
  Fix issue #3117472: Format storage dialog still broken
 2010-10-21 17:35:12 -07:00
Dianne Hackborn
e9dbf208e4 Merge "Fix issue #3117472: Format storage dialog still broken" into gingerbread 2010-10-21 17:28:19 -07:00
Dianne Hackborn
4f6ee254bc Fix issue #3117472: Format storage dialog still broken 
Change-Id: I19b3a04e33785a56cb14457e4e3cd9232f585bb1
 2010-10-21 16:39:53 -07:00
Mathias Agopian
46beb43357 am 0c636055: Merge "Mirror the preview for front-facing cameras. do not merge" into gingerbread 
Merge commit '0c636055351f2e1d26138cf7b3bf3c82553e68c4' into gingerbread-plus-aosp

* commit '0c636055351f2e1d26138cf7b3bf3c82553e68c4':
  Mirror the preview for front-facing cameras. do not merge
 2010-10-21 16:26:02 -07:00
Mathias Agopian
0c63605535 Merge "Mirror the preview for front-facing cameras. do not merge" into gingerbread 2010-10-21 16:20:07 -07:00
Dianne Hackborn
a6d9c7c04c Implement issue #3116702: New manifest tags for supported screen sizes DO NOT MERGE 
Change-Id: Iabf64d86c89d387ffbfbc39f950d308a73fe17eb
 2010-10-21 15:32:06 -07:00
Sylvain Fonteneau
4fc9ecf223 am a71354d7: Enable presence check at application level using RawTagConnection.isConnected() method. 
Merge commit 'a71354d76689802152c33af257092d639c03c421' into gingerbread-plus-aosp

* commit 'a71354d76689802152c33af257092d639c03c421':
  Enable presence check at application level using
 2010-10-21 09:38:49 -07:00
Nick Pelly
c0e93a849f am 7ea5c45e: NFC settings cleanup. 
Merge commit '7ea5c45e8d89f59065f088d4e11cceeeed9d64d1' into gingerbread-plus-aosp

* commit '7ea5c45e8d89f59065f088d4e11cceeeed9d64d1':
  NFC settings cleanup.
 2010-10-21 09:38:15 -07:00
Sylvain Fonteneau
a71354d766 Enable presence check at application level using 
RawTagConnection.isConnected() method.

Also needs packages/apps/Nfc to be updated.

Change-Id: I726e88853e2c4b348f3b87b7574bc6eded7f5b7c
Signed-off-by: Nick Pelly <npelly@google.com>
 2010-10-21 03:54:52 -07:00
Nick Pelly
7ea5c45e8d NFC settings cleanup. 
Remove NFC settings from Settings.System. The NFC Service tracks them
internally using SharedPreference.

Revert back to enable()/disable()/isEnabled() - Tag discovery is the
only functionality NFC service performs right now so we don't need to
break it up more explicitly yet. enable/disable is the global NFC
on/off and later we'll add enableDiscovery(), enableTagEmulation(),
enableSecureElement() etc as needed.

Change-Id: Id5b23e89d4a29511835f509962842452075e56cb
Signed-off-by: Nick Pelly <npelly@google.com>
 2010-10-21 03:54:51 -07:00
Jean-Baptiste Queru
843ff92bb0 resolved conflicts for merge of 5d919b43 to gingerbread-plus-aosp 
Change-Id: I8b8a8dfdd99052f3d43a0feb47168876b41e336d
 2010-10-20 18:16:57 -07:00
Dianne Hackborn
674b856c15 am fb2cd0aa: Merge "Fix java doc on FLAG_EXTERNAL." into gingerbread 
Merge commit 'fb2cd0aa9d140efdf78f0d920d8e3bb7db39c8de' into gingerbread-plus-aosp

* commit 'fb2cd0aa9d140efdf78f0d920d8e3bb7db39c8de':
  Fix java doc on FLAG_EXTERNAL.
 2010-10-20 17:14:59 -07:00
Dianne Hackborn
fb2cd0aa9d Merge "Fix java doc on FLAG_EXTERNAL." into gingerbread 2010-10-20 17:12:27 -07:00
Jean-Baptiste Queru
5d919b4387 Merge "Make disabled TextViews uneditable" 2010-10-20 16:46:52 -07:00
Jean-Baptiste Queru
eceace47c5 am 81925e66: Merge "Fix FastScroller overlay position bug after setFastScrollEnabled(false)-->setFastScrollEnabled(true) the overlay shows up at the top-left instead of center" 
Merge commit '81925e665c1e25d04cbc10e7333e793416bdc98f' into gingerbread-plus-aosp

* commit '81925e665c1e25d04cbc10e7333e793416bdc98f':
  Fix FastScroller overlay position bug
 2010-10-20 16:33:51 -07:00
Dianne Hackborn
eddfc04a08 Fix java doc on FLAG_EXTERNAL. 
Change-Id: Ic533b3a6c3300a986dd8d0da04243d723cf393ef
 2010-10-20 16:03:37 -07:00
Dianne Hackborn
153bf6c8d7 am e9e23405: Merge "Fix issue #3113424: Battery stats don\'t reset on Crespo" into gingerbread 
Merge commit 'e9e23405833a5fedb6a1c2dcec87d84e39d1d13d' into gingerbread-plus-aosp

* commit 'e9e23405833a5fedb6a1c2dcec87d84e39d1d13d':
  Fix issue #3113424: Battery stats don't reset on Crespo
 2010-10-20 14:10:29 -07:00
Dianne Hackborn
b50187237c am 74b1ed32: Fix issue #3113219: NativeActivity using wrong lib path with Java code 
Merge commit '74b1ed3231b8cafcf4e5cb3f03d794acd5080004' into gingerbread-plus-aosp

* commit '74b1ed3231b8cafcf4e5cb3f03d794acd5080004':
  Fix issue #3113219: NativeActivity using wrong lib path with Java code
 2010-10-20 13:56:03 -07:00
Dirk Dougherty
18cbc0e58a am 3466e1fc: Merge "Doc change: escape angle brackets in javadoc comment." into gingerbread 
Merge commit '3466e1fc6db1fed35e2707c67a9ab17673aaf9de' into gingerbread-plus-aosp

* commit '3466e1fc6db1fed35e2707c67a9ab17673aaf9de':
  Doc change: escape angle brackets in javadoc comment.
 2010-10-20 13:54:09 -07:00
Dianne Hackborn
266e607bde Fix issue #3113424: Battery stats don't reset on Crespo 
Change-Id: I38cc3cdfa9cb1466fe3659f001ee57aecf9df179
 2010-10-20 12:26:48 -07:00
Dianne Hackborn
74b1ed3231 Fix issue #3113219: NativeActivity using wrong lib path with Java code 
Use the same path whether the .apk has dalvik code or not.

Change-Id: I66397d7f7e328d5580565ceb17a941afac0e0f8b
 2010-10-20 10:22:45 -07:00
Dirk Dougherty
3466e1fc6d Merge "Doc change: escape angle brackets in javadoc comment." into gingerbread 2010-10-20 09:34:24 -07:00
Wu-cheng Li
b982fb4fd3 Mirror the preview for front-facing cameras. do not merge 
Now overlay does ROT_90 before FLIP_V or FLIP_H. It should be FLIP_V
or FLIP_H first. The formula should be changed after overlay is fixed.

bug:3059865
Change-Id: Ie4366bf7f1fcac7383e8dfc74b1b865997bbbcc6
 2010-10-20 18:29:18 +08:00
Mindy Pereira
62ad0db623 am 6fbc5d9c: DO NOT MERGE. Make sure to invalidate after pulling on an edgeglow. 
Merge commit '6fbc5d9c19388e8f1c9a1833bc0e15fcf6b499f1' into gingerbread-plus-aosp

* commit '6fbc5d9c19388e8f1c9a1833bc0e15fcf6b499f1':
  DO NOT MERGE. Make sure to invalidate after pulling on an edgeglow.
 2010-10-19 18:23:18 -07:00
Mindy Pereira
6fbc5d9c19 DO NOT MERGE. Make sure to invalidate after pulling on an edgeglow. 
Fixes b/3111778 overscroll glitch in news & weather

Change-Id: Ic255da1f7c4301ea3980acc4fa033c9f17a60dac
 2010-10-19 17:38:24 -07:00
Brad Fitzpatrick
6799864d6c am 59993d9b: Merge "Avoid NPE in WebTextView.lineUpScroll -> Touch.getMaxScrollX" into gingerbread 
Merge commit '59993d9bc589089e6be55371c6536a42afe21a64' into gingerbread-plus-aosp

* commit '59993d9bc589089e6be55371c6536a42afe21a64':
  Avoid NPE in WebTextView.lineUpScroll -> Touch.getMaxScrollX
 2010-10-19 12:44:19 -07:00
Brad Fitzpatrick
59993d9bc5 Merge "Avoid NPE in WebTextView.lineUpScroll -> Touch.getMaxScrollX" into gingerbread 2010-10-19 12:40:53 -07:00
Joe Onorato
368fdba47a am bdf1706a: Merge "Reduce logging." into gingerbread 
Merge commit 'bdf1706ac680c0fe74765b8d6d34823b8ac05306' into gingerbread-plus-aosp

* commit 'bdf1706ac680c0fe74765b8d6d34823b8ac05306':
  Reduce logging.
 2010-10-19 12:29:43 -07:00
Brad Fitzpatrick
5a67749a35 am 987e8d7f: Merge "Fix Vibrator permission CTS test broken earlier." into gingerbread 
Merge commit '987e8d7f9748018d3fee5778645b267a9ee06ff6' into gingerbread-plus-aosp

* commit '987e8d7f9748018d3fee5778645b267a9ee06ff6':
  Fix Vibrator permission CTS test broken earlier.
 2010-10-19 12:25:46 -07:00
Joe Onorato
bdf1706ac6 Merge "Reduce logging." into gingerbread 2010-10-19 12:23:51 -07:00