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

123613 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Nick Kralevich
1cbea39fe1 resolved conflicts for merge of dd3d95f1 to klp-volantis-dev 
Change-Id: I96c0f0da852a0b3cf8aef9158678d38aa30f456f
 2014-02-12 14:08:06 -08:00
Ricardo Cervera
3cb62db295 am 640e0c89: am 36547014: am 670944aa: Merge "docs: Added missing elements in uses-feature. Bug: 12913153" into klp-docs 
* commit '640e0c89c3fb4ee4f180b7a2d8b9aaad237f2f9c':
  docs: Added missing elements in uses-feature. Bug: 12913153
 2014-02-12 22:02:53 +00:00
Ricardo Cervera
7d3344fd9c am 58305f88: am bff7db19: am 521a54d0: Merge "docs: Added notes for Build Tools Revision 19.0.2" into klp-docs 
* commit '58305f88fdf111f960869340d54f46387fcab4bf':
  docs: Added notes for Build Tools Revision 19.0.2
 2014-02-12 22:02:49 +00:00
Ricardo Cervera
6960ad58ac am ac74a524: am 566e4df8: am ca8757bf: Merge "docs: Added Revision 3 of Google APIs System Image." into klp-docs 
* commit 'ac74a5245bf115c4b5e23a3db515c0c3b5166662':
  docs: Added Revision 3 of Google APIs System Image.
 2014-02-12 22:02:43 +00:00
Ricardo Cervera
640e0c89c3 am 36547014: am 670944aa: Merge "docs: Added missing elements in uses-feature. Bug: 12913153" into klp-docs 
* commit '36547014a3fa62e966739e12ccd31634b17058e9':
  docs: Added missing elements in uses-feature. Bug: 12913153
 2014-02-12 21:59:39 +00:00
Ricardo Cervera
58305f88fd am bff7db19: am 521a54d0: Merge "docs: Added notes for Build Tools Revision 19.0.2" into klp-docs 
* commit 'bff7db19e3bbd2997490beec671b52e4e925c0a5':
  docs: Added notes for Build Tools Revision 19.0.2
 2014-02-12 21:59:36 +00:00
Ricardo Cervera
ac74a5245b am 566e4df8: am ca8757bf: Merge "docs: Added Revision 3 of Google APIs System Image." into klp-docs 
* commit '566e4df8c3ff66fae6c343524272d332510e26f4':
  docs: Added Revision 3 of Google APIs System Image.
 2014-02-12 21:59:33 +00:00
Ricardo Cervera
36547014a3 am 670944aa: Merge "docs: Added missing elements in uses-feature. Bug: 12913153" into klp-docs 
* commit '670944aa7272e95ba3ec02b83b2ae4f38ad577ba':
  docs: Added missing elements in uses-feature. Bug: 12913153
 2014-02-12 21:56:29 +00:00
Ricardo Cervera
bff7db19e3 am 521a54d0: Merge "docs: Added notes for Build Tools Revision 19.0.2" into klp-docs 
* commit '521a54d0cc5288c4467652f4d773f372eebe970b':
  docs: Added notes for Build Tools Revision 19.0.2
 2014-02-12 21:56:27 +00:00
Ricardo Cervera
566e4df8c3 am ca8757bf: Merge "docs: Added Revision 3 of Google APIs System Image." into klp-docs 
* commit 'ca8757bfc5fd506c647ccd1452c53c6ca4fafb81':
  docs: Added Revision 3 of Google APIs System Image.
 2014-02-12 21:56:24 +00:00
Chris Craik
c70c723cf8 Merge "Avoid crash if layer is destroyed after GLRenderer" 2014-02-12 21:52:42 +00:00
Alan Viverette
861621eb8a Fix gradient radius attribute to match documentation 
BUG: 12191666
Change-Id: I62de3296500543797c595eeee15aa250e5b1511a
 2014-02-12 13:50:34 -08:00
Chris Craik
637314d15c Avoid crash if layer is destroyed after GLRenderer 
bug:12988766
Change-Id: I96961aeef0b1d42ae8c609f1607a100e61a3d593
 2014-02-12 13:45:52 -08:00
Dirk Dougherty
3155825c25 Doc change: minor edits to support easier extraction of document summaries. 
Change-Id: I1a15a1d233464d6c8d35a741c54932412dea28ee
 2014-02-12 13:31:14 -08:00
Alan Viverette
441b437b72 Update smoothScrollToPosition to move faster for large offsets 
Adds a method to AbsListView for translating from position to row
and vice-versa. Doesn't NPE this time.

BUG: 3434554
Change-Id: I6a731aedda6d951ad46322dbe87df00b8d34a22c
 2014-02-12 13:30:20 -08:00
Christopher Tate
c65d26ee0e Merge "Always call super.onCreate(). Always." 2014-02-12 21:18:49 +00:00
Christopher Tate
9d6376a1d8 Always call super.onCreate(). Always. 
Bug 12991134

Change-Id: Ife16ef93408253e3318a06dc0206ab4b88c7f367
 2014-02-12 13:15:46 -08:00
