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

48713 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Robert Greenwalt
b1c6b0f1e2 Fix the build. 
Fix a bad merge.

Change-Id: I45d418a8868c9cab1b142ef997ad1d3550d11eee
 2011-03-31 10:44:47 -07:00
Wink Saville
7c701a09c8 am 72ec108b: am b136aa6c: Merge "Telephony: Update LTE RILConstants to match ril.h" into honeycomb-LTE 
* commit '72ec108b0c1f6aa8615974c3dbb63cc02d1b1391':
  Telephony: Update LTE RILConstants to match ril.h
 2011-03-31 10:28:10 -07:00
Wink Saville
72ec108b0c am b136aa6c: Merge "Telephony: Update LTE RILConstants to match ril.h" into honeycomb-LTE 
* commit 'b136aa6c9a1c043ff91357cea9e0b6597c904507':
  Telephony: Update LTE RILConstants to match ril.h
 2011-03-31 10:26:12 -07:00
Wink Saville
b136aa6c9a Merge "Telephony: Update LTE RILConstants to match ril.h" into honeycomb-LTE 2011-03-31 10:23:11 -07:00
Michael Jurka
1e6a12fb32 Merge "Fix the build" 2011-03-30 20:08:31 -07:00
Jim Miller
27e61e454f Merge "Get LockScreen working on phones." 2011-03-30 20:07:50 -07:00
Michael Jurka
8fad7ee11f Fix the build 
Revert "am 047f9d12: Merge "resolved conflicts for merge of ce6766ea to honeycomb-plus-aosp" into honeycomb-plus-aosp"

This reverts commit 352f2c33d3b8a0b73dcdab98c7a77f698578b048, reversing
changes made to ce8a55db6feae11c1db45a868a7d8a0e7d105471.
 2011-03-30 19:57:12 -07:00
Jim Miller
ad32bf4844 Get LockScreen working on phones. 
Not the final UI, but it works.

Change-Id: Ia31d23069b2c365f711cb9d0a664648623554768
 2011-03-30 18:53:18 -07:00
Glenn Kasten
ffa670b5b0 Bug 4167061 
Change-Id: I9bf7c0f9387ad23501261b8c2d10fa6fdaba8aef
 2011-03-30 18:50:41 -07:00
Fabrice Di Meglio
0fb1ac0038 Merge "Code cleaning - suppress non useful code" 2011-03-30 18:39:38 -07:00
Fabrice Di Meglio
99e95b0e12 Code cleaning - suppress non useful code 
Change-Id: I3f3bffdd1f5d64a6b601d56bee3b5fc8147086bd
 2011-03-30 17:59:19 -07:00
Dianne Hackborn
47015057b1 am fd10e6ac: am a5b308e7: am 53df89c7: Merge "Expand screen documentation with explicit screen size dimensions." into honeycomb-mr1 
* commit 'fd10e6ac5811f716954afdb91f9231d7fbaa0718':
  Expand screen documentation with explicit screen size dimensions.
 2011-03-30 17:55:38 -07:00
Dianne Hackborn
fd10e6ac58 am a5b308e7: am 53df89c7: Merge "Expand screen documentation with explicit screen size dimensions." into honeycomb-mr1 
* commit 'a5b308e74c44722b9414fa9be52eabacd23029b2':
  Expand screen documentation with explicit screen size dimensions.
 2011-03-30 17:53:44 -07:00
Dianne Hackborn
a5b308e74c am 53df89c7: Merge "Expand screen documentation with explicit screen size dimensions." into honeycomb-mr1 
* commit '53df89c74fb3a31a874ad575467c5d498a53646e':
  Expand screen documentation with explicit screen size dimensions.
 2011-03-30 17:50:29 -07:00
