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

64406 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
The Android Open Source Project
b3ec8b5325 am d5280e51: Reconcile with ics-mr0-release 
* commit 'd5280e51aa4578ff47bffc166f74d79c17358589':
 2011-11-18 13:16:16 -08:00
The Android Open Source Project
d5280e51aa Reconcile with ics-mr0-release 
Change-Id: I805d2b484b72fb640a889ff2a4b67944cbbe012a
 2011-11-18 13:12:33 -08:00
Mathias Agopian
6166318fd5 am 4d71053b: Merge "attempt to fix bug 5313580" into ics-mr1 
* commit '4d71053b0728b248d80d7d5a098df459722e2be0':
  attempt to fix bug 5313580
 2011-11-18 12:13:55 -08:00
Mathias Agopian
4d71053b07 Merge "attempt to fix bug 5313580" into ics-mr1 2011-11-18 12:11:15 -08:00
Bart Sears
29df4a87a7 am e6a96560: Merge "Content and viewport rects set in one step." into ics-mr1 
* commit 'e6a96560ed96e5121db2e22168698f14338c8f1d':
  Content and viewport rects set in one step.
 2011-11-18 11:49:40 -08:00
Bart Sears
e6a96560ed Merge "Content and viewport rects set in one step." into ics-mr1 2011-11-18 11:46:26 -08:00
Svetoslav Ganov
84dd52e394 Text selection AccessibilityEvents are missing text. 
The text selection change event was not added to the text
populating accessibility events in View.

bug:5638709

Change-Id: Ie7e319bc07d7e6c48f178a6c1bd22b1fe32ff515
 2011-11-18 10:26:54 -08:00
Svetoslav Ganov
803d2e21b5 am 0358787f: Merge "Add the support libraries to the platform documentation (build)." into ics-mr1 
* commit '0358787f68c48fb10f2d8067fd53f0471481320a':
  Add the support libraries to the platform documentation (build).
 2011-11-18 10:13:57 -08:00
Svetoslav Ganov
0358787f68 Merge "Add the support libraries to the platform documentation (build)." into ics-mr1 2011-11-18 10:11:35 -08:00
Kristian Monsen
4aad1022eb Improving PictureListener deprecating comments 
Change-Id: If189823962c49db9681845996e97eec31fedcca6
 2011-11-18 17:09:12 +00:00
Daniel Sandler
2d54536d08 Dreams (now Screen Candy) development. 
- support for global "disable" setting
- renamed settings provider keys to remove "DREAM"

Bug: 5591015
Change-Id: I31f31b3ca6001fec1e0032a49cdf0d10df7b0ec7
 2011-11-18 08:00:04 -08:00
Joe Fernandez
a8ad94f20d am dea90a0e: am 366113fa: Merge "docs: Camera Features for developers" into ics-mr0 
* commit 'dea90a0e1c9c1d15657024893b6793dc21bc27ef':
  docs: Camera Features for developers
 2011-11-18 06:16:30 -08:00
Joe Fernandez
dea90a0e1c am 366113fa: Merge "docs: Camera Features for developers" into ics-mr0 
* commit '366113fa1bea5ef39cf6557f18ff00310eb6e458':
  docs: Camera Features for developers
 2011-11-18 06:14:01 -08:00
Scott Main
b01c9c2160 am d353df8d: am 48eaa6c9: docs: update caption for action bar figure to match new screenshot 
* commit 'd353df8db4f51868e1e09463b2c25e3637ad8e95':
  docs: update caption for action bar figure to match new screenshot
 2011-11-18 02:53:08 -08:00
Scott Main
d353df8db4 am 48eaa6c9: docs: update caption for action bar figure to match new screenshot 
* commit '48eaa6c9e5ab224201b17d2ea3e7e43e04c40f3b':
  docs: update caption for action bar figure to match new screenshot
 2011-11-18 02:49:49 -08:00
Wu-cheng Li
b838d8d4a2 Unlock camera AWB lock only when white-balance is changed. 
bug:5633546
Change-Id: I90bb4b5b445daedf38a64e2f8fb980fc0f0aaa81
 2011-11-18 15:21:47 +08:00
Daniel Sandler
cbb2f06947 am da0e7b0c: Merge "Tie screen saver to the screen off timeout." into ics-mr1 
* commit 'da0e7b0c7a0bb1f9f972c3ed042b8cd752031046':
  Tie screen saver to the screen off timeout.
 2011-11-17 21:04:35 -08:00
Daniel Sandler
da0e7b0c7a Merge "Tie screen saver to the screen off timeout." into ics-mr1 2011-11-17 21:02:40 -08:00
Adam Powell
9a842408c8 am 8c54182f: Merge "Fix bug 5614962 - Constant spinning wheel in USB Mass Storage screen (UX)" into ics-mr1 
* commit '8c54182f0b6c706adc6247d6f1da7147b357920d':
  Fix bug 5614962 - Constant spinning wheel in USB Mass Storage screen (UX)
 2011-11-17 19:45:50 -08:00
