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

121508 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Ricardo Cervera-Navarro
15d1feb0c1 am fed2c410: am 4874938a: am 84e6bc61: Merge "Revert "docs: Watermark images with easter eggs"" into klp-docs 
* commit 'fed2c410ab09de72931bc95380645a62746273bc':
  Revert "docs: Watermark images with easter eggs"
 2014-04-18 19:16:23 +00:00
Ricardo Cervera-Navarro
fed2c410ab am 4874938a: am 84e6bc61: Merge "Revert "docs: Watermark images with easter eggs"" into klp-docs 
* commit '4874938ad3fb0d0ab56b24cb18c8943a72559f12':
  Revert "docs: Watermark images with easter eggs"
 2014-04-18 19:12:53 +00:00
Ricardo Cervera-Navarro
4874938ad3 am 84e6bc61: Merge "Revert "docs: Watermark images with easter eggs"" into klp-docs 
* commit '84e6bc61c64aa578aed50460f7e4f16d85f81cbb':
  Revert "docs: Watermark images with easter eggs"
 2014-04-18 19:08:05 +00:00
Ricardo Cervera-Navarro
84e6bc61c6 Merge "Revert "docs: Watermark images with easter eggs"" into klp-docs 2014-04-18 19:01:48 +00:00
Ricardo Cervera-Navarro
326e4a5907 Revert "docs: Watermark images with easter eggs" 
This reverts commit dc9ca02c51ecc4468e60c391f8357b5025d6eef1.

Change-Id: Idf4873e2e76d746c227c89c2f84fe44946014752
 2014-04-18 18:34:41 +00:00
Mark Salyzyn
b90e504ec1 am 649da9b5: am 5a47a9f6: Merge "Native Runtime: Add LOG_ID_CRASH" 
* commit '649da9b505498ff87d75da56d376d46c22e50782':
  Native Runtime: Add LOG_ID_CRASH
 2014-04-18 15:08:56 +00:00
Mark Salyzyn
649da9b505 am 5a47a9f6: Merge "Native Runtime: Add LOG_ID_CRASH" 
* commit '5a47a9f62dd9bcb6573555b7a3ef4b1f5e485fc4':
  Native Runtime: Add LOG_ID_CRASH
 2014-04-18 15:02:48 +00:00
Mark Salyzyn
5a47a9f62d Merge "Native Runtime: Add LOG_ID_CRASH" 2014-04-18 14:55:32 +00:00
Ricardo Cervera
fa711a33be am d09e1bff: am ed5b8c06: am 6aeea454: Merge "docs: Added the play from search intent. Bug: 13473141." into klp-docs 
* commit 'd09e1bffe412ace61a411873cc8d0a3759540e46':
  docs: Added the play from search intent. Bug: 13473141.
 2014-04-18 01:59:03 +00:00
Ricardo Cervera
d09e1bffe4 am ed5b8c06: am 6aeea454: Merge "docs: Added the play from search intent. Bug: 13473141." into klp-docs 
* commit 'ed5b8c06bbc70facbe553a9ca257a277ac3758ca':
  docs: Added the play from search intent. Bug: 13473141.
 2014-04-18 01:54:31 +00:00
Ricardo Cervera
ed5b8c06bb am 6aeea454: Merge "docs: Added the play from search intent. Bug: 13473141." into klp-docs 
* commit '6aeea4549787ec282d2ca42b8495b87645958fc9':
  docs: Added the play from search intent. Bug: 13473141.
 2014-04-18 01:49:50 +00:00
Ricardo Cervera
6aeea45497 Merge "docs: Added the play from search intent. Bug: 13473141." into klp-docs 2014-04-18 01:46:25 +00:00
Michael Kolb
7d755a6f57 Merge branch 'klp-modular-dev-plus-aosp' of https://googleplex-android.googlesource.com/_direct/platform/frameworks/base into klp-modular-dev-plus-aosp 2014-04-18 00:48:20 +00:00
Michael Kolb
d42eeab20f am 4abbd0a6: Merge "Populate isRound from config.xml to WindowInsets" into klp-modular-dev 
* commit '4abbd0a685cb418eb3cfc1f030d3091ef394a7e3':
  Populate isRound from config.xml to WindowInsets
 2014-04-18 00:48:13 +00:00
Mark Salyzyn
c5aa56872d am 7423510c: am da93c60d: Merge "jni: binder ptrdiff_t compile issues" 
* commit '7423510c5a6a103a77efc36f064ed716f8810b97':
  jni: binder ptrdiff_t compile issues
 2014-04-18 00:47:47 +00:00