Dianne Hackborn
53df89c74f Merge "Expand screen documentation with explicit screen size dimensions." into honeycomb-mr1 2011-03-30 17:43:17 -07:00
Fabrice Di Meglio
70896f0535 Merge "Update TextLayoutCache key for supporting more SkPaint properties" 2011-03-30 17:34:42 -07:00
Jeff Brown
e028290d01 Merge "Add input filter mechanism for accessibility." 2011-03-30 17:20:56 -07:00
Jeff Brown
a386952528 Merge "Move accessibility manager service to own package." 2011-03-30 17:20:50 -07:00
Jeff Brown
0029c66203 Add input filter mechanism for accessibility. 
This patch adds a mechanism for capturing, filtering, transforming
and injecting input events at a very low level before the input
dispatcher attempts to deliver them to applications.  At this time,
the mechanism is only intended to be used by the accessibility
system to implement built-in system-level accessibility affordances.

The accessibility input filter is currently just a stub.
It logs the input events receives and reinjects them unchanged,
except that it transforms KEYCODE_Q into KEYCODE_Z.

Currently, the accessibility input filter is installed whenever
accessibility is enabled.  We'll probably want to change that
so it only enables the input filter when a screen reader is
installed and we want touch exploration.

Change-Id: I35764fdf75522b69d09ebd78c9766eb7593c1afe
 2011-03-30 16:55:15 -07:00
Justin Ho
bacdc8108a am 0b397314: am 0b251aec: am 01b13a11: Merge "Replacing browser playback controls for inactive videos Bug: 4136024" into honeycomb-mr1 
* commit '0b3973143191962d3c4372523ed450f6a5bf0863':
  Replacing browser playback controls for inactive videos Bug: 4136024
 2011-03-30 16:41:41 -07:00
Trevor Johns
7b3e4c9254 am f9784a50: am f829305f: am e1cc88cc: am eb344a69: Fixing line in Market IAB docs that explains how to bind to the MarketService. 
* commit 'f9784a5051a4c202223f2a777e37a00af23818c8':
  Fixing line in Market IAB docs that explains how to bind to the MarketService.
 2011-03-30 16:41:27 -07:00
Andreas Huber
6c3f60e3d5 am 399792b8: am 06ac0399: am b676b73e: Merge "When http streaming and Content-Length is unknown, make sure to return all" into honeycomb-mr1 
* commit '399792b83174a835840a4f47adcd34aed4e0b9ba':
  When http streaming and Content-Length is unknown, make sure to return all
 2011-03-30 16:40:43 -07:00
Jeff Hamilton
284f965a59 am 016f8847: am b9896794: am 96cf34d3: Merge "Make STOP_APP_SWITCHES signatureOrSystem." into gingerbread 
* commit '016f8847471a9d4ffe6a03c29e0600529d51d929':
  Make STOP_APP_SWITCHES signatureOrSystem.
 2011-03-30 16:40:34 -07:00
Irfan Sheriff
862f161916 am c48dfd5d: (-s ours) am 11ebb6f5: (-s ours) am 05f14e2b: Merge "DO NOT MERGE Pick upstream intf with valid IP conf" into gingerbread 
* commit 'c48dfd5db6fa956be603d3c7479e3f672daea30e':
  DO NOT MERGE Pick upstream intf with valid IP conf
 2011-03-30 16:40:30 -07:00
Robert Greenwalt
352f2c33d3 am 047f9d12: Merge "resolved conflicts for merge of ce6766ea to honeycomb-plus-aosp" into honeycomb-plus-aosp 
* commit '047f9d12976d90d0931a64a256bb4843d77f5e20':
  Fix some alt-network issues.
 2011-03-30 16:40:23 -07:00
Eric Fischer
ce8a55db6f am b97b78fe: (-s ours) am acf48255: am 91c482b2: Merge "Import revised translations. DO NOT MERGE" into honeycomb-mr1 
* commit 'b97b78fe61424bd1948bc0b8d039da356774614e':
  Import revised translations.  DO NOT MERGE
 2011-03-30 16:40:15 -07:00
