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

120411 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Ricardo Cervera
d5ed804f6f am a7b62718: am 974588d1: Merge "docs: Watermarked images for codes that weren\'t found." into klp-docs 
* commit 'a7b6271820e464b3aae955013b25f5b04f3ff9e1':
  docs: Watermarked images for codes that weren't found.
 2014-04-18 19:12:59 +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
a7b6271820 am 974588d1: Merge "docs: Watermarked images for codes that weren\'t found." into klp-docs 
* commit '974588d149812ee5420f55e3fd3182045b1e915b':
  docs: Watermarked images for codes that weren't found.
 2014-04-18 19:08:09 +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
974588d149 Merge "docs: Watermarked images for codes that weren't found." into klp-docs 2014-04-18 19:02:04 +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
453df8e6e3 docs: Watermarked images for codes that weren't found. 
Details:

Line 84
http://goo.gl/1QTi2T
http://developer.android.com/design/get-started/ui-overview.html
http://developer.android.com/design/media/ui_overview_notifications.png

Line 81
http://goo.gl/bHjQsk
http://developer.android.com/design/style/touch-feedback.html
http://developer.android.com/design/media/touch_feedback_communication.png

Line 76
http://goo.gl/HGUj4v
http://developer.android.com/design/patterns/navigation-drawer.html
http://developer.android.com/design/media/navigation_drawer_titles_icons.png

Line 11
http://goo.gl/yYQniH
http://developer.android.com/design/patterns/selection.html
http://developer.android.com/design/media/selection_adjusting_actions.png

Line 10
http://goo.gl/M2QJa7
http://developer.android.com/design/building-blocks/dialogs.html
http://developer.android.com/design/media/dialogs_examples.png

Change-Id: I5df9288b97a9ca58df9f596ae6624c5c91911b3a
 2014-04-18 11:54:03 -07: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
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
4abbd0a685 Merge "Populate isRound from config.xml to WindowInsets" into klp-modular-dev 2014-04-18 00:44:35 +00:00
Michael Kolb
6642e51ac5 Populate isRound from config.xml to WindowInsets 
Change-Id: I41b3aef1322a7cdccdcbc679eb753e0a1e561fad
 2014-04-17 17:32:50 -07: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
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
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
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
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
Baligh Uddin
b279f5272e Merge "Import translations. DO NOT MERGE" into klp-modular-dev 2014-04-17 15:48:38 +00: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
Scott Main
b04f3f749b am cb38ee51: am a106923e: Merge "add image itemprop to specify image for search result snippet" into klp-docs 
* commit 'cb38ee510abed0112aa47cb2da6bfe182400f321':
  add image itemprop to specify image for search result snippet
 2014-04-17 00:22:02 +00:00
Scott Main
cb38ee510a am a106923e: Merge "add image itemprop to specify image for search result snippet" into klp-docs 
* commit 'a106923e9add041f73ccf5f46e8584ea4302c54c':
  add image itemprop to specify image for search result snippet
 2014-04-17 00:16:54 +00:00
Scott Main
a106923e9a Merge "add image itemprop to specify image for search result snippet" into klp-docs 2014-04-17 00:14:48 +00:00
Ricardo Cervera
f64feec253 am 4aa68e97: am dc9ca02c: docs: Watermark images with easter eggs 
* commit '4aa68e9799bf56bd5a35a1a49b512bbafce8f5df':
  docs: Watermark images with easter eggs
 2014-04-17 00:03:33 +00:00
Ricardo Cervera
4aa68e9799 am dc9ca02c: docs: Watermark images with easter eggs 
* commit 'dc9ca02c51ecc4468e60c391f8357b5025d6eef1':
  docs: Watermark images with easter eggs
 2014-04-16 23:58:36 +00:00
Scott Main
e26817d07e add image itemprop to specify image for search result snippet 
Change-Id: I8c0ed12268318124bdb944db9048fc73284823f9
 2014-04-16 16:57:21 -07:00
Jason Sams
38f407cb1d Merge "RenderScript bicubic resize intrinsic [DO NOT MERGE]" into klp-modular-dev 2014-04-16 23:49:30 +00:00
Aaron Whyte
4980996bcc Merge "Allowed custom secure-adb confirmation via Activity or Service. It used to only be available via an Activity." into klp-modular-dev 2014-04-16 23:45:22 +00:00
Jason Sams
d666d92b80 RenderScript bicubic resize intrinsic [DO NOT MERGE] 
Change-Id: Icebfb3137aacddce0705834c6d4d2547c709cb0a
 2014-04-16 16:41:01 -07:00
Adam Powell
973ddaacae DO NOT MERGE Add isRound to WindowInsets 
isRound allows a view to determine whether the window it is contained
within obscures the corners of the window content. This allows views
aware of this property to adapt their layout accordingly.

Switch ViewRootImpl to use dispatchApplyInsets instead of
fitSystemWindows.

Change-Id: Ic3e3936b73815b2593cb9720af1a309fbd18406e

Conflicts:
	core/java/android/view/ViewRootImpl.java
 2014-04-16 14:59:16 -07:00