Michael Kolb
4abbd0a685 Merge "Populate isRound from config.xml to WindowInsets" into klp-modular-dev 2014-04-18 00:44:35 +00:00
Mark Salyzyn
7423510c5a am da93c60d: Merge "jni: binder ptrdiff_t compile issues" 
* commit 'da93c60d8a5b79f90d44408d992fb532eaaf8fa7':
  jni: binder ptrdiff_t compile issues
 2014-04-18 00:43:36 +00:00
Mark Salyzyn
da93c60d8a Merge "jni: binder ptrdiff_t compile issues" 2014-04-18 00:40:01 +00:00
Michael Kolb
6642e51ac5 Populate isRound from config.xml to WindowInsets 
Change-Id: I41b3aef1322a7cdccdcbc679eb753e0a1e561fad
 2014-04-17 17:32:50 -07:00
Mark Salyzyn
5b6da1aee8 jni: binder ptrdiff_t compile issues 
Change-Id: Ibdd82479d3f9fb53cf1d6793c4f7353e8f1c3646
 2014-04-17 17:25:36 -07:00
Mark Salyzyn
dc500d2d56 am 4037847c: am 73258630: Merge "jni: binder 64-bit compile issues" 
* commit '4037847c0251a15ea88012a8405d0688c8b1ac53':
  jni: binder 64-bit compile issues
 2014-04-17 23:22:34 +00:00
Stephen Hines
fc45b664d4 am f0aa4cc0: am a4898534: Merge "Fix improper use of JNI_ABORT for operations where Java objects are written." 
* commit 'f0aa4cc0f257448f76e9d90b97abf9682e930fbf':
  Fix improper use of JNI_ABORT for operations where Java objects are written.
 2014-04-17 23:22:09 +00:00
Mark Salyzyn
4037847c02 am 73258630: Merge "jni: binder 64-bit compile issues" 
* commit '7325863013e5c34d493e4e92ecadf4fea87554e7':
  jni: binder 64-bit compile issues
 2014-04-17 22:57:25 +00:00
Mindy Pereira
03f7f44250 am cb54f978: Merge "Update window alpha at the same time as translating" into klp-modular-dev 
* commit 'cb54f978b565459210e80054e95becd1f8cae173':
  Update window alpha at the same time as translating
 2014-04-17 22:57:23 +00:00
Mindy Pereira
cb54f978b5 Merge "Update window alpha at the same time as translating" into klp-modular-dev 2014-04-17 22:53:24 +00:00
Mark Salyzyn
7325863013 Merge "jni: binder 64-bit compile issues" 2014-04-17 22:52:58 +00:00
Mark Salyzyn
cfd91e7852 jni: binder 64-bit compile issues 
Change-Id: I8a3083e7e9389bbb84c2dd061fef059e0595800d
 2014-04-17 15:40:01 -07:00
Vinit Deshapnde
734ccfbc7b am 2585e15e: am 72358802: am 45e74676: Merge "Don\'t reset country code once it is persisted" into klp-dev 
* commit '2585e15ef722c7bd8c320e57ded8ad67da121245':
  Don't reset country code once it is persisted
 2014-04-17 22:03:16 +00:00
Vinit Deshapnde
2585e15ef7 am 72358802: am 45e74676: Merge "Don\'t reset country code once it is persisted" into klp-dev 
* commit '72358802d6135c633dd158f44b988e4f4075e6fd':
  Don't reset country code once it is persisted
 2014-04-17 21:57:12 +00:00
Jeff Brown
18a69b936a am 8e1e4006: Merge "Add support for dynamically setting the virtual display surface." into klp-modular-dev 
* commit '8e1e40066bae030d6a6e8f3f3f8f69ccd6ec1848':
  Add support for dynamically setting the virtual display surface.
 2014-04-17 21:53:34 +00:00
Mindy Pereira
b0ea484615 Update window alpha at the same time as translating 
Note: algorithm for alpha per progress may be updated
This is a first pass proof of concept

Change-Id: Ia043200ea737ff9d132e350449e17ba0fde10d65
 2014-04-17 14:53:24 -07:00
Jeff Brown
8e1e40066b Merge "Add support for dynamically setting the virtual display surface." into klp-modular-dev 2014-04-17 21:49:49 +00:00
Simon Wilson
ef059b0394 am 3c8bbe24: Check that mRemotePlayer is not null before use 
* commit '3c8bbe245e7b0f937c36620c1427726fe9de50a6':
  Check that mRemotePlayer is not null before use
 2014-04-17 21:33:44 +00:00
Simon Wilson
3c8bbe245e Check that mRemotePlayer is not null before use 
Bug: 14138829
Change-Id: Ie7ddb54ef3b82b9566ac41d4f0ff335976d3c907
 2014-04-17 14:16:52 -07:00