Scott Main
4cead493fd am 02a7f8eb: am 5c35c059: am 5b68c655: Merge "docs: update makefile to show javadocs diffs for api level 12" into honeycomb-mr1 
* commit '02a7f8eb3a5680a5b4c00b649b461bcb65c665e4':
  docs: update makefile to show javadocs diffs for api level 12
 2011-03-30 16:40:03 -07:00
Andreas Huber
05e11b29b2 am 66ec9068: am 8de5df43: am ebf6a72b: Merge "Surfaceflinger expects rectangles to be specified right/bottom edge exclusive." into honeycomb-mr1 
* commit '66ec90687f3579fe73f6baa2a188f8a4583167a3':
  Surfaceflinger expects rectangles to be specified right/bottom edge exclusive.
 2011-03-30 16:38:38 -07:00
The Android Open Source Project
67a8f940c0 am 761e4500: am 5e1383f2: am ad663d80: Merge from gingerbread 
* commit '761e4500f31fe59748a53a4f6a85daccf5cd3467':
  egl: fixes for object refcounts
 2011-03-30 16:38:24 -07:00
Brad Fitzpatrick
d117428bf9 am 5db7fd6b: am f7a9b869: am 1e7fb7ae: Merge "Error in compound cache-control header." 
* commit '5db7fd6b70f47f31fbc59f92907b9807f9c4e64d':
  Error in compound cache-control header.
 2011-03-30 16:38:18 -07:00
Brad Fitzpatrick
36bafb0b7d am 0ddcc8bc: am b618b2ef: am f0dbf00d: Merge "Handle OutOfMemoryError when decoding images in ThumbnailUtils" 
* commit '0ddcc8bc60ffa00e103f420f95b7f8a7c77639b6':
  Handle OutOfMemoryError when decoding images in ThumbnailUtils
 2011-03-30 16:38:03 -07:00
Brad Fitzpatrick
b9d173ce8f am f6809853: am 7a84a60d: am 1a5a2379: Merge "Unregister callback from binder when vibration is removed" 
* commit 'f68098534e42b33cd4588bb2d2ba34ab579e11aa':
  Unregister callback from binder when vibration is removed
 2011-03-30 16:37:58 -07:00
Mike Lockwood
d0b4e9611d am 08d5de83: am cd90d1f1: am 44e4b99f: Merge "UsbService: Make USB disconnect handling for accessory mode more robust" into honeycomb-mr1 
* commit '08d5de83393dbd4d31893d96e4871a8a3628a2cd':
  UsbService: Make USB disconnect handling for accessory mode more robust
 2011-03-30 16:33:40 -07:00
Jeff Hamilton
f9fb0abbd6 am 0c691f0e: am ad91eee2: am 9c1ef098: Update the value for the NFC shared UID. 
* commit '0c691f0eb3bc844e778f9a61e777076658879dfd':
  Update the value for the NFC shared UID.
 2011-03-30 16:31:27 -07:00
Teng-Hui Zhu
29c7ae5c60 Merge "Buffering in full screen mode will show progressView" 2011-03-30 16:19:07 -07:00
Dianne Hackborn
2f98f26708 Expand screen documentation with explicit screen size dimensions. 
This updates the various documentation on screen sizes to discuss
the exact screen dimensions that are now associated with each size.
In addition, the screen sizes vs. densities table is updated to
include a number of additional representative screens.

Change-Id: Id07491148b1857e0265cef7139e564e190f38e03
 2011-03-30 16:19:02 -07:00
Fabrice Di Meglio
aabe537f1e Update TextLayoutCache key for supporting more SkPaint properties 
Change-Id: I35bb991e536e662c1a0724ab7e311fba3d52487a
 2011-03-30 16:06:02 -07:00
Teng-Hui Zhu
f4d4e9e05f Buffering in full screen mode will show progressView 
bug:4187252
Change-Id: Ieb7ae26b5bfa9abc79556e2fc063b7e3ef17ab52
 2011-03-30 16:05:27 -07:00
