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

79855 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Scott Main
1c7a9b2ec9 am b949d416: update Google IO announcement on homepage 
* commit 'b949d41602eb5118df5509a6731e55fcc0316874':
  update Google IO announcement on homepage
 2012-07-19 11:31:27 -07:00
Scott Main
b949d41602 update Google IO announcement on homepage 
Change-Id: If859991b64492d2b334271038c854342771566e4
 2012-07-19 11:23:01 -07:00
The Android Open Source Project
6714442782 Reconcile with jb-mr0-release jb-release 
Change-Id: I0249d315e647dcdc2f3dea4d258ef5bf2065731d
 2012-07-19 08:37:10 -07:00
Brian Carlstrom
ee2585e5bc am 553e3898: Merge "Improve test key names to reproduce public issue" into jb-dev 
* commit '553e3898c0ae5f7344d84279c7d425ffbeb6a90d':
  Improve test key names to reproduce public issue
 2012-07-18 23:07:50 -07:00
Brian Carlstrom
553e3898c0 Merge "Improve test key names to reproduce public issue" into jb-dev 2012-07-18 23:05:28 -07:00
The Android Automerger
0adcd141c0 merge in jb-mr0-release history after reset to jb-dev 2012-07-18 21:44:46 -07:00
James Dong
d1a0a53eec am 5d478b9c: Merge "Changed to obtain a parcel in each notify() call in jni." into jb-dev 
* commit '5d478b9c1009b077649f7f870d993832d380d63c':
  Changed to obtain a parcel in each notify() call in jni.
 2012-07-18 20:15:11 -07:00
Ying Wang
d173b10a93 am a4d4df16: Merge "Import translations. DO NOT MERGE" into jb-dev 
* commit 'a4d4df16a6d18add37971bbd41ba58b4ce2ee608':
  Import translations. DO NOT MERGE
 2012-07-18 20:14:46 -07:00
Scott Main
f80ba4a5dc am 12a54752: docs: update hw accel attribute\'s default behavior and fix link to l10n tutorial 
* commit '12a5475205243bc2d069a87d2c7d4982b5f4d11d':
  docs: update hw accel attribute's default behavior and fix link to l10n tutorial
 2012-07-18 20:14:39 -07:00
Daniel Sandler
f22beb3f2f am 0038ec11: Merge "Fix stuck status bars." into jb-dev 
* commit '0038ec1107baf179a54a2f10b6643f918b1e7059':
  Fix stuck status bars.
 2012-07-18 20:14:33 -07:00
Dirk Dougherty
a482028ed0 am a44794f4: Merge "Doc change: add button link to developer console." into jb-dev 
* commit 'a44794f45e46cec0f23a690480274aad171775d2':
  Doc change: add button link to developer console.
 2012-07-18 20:14:28 -07:00
Joe Fernandez
22f742e61a am 23369747: Merge "docs: Updating <uses-sdk> docs, bug fix: b/6836256" into jb-dev 
* commit '233697471689a41a36f69cc9bda1e663d2f67804':
  docs: Updating <uses-sdk> docs, bug fix: b/6836256
 2012-07-18 20:14:24 -07:00
Romain Guy
243924b08f am 3409e728: Correctly pre-clip paths when recording display lists Bug #6836448 External bug: http://code.google.com/p/android/issues/detail?id=34946 
* commit '3409e728e22609b54de8b33d1e614ca51f6d6a77':
  Correctly pre-clip paths when recording display lists Bug #6836448 External bug: http://code.google.com/p/android/issues/detail?id=34946
 2012-07-18 20:14:02 -07:00
Scott Main
5b4d4348f4 am 634ccf7e: Merge "docs: fix broken links" into jb-dev 
* commit '634ccf7eb80046749df2f8f30ec3d4dc23fa3457':
  docs: fix broken links
 2012-07-18 20:13:56 -07:00
Joe Fernandez
69dcb0dab5 am c98a56de: Merge "docs: SDK/ADT r20.0.1, NDK r8b, Platform 4.1.1 Release Notes" into jb-dev 
* commit 'c98a56de61263b25920dbdc7fa9396c91ecbce7d':
  docs: SDK/ADT r20.0.1, NDK r8b, Platform 4.1.1 Release Notes
 2012-07-18 20:13:47 -07:00
James Dong
5d478b9c10 Merge "Changed to obtain a parcel in each notify() call in jni." into jb-dev 2012-07-18 18:43:37 -07:00
Ying Wang
a4d4df16a6 Merge "Import translations. DO NOT MERGE" into jb-dev 2012-07-18 14:58:18 -07:00
Ying Wang
eebabd6e47 Import translations. DO NOT MERGE 
Change-Id: I5077a3d3cb71f2dff0f460174134bdc49663e27b
Auto-generated-cl: translation import
 2012-07-18 14:19:56 -07:00