Ricardo Cervera
670944aa72 Merge "docs: Added missing elements in uses-feature. Bug: 12913153" into klp-docs 2014-02-12 21:05:32 +00:00
Ricardo Cervera
521a54d0cc Merge "docs: Added notes for Build Tools Revision 19.0.2" into klp-docs 2014-02-12 21:04:40 +00:00
Ricardo Cervera
ca8757bfc5 Merge "docs: Added Revision 3 of Google APIs System Image." into klp-docs 2014-02-12 21:04:00 +00:00
Craig Mautner
8dfda07dd4 am 731c30c1: Merge "Don\'t add windows from exiting app tokens twice." into klp-modular-dev 
* commit '731c30c17dac51e2279f8f789a647c61bd55028b':
  Don't add windows from exiting app tokens twice.
 2014-02-12 21:01:47 +00:00
Ricardo Cervera
10227d9c37 docs: Added Revision 3 of Google APIs System Image. 
Updated Google Play services version to 4.2.42 too.

Change-Id: I1887414760e91808ed0a2574c24dab3598797f32
Review: http://quixote.mtv.corp.google.com:8003/tools/revisions/platforms.html
 2014-02-12 12:59:46 -08:00
Craig Mautner
731c30c17d Merge "Don't add windows from exiting app tokens twice." into klp-modular-dev 2014-02-12 20:56:36 +00:00
Alan Viverette
09591e89e4 Merge "Add support for assigning keyed View tags via XML" 2014-02-12 20:46:38 +00:00
Craig Mautner
ac90c19cab Don't add windows from exiting app tokens twice. 
If an apptoken's removal has been delayed then it will be in both
mExitingAppTokens and the stack's tasks. When rebuilding the windows
the windows from that apptoken will get added twice. This change
skips adding those windows from apptokens that have already been
added from mExitingAppTokens.

Change-Id: I55f94b7dbef36aeacb390b91fbe82426eaac5458
 2014-02-12 12:37:17 -08:00
Alan Viverette
f556adf45e Merge "Set properties for pooled CollectionItemInfo, CollectionInfo" 2014-02-12 20:26:55 +00:00
John Spurlock
ae5708db9d am c4aee98a: Improve error handling in listener services. 
* commit 'c4aee98a62f400dd9f6f964d26d739d409212775':
  Improve error handling in listener services.
 2014-02-12 19:36:25 +00:00
John Spurlock
c4aee98a62 Improve error handling in listener services. 
Check explicitly for null listeners in NMS, throwing
IllegalArgumentException (on the small list of exceptions
that survive RPC boundaries) with a message.

Normally this situation is caused by listeners that attempt to
perform NM-related actions before they are bound.  Check for
this case in the base NLS class and avoid the call to NM if we
know it will fail.

Although it's tempting to throw an IllegalStateException on the
client side, preserve the existing semantics for backwards-compatibility
purposes.  That is, silently fail (or return null) - and provide a
log warning.

Bug:12805707
Change-Id: I0d92fd0d460a8592e8a23fd8fd718ae2ba3bd4c7
 2014-02-12 14:31:36 -05:00
Alan Viverette
cdd2eddcb2 Set properties for pooled CollectionItemInfo, CollectionInfo 
BUG: 12978446
Change-Id: I64a366952090ab663ffef43a1d210528805e113c
 2014-02-12 11:28:33 -08:00
Narayan Kamath
3caed58ac7 am 8fa3f443: am 54e7f53f: Merge "Fix build." 
* commit '8fa3f44342f3089aaf48de5c5a6f5a3e5d346cc7':
  Fix build.
 2014-02-12 19:23:45 +00:00
Paul Duffin
0741e11c65 am 75d67c6a: am d562a9b5: Merge "Improve Parcel\'s handling of non-primitive arrays" 
* commit '75d67c6aa051392e711fde3b901a4f2c62f983db':
  Improve Parcel's handling of non-primitive arrays
 2014-02-12 19:23:01 +00:00
Narayan Kamath
fc268ecae1 am aa98fb51: am f991771f: Merge "Use size_t* in AssetManager::createIdmap" 
* commit 'aa98fb51a8a0148b72e1662cc42102c6547776ce':
  Use size_t* in AssetManager::createIdmap
 2014-02-12 19:22:56 +00:00
Dianne Hackborn
97de064a9a am 133f6826: am 89492190: Merge "Runtime resource overlay, iteration 2, test cases" 
* commit '133f6826e58aa7643858d4e50630103eb01f1815':
  Runtime resource overlay, iteration 2, test cases
 2014-02-12 19:22:24 +00:00
John Spurlock
a447947e2e Merge "Improve error handling in listener services." 2014-02-12 19:20:21 +00:00
Nick Kralevich
dd3d95f182 resolved conflicts for merge of 4ad93639 to klp-modular-dev-plus-aosp 
Change-Id: I7ad222301ec0b863d48a1a9a839469436c385ea0
 2014-02-12 11:05:59 -08:00