Ricardo Cervera
a3b13847b0 docs: Added the play from search intent. Bug: 13473141. 
Change-Id: Icf483b5e0446e064b32a782717408484d5806859
 2014-04-17 12:31:18 -07:00
Vinit Deshapnde
72358802d6 am 45e74676: Merge "Don\'t reset country code once it is persisted" into klp-dev 
* commit '45e746766676681e4e191d0b7e521b8b3f6c284c':
  Don't reset country code once it is persisted
 2014-04-17 18:59:54 +00:00
Vinit Deshapnde
45e7467666 Merge "Don't reset country code once it is persisted" into klp-dev 2014-04-17 18:54:58 +00:00
Stephen Hines
f0aa4cc0f2 am a4898534: Merge "Fix improper use of JNI_ABORT for operations where Java objects are written." 
* commit 'a48985349cb26757b6c4be18acc496ab6d1110e5':
  Fix improper use of JNI_ABORT for operations where Java objects are written.
 2014-04-17 18:20:47 +00:00
Stephen Hines
a48985349c Merge "Fix improper use of JNI_ABORT for operations where Java objects are written." 2014-04-17 18:15:38 +00:00
Vinit Deshapnde
b5ee95edf9 Don't reset country code once it is persisted 
This change simply ignores resetting of country code by cellular
networks to avoid disconnecting existing wifi connections. It also
defers setting newly found country code until after existing Wifi
connection is torn down.

Also removes some dead code related to resetting of country codes.

Bug: 13894807
Change-Id: Ie2fcfdd4b3be8ba94542772c132fb1acb6a2c683
 2014-04-17 11:05:21 -07:00
Jason Sams
5170476c5b am a4af5726: am 112d1b94: Merge "Add BiCubic resize instrinsic" 
* commit 'a4af5726c4c8c882ca65a049bfa824922609d464':
  Add BiCubic resize instrinsic
 2014-04-17 17:07:48 +00:00
Jason Sams
a4af5726c4 am 112d1b94: Merge "Add BiCubic resize instrinsic" 
* commit '112d1b94ee8456dba16842e6b964eb35aef95818':
  Add BiCubic resize instrinsic
 2014-04-17 17:02:10 +00:00
Baligh Uddin
177d9b9a25 am b279f527: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-modular-dev 
* commit 'b279f5272e2c7554aeab930ba0aabab12efff9e2':
  Import translations. DO NOT MERGE
 2014-04-17 15:53:11 +00:00
Baligh Uddin
b279f5272e Merge "Import translations. DO NOT MERGE" into klp-modular-dev 2014-04-17 15:48:38 +00:00
Griff Hazen
84f4adc9a5 Merge commit '59dfbb91' into klp-modular-dev-plus-aosp 
Remove all changes from the merge to stop propagation.

Conflicts:
	tools/layoutlib/bridge/src/android/content/res/AssetManager_Delegate.java
 2014-04-17 02:53:18 -07:00
Stephen Hines
414fa2c93a Fix improper use of JNI_ABORT for operations where Java objects are written. 
In these RS API calls, it is possible (and very likely) that some Java objects
are written to via JNI calls into the RS driver. These writes can end up being
discarded if we specify JNI_ABORT, particularly if the Java object has been
moved due to GC. The change introduces a readonly mode for some macro calls
and updates other JNI callers to appropriately skip JNI_ABORT.

Change-Id: I8c5f2ae959b3fbc9008c9d2ac4542f2ebab29b06
 2014-04-17 01:02:42 -07:00
Deepanshu Gupta
59dfbb91ca Fix build [DO NOT MERGE] 
The branch is missing some CLs for 64-bit support. So, until they are
added, this change will fix the build.

Change-Id: Ia838caf60ca49b406101a3fb48a96afdcfb30c66
 2014-04-17 00:14:28 -07:00
Jeff Brown
92207df753 Add support for dynamically setting the virtual display surface. 
Previously, the surface that backs a virtual display had to be set
at the time when the display was created.  This change now makes
it possible to set or remove the surface later.  The virtual display
is treated as if it were "off" while no surface is attached to it.

Change-Id: Ib4fdbbb8b4ee79f0fb9ceb648f9bda4a8fa6a2ca
 2014-04-16 18:45:05 -07:00
Jason Sams
112d1b94ee Merge "Add BiCubic resize instrinsic" 2014-04-17 01:22:19 +00:00
Scott Main
2b7345e4e3 am b04f3f74: am cb38ee51: am a106923e: Merge "add image itemprop to specify image for search result snippet" into klp-docs 
* commit 'b04f3f749b565ca075066bbc1fe89153941eaa65':
  add image itemprop to specify image for search result snippet
 2014-04-17 00:28:17 +00:00