Scott Main
12a5475205 docs: update hw accel attribute's default behavior and fix link to l10n tutorial 
Change-Id: I445a5ef7513749ab55537c16dac2ee00aee0859d
 2012-07-18 12:08:04 -07:00
Daniel Sandler
0038ec1107 Merge "Fix stuck status bars." into jb-dev 2012-07-18 10:30:46 -07:00
Dirk Dougherty
a44794f45e Merge "Doc change: add button link to developer console." into jb-dev 2012-07-18 09:59:08 -07:00
Joe Fernandez
2336974716 Merge "docs: Updating <uses-sdk> docs, bug fix: b/6836256" into jb-dev 2012-07-18 09:05:06 -07:00
Brian Carlstrom
f4019af04a Improve test key names to reproduce public issue 
Also fixes other unrelated test failures.

Bug: http://code.google.com/p/android/issues/detail?id=34577
Bug: 6837950

Change-Id: I2c5ed1cbfbe0ab6f4ddd8619696d6545be0519a8
 2012-07-17 23:56:20 -07:00
Daniel Sandler
ed930e5ad5 Fix stuck status bars. 
An odd little bit of logic (attempting to defend against
the status bar getting stuck on orientation change) was
ironically causing it to get stuck if the bar was closed
twice in very rapid succession (which can happen if you
manage to click the settings button as the panel is about to
close).

Other tweaks to help defend against this sort of problem in
the future:

- When the screen goes off, immediately collapse the
  notification panel (without animation)
- When completing panel collapse, force the height of the
  expanded view to 0 (in case it ended up some other way by
  this point).
- Reduce a weird little glitch when you start
  animateCollapse() in the middle of a reveal animation.
  (The panel would jump to full height.)

Bug: 6765842
Change-Id: I233467c73e130f64401333319943289cbf3daa56
 2012-07-18 01:33:56 -04:00
Romain Guy
3409e728e2 Correctly pre-clip paths when recording display lists 
Bug #6836448
External bug: http://code.google.com/p/android/issues/detail?id=34946

DO NOT MERGE

DisplayListRenderer::drawPath was not invoking quickReject() properly,
passing x,y,width,height instead of left,top,right,bottom. A path
could thus get rejected when it should be drawn instead.

While working on this change I found a similar issue with another
drawing command, drawBitmapData().

Change-Id: I8306faf72db14d71b54ecb7de295c9a6957d9494
 2012-07-17 18:01:51 -07:00
Robert Greenwalt
cf7d4400f0 Merge commit 'c8cb059f' into manualmerge 
Conflicts:
	telephony/java/com/android/internal/telephony/gsm/GsmDataConnectionTracker.java
 2012-07-17 16:55:22 -07:00
Scott Main
634ccf7eb8 Merge "docs: fix broken links" into jb-dev 2012-07-17 16:46:11 -07:00
Joe Fernandez
cd940ef36c docs: Updating <uses-sdk> docs, bug fix: b/6836256 
Change-Id: I61e80e843db09b748417f2a234600edad922cdc5
 2012-07-17 16:45:58 -07:00
Dirk Dougherty
0e9a5a7cf5 Doc change: add button link to developer console. 
Change-Id: Ib53dce17ef99b62e7de5b6ef716ab5a4a8617800
 2012-07-17 16:36:28 -07:00
Joe Fernandez
c98a56de61 Merge "docs: SDK/ADT r20.0.1, NDK r8b, Platform 4.1.1 Release Notes" into jb-dev 2012-07-17 15:56:15 -07:00
Joe Fernandez
67e6e0ec6d docs: SDK/ADT r20.0.1, NDK r8b, Platform 4.1.1 Release Notes 
Change-Id: Ibaf20b014465df91fecfaccd79e778000fdbc90f
 2012-07-17 15:43:29 -07:00
Scott Main
65bc1c213b docs: fix broken links 
Change-Id: Ic2ca7a3ae1d8283d2b101028c5782159d822d98f
 2012-07-17 15:36:32 -07:00
Robert Greenwalt
c8cb059fb6 Merge "Fix our interpretation of apn setting's bearer." into jb-dev 2012-07-17 15:10:10 -07:00
Robert Greenwalt
7d551361d1 Fix our interpretation of apn setting's bearer. 
Between ICS and JB we changed it to use TelephonyManager's network type
enumeration.  This changes it back to represent the RIL's radio
technology.  The only diff between the two is 13 and 14 are swapped,
so the change was causing problems with LTE and eHRPD.