Derek Sollenberger
ebcf70b128 Merge "Revert "Refactor setting an SkPaint onto a hwui Layer."" 2014-02-12 19:00:46 +00:00
Derek Sollenberger
90d0c75e94 Revert "Refactor setting an SkPaint onto a hwui Layer." 
This reverts commit e889298cd6ae1fc0d76bc00d7d12586db03eb261.

Change-Id: I4b1d609b2d4280595d40cb10d6c18875c22999f8
 2014-02-12 18:59:05 +00:00
Baligh Uddin
b88ed5ccba Import translations. DO NOT MERGE 
Change-Id: I7aef0ba2b5f45b3e60d7840408176c6a61d9d8ee
Auto-generated-cl: translation import
 2014-02-12 10:34:22 -08:00
Baligh Uddin
2878f71e26 Import translations. DO NOT MERGE 
Change-Id: I4113b4d3949ace6f67894e1c67f898672b871dbc
Auto-generated-cl: translation import
 2014-02-12 10:26:17 -08:00
Derek Sollenberger
5f97e9e9ed Merge "Refactor setting an SkPaint onto a hwui Layer." 2014-02-12 18:10:21 +00:00
John Spurlock
da9a3bed8e Improve error handling in listener services. 
Check explicitly for null listeners in NMS, throwing
IllegalArgumentException (on the small list of exceptions
that survive RPC boundaries) with a message.

Normally this situation is caused by listeners that attempt to
perform NM-related actions before they are bound.  Check for
this case in the base NLS class and avoid the call to NM if we
know it will fail.

Although it's tempting to throw an IllegalStateException on the
client side, preserve the existing semantics for backwards-compatibility
purposes.  That is, silently fail (or return null) - and provide a
log warning.

Bug:12805707
Change-Id: I0d92fd0d460a8592e8a23fd8fd718ae2ba3bd4c7
 2014-02-12 12:35:10 -05:00
Narayan Kamath
8fa3f44342 am 54e7f53f: Merge "Fix build." 
* commit '54e7f53fce25366781840a124aa018534c4eb52b':
  Fix build.
 2014-02-12 09:29:55 -08:00
Narayan Kamath
54e7f53fce Merge "Fix build." 2014-02-12 17:26:58 +00:00
Scott Main
44bb4e9cd5 am 7594767e: am aa318b28: am 879592d8: am bc64716c: am a2739fa7: am a4c5bba0: add document about GoogleApiClient and one about GoogleAuthUtil also remove the Authorization document from the Google Services section. bug:10679818 
* commit '7594767e55e011101ed9341f01d40730fdbd4cc7':
  add document about GoogleApiClient and one about GoogleAuthUtil also remove the Authorization document from the Google Services section. bug:10679818
 2014-02-12 17:15:26 +00:00
Dirk Dougherty
003a1e33ee am 57b00e2b: am 17f0d48c: am 8b6597bd: am b6ecc342: am 37ae7032: am 1654264e: Update generated docs for Google Play Services. 
* commit '57b00e2bdf1d2eb596c6525a6fdaa16563e1f132':
  Update generated docs for Google Play Services.
 2014-02-12 17:15:20 +00:00
Scott Main
7594767e55 am aa318b28: am 879592d8: am bc64716c: am a2739fa7: am a4c5bba0: add document about GoogleApiClient and one about GoogleAuthUtil also remove the Authorization document from the Google Services section. bug:10679818 
* commit 'aa318b2851042c6f98723446f33469a6545c7294':
  add document about GoogleApiClient and one about GoogleAuthUtil also remove the Authorization document from the Google Services section. bug:10679818
 2014-02-12 17:12:10 +00:00
Dirk Dougherty
57b00e2bdf am 17f0d48c: am 8b6597bd: am b6ecc342: am 37ae7032: am 1654264e: Update generated docs for Google Play Services. 
* commit '17f0d48ccf4ea817308e8cc3958d249bf77c2a2f':
  Update generated docs for Google Play Services.
 2014-02-12 17:12:06 +00:00
Scott Main
aa318b2851 am 879592d8: am bc64716c: am a2739fa7: am a4c5bba0: add document about GoogleApiClient and one about GoogleAuthUtil also remove the Authorization document from the Google Services section. bug:10679818 
* commit '879592d89a78383a9e3cd29d53357f34337e5f04':
  add document about GoogleApiClient and one about GoogleAuthUtil also remove the Authorization document from the Google Services section. bug:10679818
 2014-02-12 17:09:06 +00:00
Dirk Dougherty
17f0d48ccf am 8b6597bd: am b6ecc342: am 37ae7032: am 1654264e: Update generated docs for Google Play Services. 
* commit '8b6597bd07411ff3037d068dd0ef55d70ff18f18':
  Update generated docs for Google Play Services.
 2014-02-12 17:09:03 +00:00
Scott Main
879592d89a am bc64716c: am a2739fa7: am a4c5bba0: add document about GoogleApiClient and one about GoogleAuthUtil also remove the Authorization document from the Google Services section. bug:10679818 
* commit 'bc64716cfb1269d07b64f89c3b46800afa5dc266':
  add document about GoogleApiClient and one about GoogleAuthUtil also remove the Authorization document from the Google Services section. bug:10679818
 2014-02-12 17:06:32 +00:00