Justin Ho
0b39731431 am 0b251aec: am 01b13a11: Merge "Replacing browser playback controls for inactive videos Bug: 4136024" into honeycomb-mr1 
* commit '0b251aec4307d566ebb1a95f8b1136d6d5b8d5a6':
  Replacing browser playback controls for inactive videos Bug: 4136024
 2011-03-30 16:00:50 -07:00
Justin Ho
0b251aec43 am 01b13a11: Merge "Replacing browser playback controls for inactive videos Bug: 4136024" into honeycomb-mr1 
* commit '01b13a11e6492ebba66c496eaefdb008f2638870':
  Replacing browser playback controls for inactive videos Bug: 4136024
 2011-03-30 15:59:19 -07:00
Justin Ho
01b13a11e6 Merge "Replacing browser playback controls for inactive videos Bug: 4136024" into honeycomb-mr1 2011-03-30 15:57:42 -07:00
Trevor Johns
f9784a5051 am f829305f: am e1cc88cc: am eb344a69: Fixing line in Market IAB docs that explains how to bind to the MarketService. 
* commit 'f829305f8706e32fa103e5ee9eef7c595642d1a2':
  Fixing line in Market IAB docs that explains how to bind to the MarketService.
 2011-03-30 15:30:56 -07:00
Mathias Agopian
a51e9fd53d Merge "Revert "retire android_native_window_t"" 2011-03-30 15:30:39 -07:00
Trevor Johns
f829305f87 am e1cc88cc: am eb344a69: Fixing line in Market IAB docs that explains how to bind to the MarketService. 
* commit 'e1cc88ccaf5fec2671c2f50bd850e7c56b03f286':
  Fixing line in Market IAB docs that explains how to bind to the MarketService.
 2011-03-30 15:29:10 -07:00
Mathias Agopian
2c34190702 Revert "retire android_native_window_t" 
this type is still used by partner's source trees.
we will get rid of it in next release's timeframe.

This reverts commit 7b49b976277cb3538242151e7dbd24681ddec73e.
 2011-03-30 15:28:21 -07:00
Trevor Johns
e1cc88ccaf am eb344a69: Fixing line in Market IAB docs that explains how to bind to the MarketService. 
* commit 'eb344a69fa728c010425fb1e18fc8f5774693986':
  Fixing line in Market IAB docs that explains how to bind to the MarketService.
 2011-03-30 15:26:38 -07:00
Andreas Huber
399792b831 am 06ac0399: am b676b73e: Merge "When http streaming and Content-Length is unknown, make sure to return all" into honeycomb-mr1 
* commit '06ac039962c7f15938afc4bbb74c2f14de4dc505':
  When http streaming and Content-Length is unknown, make sure to return all
 2011-03-30 15:22:57 -07:00
Andreas Huber
06ac039962 am b676b73e: Merge "When http streaming and Content-Length is unknown, make sure to return all" into honeycomb-mr1 
* commit 'b676b73e391b10a4ec5fbd6a1a02054fb3d8aa4b':
  When http streaming and Content-Length is unknown, make sure to return all
 2011-03-30 15:19:46 -07:00
Jeff Hamilton
016f884747 am b9896794: am 96cf34d3: Merge "Make STOP_APP_SWITCHES signatureOrSystem." into gingerbread 
* commit 'b98967942e9a764b80abc8ff1c6f6f2d620c0f7a':
  Make STOP_APP_SWITCHES signatureOrSystem.
 2011-03-30 15:18:30 -07:00
Irfan Sheriff
c48dfd5db6 am 11ebb6f5: (-s ours) am 05f14e2b: Merge "DO NOT MERGE Pick upstream intf with valid IP conf" into gingerbread 
* commit '11ebb6f5020761b9b8373a5e0d777fb91a2b92c2':
  DO NOT MERGE Pick upstream intf with valid IP conf
 2011-03-30 15:18:23 -07:00