OSDN Git Service
Ricardo Cervera [Fri, 18 Apr 2014 19:12:59 +0000 (19:12 +0000)]
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.
Ricardo Cervera-Navarro [Fri, 18 Apr 2014 19:12:53 +0000 (19:12 +0000)]
am
4874938a: am
84e6bc61: Merge "Revert "docs: Watermark images with easter eggs"" into klp-docs
* commit '
4874938ad3fb0d0ab56b24cb18c8943a72559f12':
Revert "docs: Watermark images with easter eggs"
Ricardo Cervera [Fri, 18 Apr 2014 19:08:09 +0000 (19:08 +0000)]
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.
Ricardo Cervera-Navarro [Fri, 18 Apr 2014 19:08:05 +0000 (19:08 +0000)]
am
84e6bc61: Merge "Revert "docs: Watermark images with easter eggs"" into klp-docs
* commit '
84e6bc61c64aa578aed50460f7e4f16d85f81cbb':
Revert "docs: Watermark images with easter eggs"
Ricardo Cervera [Fri, 18 Apr 2014 19:02:04 +0000 (19:02 +0000)]
Merge "docs: Watermarked images for codes that weren't found." into klp-docs
Ricardo Cervera-Navarro [Fri, 18 Apr 2014 19:01:48 +0000 (19:01 +0000)]
Merge "Revert "docs: Watermark images with easter eggs"" into klp-docs
Ricardo Cervera [Fri, 18 Apr 2014 18:54:03 +0000 (11:54 -0700)]
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
Ricardo Cervera-Navarro [Fri, 18 Apr 2014 18:34:41 +0000 (18:34 +0000)]
Revert "docs: Watermark images with easter eggs"
This reverts commit
dc9ca02c51ecc4468e60c391f8357b5025d6eef1.
Change-Id: Idf4873e2e76d746c227c89c2f84fe44946014752
Ricardo Cervera [Fri, 18 Apr 2014 01:54:31 +0000 (01:54 +0000)]
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.
Ricardo Cervera [Fri, 18 Apr 2014 01:49:50 +0000 (01:49 +0000)]
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.
Ricardo Cervera [Fri, 18 Apr 2014 01:46:25 +0000 (01:46 +0000)]
Merge "docs: Added the play from search intent. Bug:
13473141." into klp-docs
Michael Kolb [Fri, 18 Apr 2014 00:44:35 +0000 (00:44 +0000)]
Merge "Populate isRound from config.xml to WindowInsets" into klp-modular-dev
Michael Kolb [Thu, 17 Apr 2014 21:45:29 +0000 (14:45 -0700)]
Populate isRound from config.xml to WindowInsets
Change-Id: I41b3aef1322a7cdccdcbc679eb753e0a1e561fad
Mindy Pereira [Thu, 17 Apr 2014 22:53:23 +0000 (22:53 +0000)]
Merge "Update window alpha at the same time as translating" into klp-modular-dev
Vinit Deshapnde [Thu, 17 Apr 2014 21:57:12 +0000 (21:57 +0000)]
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
Mindy Pereira [Thu, 17 Apr 2014 21:01:04 +0000 (14:01 -0700)]
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
Jeff Brown [Thu, 17 Apr 2014 21:49:49 +0000 (21:49 +0000)]
Merge "Add support for dynamically setting the virtual display surface." into klp-modular-dev
Simon Wilson [Thu, 17 Apr 2014 21:16:48 +0000 (14:16 -0700)]
Check that mRemotePlayer is not null before use
Bug:
14138829
Change-Id: Ie7ddb54ef3b82b9566ac41d4f0ff335976d3c907
Ricardo Cervera [Wed, 2 Apr 2014 00:38:08 +0000 (17:38 -0700)]
docs: Added the play from search intent. Bug:
13473141.
Change-Id: Icf483b5e0446e064b32a782717408484d5806859
Vinit Deshapnde [Thu, 17 Apr 2014 18:59:54 +0000 (18:59 +0000)]
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
Vinit Deshapnde [Thu, 17 Apr 2014 18:54:58 +0000 (18:54 +0000)]
Merge "Don't reset country code once it is persisted" into klp-dev
Vinit Deshapnde [Thu, 17 Apr 2014 18:05:21 +0000 (11:05 -0700)]
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
Baligh Uddin [Thu, 17 Apr 2014 15:48:38 +0000 (15:48 +0000)]
Merge "Import translations. DO NOT MERGE" into klp-modular-dev
Deepanshu Gupta [Thu, 17 Apr 2014 07:14:28 +0000 (00:14 -0700)]
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
Jeff Brown [Wed, 16 Apr 2014 20:16:07 +0000 (13:16 -0700)]
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
Scott Main [Thu, 17 Apr 2014 00:22:02 +0000 (00:22 +0000)]
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
Scott Main [Thu, 17 Apr 2014 00:16:54 +0000 (00:16 +0000)]
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
Scott Main [Thu, 17 Apr 2014 00:14:47 +0000 (00:14 +0000)]
Merge "add image itemprop to specify image for search result snippet" into klp-docs
Ricardo Cervera [Thu, 17 Apr 2014 00:03:33 +0000 (00:03 +0000)]
am
4aa68e97: am
dc9ca02c: docs: Watermark images with easter eggs
* commit '
4aa68e9799bf56bd5a35a1a49b512bbafce8f5df':
docs: Watermark images with easter eggs
Ricardo Cervera [Wed, 16 Apr 2014 23:58:36 +0000 (23:58 +0000)]
am
dc9ca02c: docs: Watermark images with easter eggs
* commit '
dc9ca02c51ecc4468e60c391f8357b5025d6eef1':
docs: Watermark images with easter eggs
Scott Main [Wed, 16 Apr 2014 23:57:21 +0000 (16:57 -0700)]
add image itemprop to specify image for search result snippet
Change-Id: I8c0ed12268318124bdb944db9048fc73284823f9
Jason Sams [Wed, 16 Apr 2014 23:49:29 +0000 (23:49 +0000)]
Merge "RenderScript bicubic resize intrinsic [DO NOT MERGE]" into klp-modular-dev
Aaron Whyte [Wed, 16 Apr 2014 23:45:22 +0000 (23:45 +0000)]
Merge "Allowed custom secure-adb confirmation via Activity or Service. It used to only be available via an Activity." into klp-modular-dev
Jason Sams [Wed, 16 Apr 2014 23:41:01 +0000 (16:41 -0700)]
RenderScript bicubic resize intrinsic [DO NOT MERGE]
Change-Id: Icebfb3137aacddce0705834c6d4d2547c709cb0a
Adam Powell [Wed, 16 Apr 2014 00:38:54 +0000 (17:38 -0700)]
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
Aaron Whyte [Fri, 11 Apr 2014 17:53:58 +0000 (10:53 -0700)]
Allowed custom secure-adb confirmation via Activity or Service.
It used to only be available via an Activity.
Change-Id: Id79a99a70e721f3b567e75d45ffeba779264ec1e
Baligh Uddin [Wed, 16 Apr 2014 21:32:46 +0000 (14:32 -0700)]
Import translations. DO NOT MERGE
Change-Id: I1d61ecf2601689f2598a8430fd4ea7b0d4ab80a8
Auto-generated-cl: translation import
Ricardo Cervera [Wed, 16 Apr 2014 21:22:38 +0000 (14:22 -0700)]
docs: Watermark images with easter eggs
Change-Id: I4ab6d614bf43419916633baa062d745f7966a5f9
Jeff Brown [Wed, 16 Apr 2014 20:49:14 +0000 (20:49 +0000)]
Merge "Declare VersionCodes.KITKAT_WATCH." into klp-modular-dev
Jeff Brown [Wed, 16 Apr 2014 20:15:22 +0000 (13:15 -0700)]
Declare VersionCodes.KITKAT_WATCH.
The constant does not have a final value yet but is useful for
documentation purposes during development.
Change-Id: Iddd9b956eff822a9a25e9df483b5bd3979189023
Craig Mautner [Wed, 16 Apr 2014 20:05:31 +0000 (20:05 +0000)]
Merge "Fix ActivityContainer callback parcelling." into klp-modular-dev
Craig Mautner [Wed, 16 Apr 2014 15:31:19 +0000 (08:31 -0700)]
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
Mark Salyzyn [Tue, 8 Apr 2014 22:21:50 +0000 (15:21 -0700)]
jni: liblog reading error API incorrect
- return value contains -errno on error.
(cherry pick from commit
b519aeca47a7b798926c00ce5c8cf730e26e75fd)
Bug:
13907124
Change-Id: I91f12db5749fac2ae8ed5b0f033d4eaf83e666f5
Deepanshu Gupta [Wed, 16 Apr 2014 19:16:47 +0000 (19:16 +0000)]
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]
Deepanshu Gupta [Wed, 16 Apr 2014 19:16:43 +0000 (19:16 +0000)]
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]
Deepanshu Gupta [Wed, 16 Apr 2014 19:16:40 +0000 (19:16 +0000)]
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]
Deepanshu Gupta [Wed, 16 Apr 2014 19:16:37 +0000 (19:16 +0000)]
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]
Deepanshu Gupta [Wed, 16 Apr 2014 19:16:33 +0000 (19:16 +0000)]
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]
Deepanshu Gupta [Wed, 16 Apr 2014 18:58:32 +0000 (11:58 -0700)]
resolved conflicts for merge of
0e2049cd to klp-modular-dev
Change-Id: I518e18d0c769a4cb5d325fc22165a8ead36e11de
Deepanshu Gupta [Wed, 16 Apr 2014 18:47:26 +0000 (18:47 +0000)]
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]
Deepanshu Gupta [Wed, 16 Apr 2014 18:47:23 +0000 (18:47 +0000)]
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 '
502c83f4098cd964cf0c18474700488282396bcb':
Set default text style in layoutlib as NORMAL [DO NOT MERGE]
Deepanshu Gupta [Wed, 16 Apr 2014 18:47:20 +0000 (18:47 +0000)]
am
013af337: am
4eeaa61f: (-s ours) am
87e14187: am
fb120acd: Merge "Add methods for Time_Delegate [DO NOT MERGE]" into jb-mr2-dev
* commit '
013af337bc804a0b491bd3f1e1cba45d61cbe2ea':
Add methods for Time_Delegate [DO NOT MERGE]
Deepanshu Gupta [Wed, 16 Apr 2014 18:47:17 +0000 (18:47 +0000)]
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 '
5016f7694fb4400be468fd49aa83d8075f41d3dc':
Fix sans-serif-thin and sans-serif-light fonts in layoutlib. [DO NOT MERGE]
Deepanshu Gupta [Wed, 16 Apr 2014 18:47:15 +0000 (18:47 +0000)]
am
289f1ffb: am
90b0b69c: (-s ours) am
014ac85f: am
f14cbb26: Merge "Optimize layout rendering in layoutlib [DO NOT MERGE]" into jb-mr2-dev
* commit '
289f1ffb33d9ab7ed1a7c11bcc70c017b3a1c710':
Optimize layout rendering in layoutlib [DO NOT MERGE]
Deepanshu Gupta [Wed, 16 Apr 2014 18:43:50 +0000 (18:43 +0000)]
am
0aea4684: am
91f2a7cb: am
5a125053: Merge changes I66792c4d,I203b6783 into jb-mr2-dev
* commit '
0aea46840f5a520e511fdbd8561046ac9c665fcb':
Improve text rendering and measurement. [DO NOT MERGE]
Fix the measurement of text bounds. [DO NOT MERGE]
Deepanshu Gupta [Wed, 16 Apr 2014 18:43:47 +0000 (18:43 +0000)]
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 '
00312846e1e5513b3b32aa4fab399e51daf0c1b3':
Set default text style in layoutlib as NORMAL [DO NOT MERGE]
Deepanshu Gupta [Wed, 16 Apr 2014 18:43:44 +0000 (18:43 +0000)]
am
4eeaa61f: (-s ours) am
87e14187: am
fb120acd: Merge "Add methods for Time_Delegate [DO NOT MERGE]" into jb-mr2-dev
* commit '
4eeaa61f6b4b7b37712e1c385a75aa8a4b89e381':
Add methods for Time_Delegate [DO NOT MERGE]
Deepanshu Gupta [Wed, 16 Apr 2014 18:43:40 +0000 (18:43 +0000)]
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 '
b03e1176df1e66a49a5649faf6994fa9ec1a9bea':
Fix sans-serif-thin and sans-serif-light fonts in layoutlib. [DO NOT MERGE]
Deepanshu Gupta [Wed, 16 Apr 2014 18:43:38 +0000 (18:43 +0000)]
am
90b0b69c: (-s ours) am
014ac85f: am
f14cbb26: Merge "Optimize layout rendering in layoutlib [DO NOT MERGE]" into jb-mr2-dev
* commit '
90b0b69cd48067b92a90ea248ef91e473b7f1c10':
Optimize layout rendering in layoutlib [DO NOT MERGE]
Deepanshu Gupta [Wed, 16 Apr 2014 18:40:55 +0000 (18:40 +0000)]
am
86384880: am
f1e71876: Fix theme/style resolution in Layoutlib [DO NOT MERGE]
* commit '
863848808d005fe1d2fd84a2982adfc02a3fbb9f':
Fix theme/style resolution in Layoutlib [DO NOT MERGE]
Deepanshu Gupta [Wed, 16 Apr 2014 18:40:51 +0000 (18:40 +0000)]
am
685b7d41: am
1b87390c: Overflow menu popup for Action Bar in Layoutlib [DO NOT MERGE]
* commit '
685b7d4165c417ce20b1f6c49190eabcfda09940':
Overflow menu popup for Action Bar in Layoutlib [DO NOT MERGE]
Deepanshu Gupta [Wed, 16 Apr 2014 18:40:41 +0000 (18:40 +0000)]
am
91f2a7cb: am
5a125053: Merge changes I66792c4d,I203b6783 into jb-mr2-dev
* commit '
91f2a7cb303a3225f68f571ea101078eed1c1f94':
Improve text rendering and measurement. [DO NOT MERGE]
Fix the measurement of text bounds. [DO NOT MERGE]
Deepanshu Gupta [Wed, 16 Apr 2014 18:40:37 +0000 (18:40 +0000)]
am
0fe63473: am
04b4f8d1: Merge "Set default text style in layoutlib as NORMAL [DO NOT MERGE]" into jb-mr2-dev
* commit '
0fe634737b24fd8f4dc8d0f49eb15ea176242428':
Set default text style in layoutlib as NORMAL [DO NOT MERGE]
Deepanshu Gupta [Wed, 16 Apr 2014 18:40:34 +0000 (18:40 +0000)]
am
87e14187: am
fb120acd: Merge "Add methods for Time_Delegate [DO NOT MERGE]" into jb-mr2-dev
* commit '
87e14187111254b8842193f4f3514c0dea50967d':
Add methods for Time_Delegate [DO NOT MERGE]
Deepanshu Gupta [Wed, 16 Apr 2014 18:40:30 +0000 (18:40 +0000)]
am
533a52fe: am
b7fd6315: Merge "Fix sans-serif-thin and sans-serif-light fonts in layoutlib. [DO NOT MERGE]" into jb-mr2-dev
* commit '
533a52fe3bedc88483a968400cd61110bd29c704':
Fix sans-serif-thin and sans-serif-light fonts in layoutlib. [DO NOT MERGE]
Deepanshu Gupta [Wed, 16 Apr 2014 18:40:25 +0000 (18:40 +0000)]
am
014ac85f: am
f14cbb26: Merge "Optimize layout rendering in layoutlib [DO NOT MERGE]" into jb-mr2-dev
* commit '
014ac85fecc969c205a11d1f20afe00cab713629':
Optimize layout rendering in layoutlib [DO NOT MERGE]
Deepanshu Gupta [Wed, 16 Apr 2014 18:37:13 +0000 (18:37 +0000)]
am
bdd0ad79: Layoutlib tests now check methods return value [DO NOT MERGE]
* commit '
bdd0ad79b9b027280bd371c7b6795b04ed89ac8f':
Layoutlib tests now check methods return value [DO NOT MERGE]
Deepanshu Gupta [Wed, 16 Apr 2014 18:37:10 +0000 (18:37 +0000)]
am
f1e71876: Fix theme/style resolution in Layoutlib [DO NOT MERGE]
* commit '
f1e7187645f0b0388f7b97d742395efd228b347a':
Fix theme/style resolution in Layoutlib [DO NOT MERGE]
Deepanshu Gupta [Wed, 16 Apr 2014 18:37:06 +0000 (18:37 +0000)]
am
1b87390c: Overflow menu popup for Action Bar in Layoutlib [DO NOT MERGE]
* commit '
1b87390c9426c4bc9119829e9375d712dfde11c3':
Overflow menu popup for Action Bar in Layoutlib [DO NOT MERGE]
Deepanshu Gupta [Wed, 16 Apr 2014 18:37:02 +0000 (18:37 +0000)]
am
5a125053: Merge changes I66792c4d,I203b6783 into jb-mr2-dev
* commit '
5a1250532f159842c364accf02bcfd111a6b900b':
Improve text rendering and measurement. [DO NOT MERGE]
Fix the measurement of text bounds. [DO NOT MERGE]
Deepanshu Gupta [Wed, 16 Apr 2014 18:36:58 +0000 (18:36 +0000)]
am
04b4f8d1: Merge "Set default text style in layoutlib as NORMAL [DO NOT MERGE]" into jb-mr2-dev
* commit '
04b4f8d11406c64b94797af67dd7530435187129':
Set default text style in layoutlib as NORMAL [DO NOT MERGE]
Deepanshu Gupta [Wed, 16 Apr 2014 18:36:55 +0000 (18:36 +0000)]
am
fb120acd: Merge "Add methods for Time_Delegate [DO NOT MERGE]" into jb-mr2-dev
* commit '
fb120acd841f7d8d0e1845f5bdd98abf35cb25b4':
Add methods for Time_Delegate [DO NOT MERGE]
Deepanshu Gupta [Wed, 16 Apr 2014 18:36:52 +0000 (18:36 +0000)]
am
b7fd6315: Merge "Fix sans-serif-thin and sans-serif-light fonts in layoutlib. [DO NOT MERGE]" into jb-mr2-dev
* commit '
b7fd6315328c3a38fd7928f3dbb43f44227eb78b':
Fix sans-serif-thin and sans-serif-light fonts in layoutlib. [DO NOT MERGE]
Deepanshu Gupta [Wed, 16 Apr 2014 18:36:48 +0000 (18:36 +0000)]
am
f14cbb26: Merge "Optimize layout rendering in layoutlib [DO NOT MERGE]" into jb-mr2-dev
* commit '
f14cbb26edcf0838cee333bf0d6ee686bf6de333':
Optimize layout rendering in layoutlib [DO NOT MERGE]
Deepanshu Gupta [Wed, 16 Apr 2014 18:36:46 +0000 (18:36 +0000)]
am
484c88c3: am
4ccc4bd5: Action bar rendering in layoutlib [DO NOT MERGE]
* commit '
484c88c3655991759dc64276404d0cf7e33b455f':
Action bar rendering in layoutlib [DO NOT MERGE]
Deepanshu Gupta [Wed, 16 Apr 2014 18:36:40 +0000 (18:36 +0000)]
am
e75477cb: am
acf0bce0: Support custom views using TimePickerDialog [DO NOT MERGE]
* commit '
e75477cb3bf0f2e18c1f0bb743a6189fbc07c2a2':
Support custom views using TimePickerDialog [DO NOT MERGE]
Deepanshu Gupta [Wed, 16 Apr 2014 18:34:11 +0000 (18:34 +0000)]
Merge changes I66792c4d,I203b6783 into jb-mr2-dev
* changes:
Improve text rendering and measurement. [DO NOT MERGE]
Fix the measurement of text bounds. [DO NOT MERGE]
Deepanshu Gupta [Wed, 16 Apr 2014 18:34:04 +0000 (18:34 +0000)]
Merge "Set default text style in layoutlib as NORMAL [DO NOT MERGE]" into jb-mr2-dev
Deepanshu Gupta [Wed, 16 Apr 2014 18:33:47 +0000 (18:33 +0000)]
Merge "Add methods for Time_Delegate [DO NOT MERGE]" into jb-mr2-dev
Deepanshu Gupta [Wed, 16 Apr 2014 18:33:31 +0000 (18:33 +0000)]
Merge "Fix sans-serif-thin and sans-serif-light fonts in layoutlib. [DO NOT MERGE]" into jb-mr2-dev
Deepanshu Gupta [Wed, 16 Apr 2014 18:33:10 +0000 (18:33 +0000)]
Merge "Optimize layout rendering in layoutlib [DO NOT MERGE]" into jb-mr2-dev
Deepanshu Gupta [Wed, 16 Apr 2014 18:33:00 +0000 (18:33 +0000)]
am
4ccc4bd5: Action bar rendering in layoutlib [DO NOT MERGE]
* commit '
4ccc4bd54f85d86818f61d728c6361d2003ddd8e':
Action bar rendering in layoutlib [DO NOT MERGE]
Deepanshu Gupta [Wed, 16 Apr 2014 18:32:55 +0000 (18:32 +0000)]
am
acf0bce0: Support custom views using TimePickerDialog [DO NOT MERGE]
* commit '
acf0bce09fec2cabe871d7146aa62e9258fbf06d':
Support custom views using TimePickerDialog [DO NOT MERGE]
Baligh Uddin [Wed, 16 Apr 2014 15:28:28 +0000 (15:28 +0000)]
Merge "Import translations. DO NOT MERGE" into klp-modular-dev
Deepanshu Gupta [Wed, 16 Apr 2014 02:30:35 +0000 (19:30 -0700)]
Layoutlib tests now check methods return value [DO NOT MERGE]
The change is a cherry-pick of relevant fixes from the following
commits on master branch:
the followning commits:
9be03c4e980d3058aeb3fd730da5f7d4a4a4f8a8 and
e05bb956ce429618fd4f971a9dc708b9313c59ea
Change-Id: I87cef323c4eaee4e9f60475f01156b276593fa50
Deepanshu Gupta [Wed, 12 Mar 2014 01:02:44 +0000 (18:02 -0700)]
Fix theme/style resolution in Layoutlib [DO NOT MERGE]
Change-Id: Icfb91e566666408802dadc0e2070991151b16b9d
(cherry picked from commit
bfec73c2db5a34ced248213edf5519c80727a65f)
Conflicts:
core/java/android/content/res/Resources.java
tools/layoutlib/create/src/com/android/tools/layoutlib/create/CreateInfo.java
Deepanshu Gupta [Thu, 13 Feb 2014 01:37:46 +0000 (17:37 -0800)]
Overflow menu popup for Action Bar in Layoutlib [DO NOT MERGE]
Adds MenuBuilderAccessor in addition to the cherry-picked changes.
Change-Id: Ib7cc314079099c010f7d53849e204db36c410357
(cherry-picked from commit
929eea6bc1824bf98d244550c0984ecf8ea98811)
Deepanshu Gupta [Thu, 12 Dec 2013 20:16:24 +0000 (12:16 -0800)]
Action bar rendering in layoutlib [DO NOT MERGE]
This also makes a couple of changes to the framework:
1. ShareActionProvider - Use edit mode to execute activity chooser code.
2. ActionBarImpl - add a new constructor for use by layoutlib.
This also relies on some changes to the plugin to pass the correct params.
Change-Id: Ia30fef816afd91ec1e439734d56b59b1323bfee2
(cherry-picked from
14bf0cef7eeed572a67c29a328581afac4decc20)
Deepanshu Gupta [Wed, 9 Apr 2014 22:14:37 +0000 (15:14 -0700)]
Support custom views using TimePickerDialog [DO NOT MERGE]
Bug: http://b.android/com/61515
Change-Id: I0dc3357be0c058adde9d3ea5b6796004b786fd34
(cherry picked from commit
86e5218220a0e01f7eb574a2480bd91f9ebfae35)
Vinod Krishnan [Tue, 15 Apr 2014 23:45:26 +0000 (23:45 +0000)]
Merge "Set wearable specific strings in framework" into klp-modular-dev
quddusc [Tue, 15 Apr 2014 18:29:05 +0000 (18:29 +0000)]
am
fe0996b7: am
60095240: docs: Updated the gradle build number to 4.3.23. Bug:
14043082
* commit '
fe0996b7c09606fab0c1645d6c329cadf4d82841':
docs: Updated the gradle build number to 4.3.23. Bug:
14043082
Katie McCormick [Tue, 15 Apr 2014 18:28:59 +0000 (18:28 +0000)]
am
2b4d89b7: am
eca07bfa: Merge "Doc change: Update CCS doc with new quota info." into klp-docs
* commit '
2b4d89b7dcea13140b64e887b2a36042e8d491e9':
Doc change: Update CCS doc with new quota info.
Adam Powell [Mon, 3 Feb 2014 18:16:49 +0000 (10:16 -0800)]
DO NOT MERGE Refactoring of fitSystemWindows to applyWindowInsets for views
Applying insets is now handled by:
* WindowInsets class - Encapsulate system insets and local decor
insets into a single object, written specifically so that new inset
categories may be added later. Apps cannot construct their own
WindowInsets, only clone with optional modifications. This is to
prevent losing data in the event of new insets added in the future.
* onApplyWindowInsets - Actually perform the application of insets.
* OnApplyWindowInsetsListener - Allow an app to use a separate
Listener object to apply insets to a View. This allows for things
like support lib integration in custom views written for older
versions where the verifier would otherwise complain about the use
of the new WindowInsets class as a method parameter. It also allows
for applying insets in a custom way without writing a custom view.
* dispatchApplyWindowInsets - Dispatch the call to self and children
in turn, if applicable. An OnApplyWindowInsetsListener will override
the behavior of the view's default onApplyWindowInsets method; a
listener wishing to call down to the 'superclass' implementation as
part of its own operation should call view.onApplyWindowInsets. App
code should generally not override this method and instead override
onApplyWindowInsets or provide a listener.
Compatibility support with the existing fitSystemWindows method has
been provided in both directions: for code that previously called
fitSystemWindows on arbitrary views and also for code that overrode
the fitSystemWindows method in custom views. A view that supports the
newer onApplyWindowInsets mechanism should not mix that behavior with
other calls to fitSystemWindows or vice versa. Support lib-style code
should take care to consistently use one mechanism or the other at
runtime.
Change-Id: Ie88b96e0382beb5d3c3f6cd013f7043acbc0a105
quddusc [Tue, 15 Apr 2014 17:12:03 +0000 (17:12 +0000)]
am
60095240: docs: Updated the gradle build number to 4.3.23. Bug:
14043082
* commit '
60095240e2a1b1c96ee4caf6cd7e9e1fa38acbb8':
docs: Updated the gradle build number to 4.3.23. Bug:
14043082
quddusc [Tue, 15 Apr 2014 01:14:22 +0000 (18:14 -0700)]
docs: Updated the gradle build number to 4.3.23.
Bug:
14043082
Change-Id: I8068f34b2533631b16dbaeaae3a0465088cc5aaf
Katie McCormick [Tue, 15 Apr 2014 16:55:32 +0000 (16:55 +0000)]
am
eca07bfa: Merge "Doc change: Update CCS doc with new quota info." into klp-docs
* commit '
eca07bfaaf89d5c0280dbc44b165ee1e3ca13498':
Doc change: Update CCS doc with new quota info.
Katie McCormick [Tue, 15 Apr 2014 16:52:44 +0000 (16:52 +0000)]
Merge "Doc change: Update CCS doc with new quota info." into klp-docs
quddusc [Mon, 14 Apr 2014 22:51:45 +0000 (22:51 +0000)]
am
0bd51600: am
41fb2be0: docs: Updated name of API to "Google Maps Android API v2". Bug:
13666553
* commit '
0bd516001988517aade19feb087de5cb03820805':
docs: Updated name of API to "Google Maps Android API v2". Bug:
13666553
quddusc [Mon, 14 Apr 2014 22:47:51 +0000 (22:47 +0000)]
am
41fb2be0: docs: Updated name of API to "Google Maps Android API v2". Bug:
13666553
* commit '
41fb2be0f2cb0f1a09b05f475ebb89fe4d975a68':
docs: Updated name of API to "Google Maps Android API v2". Bug:
13666553
Katie McCormick [Fri, 17 Jan 2014 21:06:12 +0000 (13:06 -0800)]
Doc change: Update CCS doc with new quota info.
Fix for:
b/
12665669
Change-Id: I08f812d37ab6f4347f6401b3a9682c45d96adb81
OSDN Git Service