Adam Powell
8c54182f0b Merge "Fix bug 5614962 - Constant spinning wheel in USB Mass Storage screen (UX)" into ics-mr1 2011-11-17 19:44:14 -08:00
Jim Miller
1a5163dbc5 am 70bded0a: Merge "Fix 5636798: clear PIN/PUK fields when device sleeps or user cancels" into ics-mr1 
* commit '70bded0ab8390cb53342f1fb1f1ff9ee56f60e5f':
  Fix 5636798: clear PIN/PUK fields when device sleeps or user cancels
 2011-11-17 18:59:40 -08:00
Jim Miller
70bded0ab8 Merge "Fix 5636798: clear PIN/PUK fields when device sleeps or user cancels" into ics-mr1 2011-11-17 18:58:20 -08:00
Mathias Agopian
90cbbd1f7f attempt to fix bug 5313580 
the working theory here is that a Surface object has become non-promotable
because it lost its last reference; later Surface::readFromParcel is called
the previous surface is found in the cache, but can't be promoted. this causes
a new Surface object to be created which will promptly try to connect to the
CPU_API -- this in turn will fail because the previous (now dead) surface is
still connected.

To fix this, we make sure to disconnect from the SurfaceTexture when
Surface[TextureClient] is destroyed.

Change-Id: I422234868a05d7b7d283e9d5a85f7ab79e65d8a9
 2011-11-17 18:46:09 -08:00
Guang Zhu
2262acc4de am 3af8b699: Merge "add a self instrumentation into framework perf app" into ics-mr1 
* commit '3af8b699830bb5804f3c1b6420d9210b2fd8adb9':
  add a self instrumentation into framework perf app
 2011-11-17 18:07:25 -08:00
satok
620e4e4de2 am 1a3c051b: Merge "Hide/show ime switch icon properly" into ics-mr1 
* commit '1a3c051bcc787363d9154da4a8e8e562dda32926':
  Hide/show ime switch icon properly
 2011-11-17 18:04:28 -08:00
Guang Zhu
3af8b69983 Merge "add a self instrumentation into framework perf app" into ics-mr1 2011-11-17 18:04:23 -08:00
satok
1a3c051bcc Merge "Hide/show ime switch icon properly" into ics-mr1 2011-11-17 18:02:09 -08:00
Adam Powell
c992087d09 Fix bug 5614962 - Constant spinning wheel in USB Mass Storage screen (UX) 
Disable the window-level progress spinner; another is already shown while
connecting.

Use the correct Settings icon for SystemUI.

Specify the activity title for the USB mass storage screen in the
manifest to avoid title flashing during startup.

Change-Id: Ic57af56bf1661a5eaa91fff77471dc8447340d16
 2011-11-17 18:01:07 -08:00
Jim Miller
9a3caf39e4 Fix 5636798: clear PIN/PUK fields when device sleeps or user cancels 
This bug is the result of onPause()/onResume() not being called properly
when we have both lock and unlock screens present, which is true for the SIM
and PUK unlock cases.

The fix is to invoke onPause() and onResume() on both of them if they exist.

Verified the rest of the code correctly handles having both.

Also, when the user cancels, we now clear the fields.

Change-Id: If7fbd31df7eab9e3d60656d50d2392607a4bf471
 2011-11-17 17:58:40 -08:00
The Android Automerger
a5dd3bab78 merge in ics-mr0-release history after reset to ics-mr0 2011-11-17 17:49:17 -08:00
Jim Miller
bf4b374256 am 398f80ea: Merge "Fix 5620754: don\'t show pattern screen after SIM PUK unlock" into ics-mr1 
* commit '398f80eacb8e59d868f287bf273a1253fe219ce4':
  Fix 5620754: don't show pattern screen after SIM PUK unlock
 2011-11-17 17:45:19 -08:00
Jim Miller
398f80eacb Merge "Fix 5620754: don't show pattern screen after SIM PUK unlock" into ics-mr1 2011-11-17 17:41:50 -08:00
Joe Fernandez
366113fa1b Merge "docs: Camera Features for developers" into ics-mr0 2011-11-17 17:34:33 -08:00
Jamie Gennis
8bf35429f9 am 2ba13186: Merge "SurfaceTexture: fix a bug with buffer reallocation" into ics-mr1 
* commit '2ba13186b268de3527af6da1933a4b65877548d9':
  SurfaceTexture: fix a bug with buffer reallocation
 2011-11-17 17:12:45 -08:00