bug:6830908
Change-Id: I85a7c8037f370f368e5cbf6dc2c9395c6889b541
 2012-07-17 14:46:34 -07:00
Scott Main
d329fa02c1 am 28a3897d: docs: re-add download.jd file to support archived SDK downloads 
* commit '28a3897d08e0d2bce69225a89cbada792761f0ed':
  docs: re-add download.jd file to support archived SDK downloads
 2012-07-17 14:14:40 -07:00
Scott Main
28a3897d08 docs: re-add download.jd file to support archived SDK downloads 
Change-Id: If814238c8fa017ce10e7fe770826a1e162fe5e87
 2012-07-17 13:19:20 -07:00
Wink Saville
07e021b11b am 33034b13: (-s ours) Create telephony-common and mms-common - DO NOT MERGE 
* commit '33034b13cae1429d526722374bd39be3f9605ae4':
  Create telephony-common and mms-common - DO NOT MERGE
 2012-07-17 12:36:56 -07:00
The Android Automerger
227cd468c4 merge in jb-mr0-release history after reset to jb-dev 2012-07-17 12:30:57 -07:00
Wink Saville
33034b13ca Create telephony-common and mms-common - DO NOT MERGE 
These have been created to reduce the size and complexity
of frameworks/base.

mms-common was created by moving all of
  frameworks/base/core/java/com/google/android/mms
to:
   frameworks/opt/mms

telephony-common was created by moving some of
   frameworks/base/telephony
to:
   frameworks/opt/telephony

Change-Id: If6cb3c6ff952767fc10210f923dc0e4b343cd4ad
 2012-07-17 12:23:09 -07:00
Ying Wang
166615f243 am 1ed1c399: Merge "Import translations. DO NOT MERGE" into jb-dev 
* commit '1ed1c399939e035707dd6da7057570a8da96394e':
  Import translations. DO NOT MERGE
 2012-07-17 12:22:31 -07:00
Ying Wang
1ed1c39993 Merge "Import translations. DO NOT MERGE" into jb-dev 2012-07-17 12:19:12 -07:00
Dirk Dougherty
92c4339bb7 am 1c185c20: Merge "Doc change: Fixes to IAB purchase state docs." into jb-dev 
* commit '1c185c2068212c78d124897fdfe33cebb194d84a':
  Doc change: Fixes to IAB purchase state docs.
 2012-07-17 12:17:10 -07:00
Dirk Dougherty
1c185c2068 Merge "Doc change: Fixes to IAB purchase state docs." into jb-dev 2012-07-17 12:14:09 -07:00
Roman Nurik
90cc181124 am d0e84d30: docs: Add link to action bar design pattern. 
* commit 'd0e84d30c89300993d45307959a86ad1ceb06da2':
  docs: Add link to action bar design pattern.
 2012-07-17 12:06:22 -07:00
Ying Wang
7b3813340d Import translations. DO NOT MERGE 
Change-Id: I5c3c2a4556764f14d354ea0431b6cba175b2c49f
Auto-generated-cl: translation import
 2012-07-17 11:31:03 -07:00
Roman Nurik
d0e84d30c8 docs: Add link to action bar design pattern. 
Change-Id: I3e00c3bb81f785c70138ae1069e065d9118f031e
related-to-bug: 5833099
 2012-07-17 10:30:51 -07:00
Elliott Hughes
7d5c51117d am 3c04cc44: Merge "Don\'t talk about Froyo as if it\'s still in the future." 
* commit '3c04cc44c400d0ed2155428fa50d5facc91cd893':
  Don't talk about Froyo as if it's still in the future.
 2012-07-16 18:15:45 -07:00
Adam Powell
c36b8acd1e am 38895394: Merge "Properly switch MediaRouter to wired audio over a2dp." into jb-dev 
* commit '388953942b536b5eebd942ef78ae5b7499bc2078':
  Properly switch MediaRouter to wired audio over a2dp.
 2012-07-16 17:33:40 -07:00
Adam Powell
388953942b Merge "Properly switch MediaRouter to wired audio over a2dp." into jb-dev 2012-07-16 17:30:42 -07:00
Scott Main
4fbbea09ff am 1878bef2: Merge "docs: adjustments to correct text alignment" into jb-dev 
* commit '1878bef2c455e11b6166326130d422a1c10ee1b1':
  docs: adjustments to correct text alignment
 2012-07-16 15:50:01 -07:00