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

12403 Commits

Author SHA1 Message Date
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
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
Brad Fitzpatrick
0c55136893 am 15358e14: Merge "Make the base direction of the Arabic error pages RTL" 
Merge commit '15358e145622df90942a444a63ae0006713b636d' into gingerbread-plus-aosp

* commit '15358e145622df90942a444a63ae0006713b636d':
  Make the base direction of the Arabic error pages RTL
 2010-10-21 09:10:55 -07:00
Brad Fitzpatrick
ba1b1c9c22 am 6cf9c394: Merge "Set the base direction of the Hebrew error pages to RTL" 
Merge commit '6cf9c39452c87fe424a0ca125cf797e1c5e0830b' into gingerbread-plus-aosp

* commit '6cf9c39452c87fe424a0ca125cf797e1c5e0830b':
  Set the base direction of the Hebrew error pages to RTL
 2010-10-21 09:10:47 -07:00
Brad Fitzpatrick
15358e1456 Merge "Make the base direction of the Arabic error pages RTL" 2010-10-21 07:18:18 -07:00
Brad Fitzpatrick
6cf9c39452 Merge "Set the base direction of the Hebrew error pages to RTL" 2010-10-21 07:18:02 -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
Jean-Baptiste Queru
81925e665c Merge "Fix FastScroller overlay position bug after setFastScrollEnabled(false)-->setFastScrollEnabled(true) the overlay shows up at the top-left instead of center" 2010-10-20 16:29:15 -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
e9e2340583 Merge "Fix issue #3113424: Battery stats don't reset on Crespo" into gingerbread 2010-10-20 14:08:26 -07:00
Justin Ho
a747b43993 am d5aaff54: Merge "DO NOT MERGE - Updated media playback transport controls (b/3116268)" into gingerbread 
Merge commit 'd5aaff548d62c07fb5fb2d47e58161e77c401616' into gingerbread-plus-aosp

* commit 'd5aaff548d62c07fb5fb2d47e58161e77c401616':
  DO NOT MERGE - Updated media playback transport controls (b/3116268)
 2010-10-20 14:04:00 -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
Justin Ho
d5aaff548d Merge "DO NOT MERGE - Updated media playback transport controls (b/3116268)" into gingerbread 2010-10-20 13:35:40 -07:00
Justin Ho
6312822111 DO NOT MERGE - Updated media playback transport controls (b/3116268) 
Change-Id: Ic496308d4f72e9135e35a1b29bc20feb990c3507
 2010-10-20 12:44:46 -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
Shachar Shemesh
2fdf272855 Make the base direction of the Arabic error pages RTL 
Change-Id: I10df9cb92d18850e8893298b2edfd9e57ca5cfef
 2010-10-20 11:01:32 -07:00
Shachar Shemesh
56a7739755 Set the base direction of the Hebrew error pages to RTL 
Change-Id: I435e724f9638e294b7e03527e7c6244a307f010e
 2010-10-20 11:01:26 -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
Jean-Baptiste Queru
2cead908f4 am db723ea0: Merge "jni: Remove duplicated jniThrowException()" 
Merge commit 'db723ea0f70392f712542edb1114fc15e782cdb7' into gingerbread-plus-aosp

* commit 'db723ea0f70392f712542edb1114fc15e782cdb7':
  jni: Remove duplicated jniThrowException()
 2010-10-19 15:22:13 -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
Brad Fitzpatrick
44d2c69ad3 Avoid NPE in WebTextView.lineUpScroll -> Touch.getMaxScrollX 
Bug: 3110967
Change-Id: I156070956528c8c7d1eb6db5d2e8bb1fe119178d
 2010-10-19 12:19:41 -07:00
Joe Onorato
431bb22695 Reduce logging. 
Remember, the system and main logs are
    - Shared resources
    - Primarily for recording problems
    - To be used only for large grained events during normal operation

Bug: 3104855
Change-Id: I136fbd101917dcbc8ebc3f96f276426b48bde7b7
 2010-10-19 15:08:05 -04:00
Brad Fitzpatrick
26e9cf38b2 Fix Vibrator permission CTS test broken earlier. 
Bug: 3106964
Change-Id: I76138780ac64f761fe09ef8ba74382c7ee05d794
 2010-10-19 11:02:20 -07:00
Wu-cheng Li
9bf511db85 am f73d48d7: Merge "Fix some camera orientation javadoc errors." into gingerbread 
Merge commit 'f73d48d754b11f6ed0fba017f5bc8f27acdfbe4f' into gingerbread-plus-aosp

* commit 'f73d48d754b11f6ed0fba017f5bc8f27acdfbe4f':
  Fix some camera orientation javadoc errors.
 2010-10-19 08:44:13 -07:00
Wu-cheng Li
2fe6fcaff4 Fix some camera orientation javadoc errors. 
bug:3105659
Change-Id: I0e54f6dd3aa8aeb2494f2596130a5aeb9e1449ba
 2010-10-19 19:14:04 +08:00
Sylvain Fonteneau
824de4b3e3 am dd7341f7: Added missing implementation for NdefRecord. 
Merge commit 'dd7341f775ca4d86091f4106d6dfef9214073a7d' into gingerbread-plus-aosp

* commit 'dd7341f775ca4d86091f4106d6dfef9214073a7d':
  Added missing implementation for NdefRecord.
 2010-10-18 19:13:29 -07:00
Sylvain Fonteneau
dd7341f775 Added missing implementation for NdefRecord. 
Implemented constructor using a byte array to parse.
Added missing exception in method declaration, leading to update api/current.xml

Change-Id: I2660484aef1225e90c2f32a572041a2c3aecf288
 2010-10-18 19:09:26 -07:00
Dianne Hackborn
69a19fdbff am 3d2818d3: Remove public resource padding. 
Merge commit '3d2818d34feab5a62dfb33452f99f2d3ca667cc8' into gingerbread-plus-aosp

* commit '3d2818d34feab5a62dfb33452f99f2d3ca667cc8':
  Remove public resource padding.
 2010-10-18 18:41:12 -07:00
Dianne Hackborn
3d2818d34f Remove public resource padding. 
Change-Id: I8a530a23284a1f2515b1340a1c5e5ed3a0b90780
 2010-10-18 18:20:02 -07:00