Jamie Gennis
3cb3e21339 am c8fd6e30: Merge "EGL: fix blob cache extension detection" into ics-mr1 
* commit 'c8fd6e3057a98a992b96c2bce3fa2a981c6e45c0':
  EGL: fix blob cache extension detection
 2011-11-17 17:12:43 -08:00
Jamie Gennis
2ba13186b2 Merge "SurfaceTexture: fix a bug with buffer reallocation" into ics-mr1 2011-11-17 17:10:47 -08:00
Jamie Gennis
c8fd6e3057 Merge "EGL: fix blob cache extension detection" into ics-mr1 2011-11-17 17:10:32 -08:00
Joe Fernandez
452e41f607 docs: Camera Features for developers 
Change-Id: Ie85f9a5c6808a921b0f80a30749442369740a9c6
 2011-11-17 17:03:37 -08:00
Jim Miller
90d5d46b9e Fix 5620754: don't show pattern screen after SIM PUK unlock 
This fixes a bug where we would inadvertently show the pattern
screen after PUK-unlocking the device.  Could potentially happen
after SIM unlock as well, but that path appears to be fast enough that
it's rarely seen.

The cause was not getting the SIM state change before deciding to show
the Unlock screen.

We now immediately invoke the callback if SIM/PUK unlock succeeds without
waiting for the round-trip from the radio layer.

Change-Id: I02dcb456da415b82f30f8e3abc43f788f3931b33
 2011-11-17 16:57:01 -08:00
David Brown
d196df0d86 am 3f51f954: Merge "Fix a crash caused by SIP addresses containing "%40" instead of "@"" into ics-mr1 
* commit '3f51f954948caf1fe5b3f175f7e8523f2ba58f58':
  Fix a crash caused by SIP addresses containing "%40" instead of "@"
 2011-11-17 16:32:54 -08:00
David Brown
3f51f95494 Merge "Fix a crash caused by SIP addresses containing "%40" instead of "@"" into ics-mr1 2011-11-17 16:31:10 -08:00
satok
3afd6c0d4d Hide/show ime switch icon properly 
Bug: 5481999
Change-Id: I4b3dde7285a9ac49da8d5d1133fddd0807b03f4d
 2011-11-18 09:15:18 +09:00
Joe Onorato
77173567ee Merge "Don't try to unmarshal void return types when there are out parameters being returned." into ics-aah 2011-11-17 16:15:18 -08:00
Joe Onorato
6980de4ef9 Don't try to unmarshal void return types when there are out parameters being returned. 
Change-Id: Ib7d2a5609167a076dd7ee8e10e8a55056789517e
 2011-11-17 16:13:49 -08:00
Scott Main
48eaa6c9e5 docs: update caption for action bar figure to match new screenshot 
Change-Id: I233383ca7168ddb96231d3d22a5dcd6342462103
 2011-11-17 16:10:54 -08:00
Jamie Gennis
a77bec3f09 am a37a78e2: Merge "GLES: add image external enums" into ics-mr1 
* commit 'a37a78e2efe54892a744adfc6330c2d2179dee21':
  GLES: add image external enums
 2011-11-17 16:03:57 -08:00
The Android Open Source Project
2f8f040fb4 am 31b0c687: Reconcile with ics-mr0-release 
* commit '31b0c6872dcec0759ff0dbbcfc6bf1e51d3e0f12':
 2011-11-17 16:03:55 -08:00
Scott Main
f8d82099be am 85c73948: am 08d40d71: Merge "docs: Big update to action bar guide for ICS. Added section for action provider, new APIs for handsets such as split action bar, more information and diagrams for up navigation, guidelines for picking action items, revised sample code 
* commit '85c7394836843b2cbfa2b51504448794a6071b3a':
  docs: Big update to action bar guide for ICS. Added section for action provider, new APIs for handsets such as split action bar, more information and diagrams for up navigation, guidelines for picking action items, revised sample code and discussion for tabs, add expandible action view info, and expanded discussion for customizing action bar styles bug:4726917
 2011-11-17 16:03:49 -08:00
Bill Gruber
cd8cccda8a am be0dab48: am 69e24843: Merge "Licensing docs: clarifies server response for draft apps Bug 2900690" into ics-mr0 
* commit 'be0dab485680fb264458f8192b3759b002450102':
  Licensing docs: clarifies server response for draft apps Bug 2900690
 2011-11-17 16:03:47 -08:00
Bill Gruber
d36228ac64 am 9d3dffc7: am ef20eb25: Merge "Filters docs: removes references to forward-locking Bug 3055286" into ics-mr0 
* commit '9d3dffc7b05dbbad4a5e597fa964398b827ba945':
  Filters docs: removes references to forward-locking Bug 3055286
 2011-11-17 16:03:45 -08:00