Aaron Whyte
d1931ffc07 Allowed custom secure-adb confirmation via Activity or Service. 
It used to only be available via an Activity.

Change-Id: Id79a99a70e721f3b567e75d45ffeba779264ec1e
 2014-04-16 14:50:14 -07:00
Baligh Uddin
81cdde5631 Import translations. DO NOT MERGE 
Change-Id: I1d61ecf2601689f2598a8430fd4ea7b0d4ab80a8
Auto-generated-cl: translation import
 2014-04-16 14:32:46 -07:00
Ricardo Cervera
dc9ca02c51 docs: Watermark images with easter eggs 
Change-Id: I4ab6d614bf43419916633baa062d745f7966a5f9
 2014-04-16 14:22:38 -07:00
Jeff Brown
fa72a9eaae Merge "Declare VersionCodes.KITKAT_WATCH." into klp-modular-dev 2014-04-16 20:49:15 +00:00
Jeff Brown
1c3f332c3f Declare VersionCodes.KITKAT_WATCH. 
The constant does not have a final value yet but is useful for
documentation purposes during development.

Change-Id: Iddd9b956eff822a9a25e9df483b5bd3979189023
 2014-04-16 13:27:00 -07:00
Craig Mautner
2fd3cb9544 Merge "Fix ActivityContainer callback parcelling." into klp-modular-dev 2014-04-16 20:05:31 +00:00
Craig Mautner
e3a00d745f Fix ActivityContainer callback parcelling. 
The Binder interface for passing a callback was not implemented
properly. Also the callback for ActivityContainer now has a new
API.

Change-Id: I6b719be0cb57542f022a3cc14e8f4efde60b1a50
 2014-04-16 13:03:26 -07:00
Mark Salyzyn
2760778d70 jni: liblog reading error API incorrect 
- return value contains -errno on error.

(cherry pick from commit b519aeca47a7b798926c00ce5c8cf730e26e75fd)

Bug: 13907124
Change-Id: I91f12db5749fac2ae8ed5b0f033d4eaf83e666f5
 2014-04-16 12:33:41 -07:00
Deepanshu Gupta
97114e6062 am 13ed576e: am cda504f2: am 0aea4684: am 91f2a7cb: am 5a125053: Merge changes I66792c4d,I203b6783 into jb-mr2-dev 
* commit '13ed576e8ec9914f65234d1616b029bdfb4e86ed':
  Improve text rendering and measurement. [DO NOT MERGE]
  Fix the measurement of text bounds. [DO NOT MERGE]
 2014-04-16 19:16:47 +00:00
Deepanshu Gupta
985bb326a6 am fa206123: am 502c83f4: am 00312846: (-s ours) am 0fe63473: am 04b4f8d1: Merge "Set default text style in layoutlib as NORMAL [DO NOT MERGE]" into jb-mr2-dev 
* commit 'fa206123153a3a8ee48dd6b4e934723f0c2546b8':
  Set default text style in layoutlib as NORMAL [DO NOT MERGE]
 2014-04-16 19:16:43 +00:00
Deepanshu Gupta
884f3b14c6 am 925b911f: am 013af337: am 4eeaa61f: (-s ours) am 87e14187: am fb120acd: Merge "Add methods for Time_Delegate [DO NOT MERGE]" into jb-mr2-dev 
* commit '925b911f53f0e1484be4232ea6a26e5696c81764':
  Add methods for Time_Delegate [DO NOT MERGE]
 2014-04-16 19:16:40 +00:00
Deepanshu Gupta
0cffa9fe6c am 43f1fe7e: am 5016f769: am b03e1176: (-s ours) am 533a52fe: am b7fd6315: Merge "Fix sans-serif-thin and sans-serif-light fonts in layoutlib. [DO NOT MERGE]" into jb-mr2-dev 
* commit '43f1fe7e5e625f9de515220f375c18db5b5476cd':
  Fix sans-serif-thin and sans-serif-light fonts in layoutlib. [DO NOT MERGE]
 2014-04-16 19:16:37 +00:00
Deepanshu Gupta
38f2b1ea41 am 30ab17dd: am 289f1ffb: am 90b0b69c: (-s ours) am 014ac85f: am f14cbb26: Merge "Optimize layout rendering in layoutlib [DO NOT MERGE]" into jb-mr2-dev 
* commit '30ab17dde6fb47505be493cb09983e268f97c1e9':
  Optimize layout rendering in layoutlib [DO NOT MERGE]
 2014-04-16 19:16:33 +00:00
Deepanshu Gupta
16191f8c4f resolved conflicts for merge of 0e2049cd to klp-modular-dev 
Change-Id: I518e18d0c769a4cb5d325fc22165a8ead36e11de
 2014-04-16 11:58:32 -07:00
Deepanshu Gupta
13ed576e8e am cda504f2: am 0aea4684: am 91f2a7cb: am 5a125053: Merge changes I66792c4d,I203b6783 into jb-mr2-dev 
* commit 'cda504f2d54d849fe90924b0d0bf3f817c2a93d7':
  Improve text rendering and measurement. [DO NOT MERGE]
  Fix the measurement of text bounds. [DO NOT MERGE]
 2014-04-16 18:47:26 +00:00