OSDN Git Service
Jean-Michel Trivi [Fri, 29 Aug 2014 16:41:10 +0000 (16:41 +0000)]
am
9ea996a3: Do not restore the media button event receiver
* commit '
9ea996a330a21af89f308bdf52e02a470643013b':
Do not restore the media button event receiver
Jean-Michel Trivi [Mon, 25 Aug 2014 18:23:36 +0000 (11:23 -0700)]
Do not restore the media button event receiver
Do not restore the media button event receiver on behalf of the
application that registered. Prevents reported vulnerability.
Bug
15428797
Change-Id: I507faefd211def0d2ea074706de76c0d06157c5a
Deepanshu Gupta [Wed, 6 Aug 2014 22:00:14 +0000 (15:00 -0700)]
resolved conflicts for merge of
a232a68d to jb-mr1.1-docs
Change-Id: I1ea220e3e0a81880db68abab87beab56dc4a336c
Deepanshu Gupta [Wed, 6 Aug 2014 21:41:02 +0000 (14:41 -0700)]
resolved conflicts for merge of
5476cfee to jb-mr1-dev
Change-Id: I5197271e6fdd36fed9ca9f9b7221d9a99141a4b4
Deepanshu Gupta [Wed, 6 Aug 2014 21:28:24 +0000 (21:28 +0000)]
am
505c675c: Fix SystemProperties in LayoutLib.
* commit '
505c675c3a536ac7c6ad264eb62542537532119c':
Fix SystemProperties in LayoutLib.
Deepanshu Gupta [Wed, 6 Aug 2014 00:33:35 +0000 (17:33 -0700)]
Fix SystemProperties in LayoutLib.
Not all System Properties were used via Build class. Also, properties
like SDK_INT which called SystemProperties directly were not initialized
properly.
This change is essentially cherry picking of the relevant parts from the
following commits:
984749bf75c9ce9d3401b8410ea7d6276544b6ee
167bc25bceea9280bbe4858db4cb8233f86ce325
Bug: http://b.android.com/73046
Change-Id: Ia0fb467ee6d5fdedda500d57d02be20006f115df
Deepanshu Gupta [Fri, 18 Jul 2014 21:50:15 +0000 (21:50 +0000)]
am
9c48ab82: am
ccf7b2aa: am
5af7324a: Fix style resolution for styles with \'.\' [DO NOT MERGE]
* commit '
9c48ab82084828087c47086f2379b4927ec057e2':
Fix style resolution for styles with '.' [DO NOT MERGE]
Deepanshu Gupta [Fri, 18 Jul 2014 21:45:28 +0000 (21:45 +0000)]
am
ccf7b2aa: am
5af7324a: Fix style resolution for styles with \'.\' [DO NOT MERGE]
* commit '
ccf7b2aac600b6069f03f7f420872b64cc5e6726':
Fix style resolution for styles with '.' [DO NOT MERGE]
Deepanshu Gupta [Fri, 18 Jul 2014 21:39:35 +0000 (21:39 +0000)]
am
5af7324a: Fix style resolution for styles with \'.\' [DO NOT MERGE]
* commit '
5af7324ace4f318d7395b680beabec7a0f0e39b3':
Fix style resolution for styles with '.' [DO NOT MERGE]
Deepanshu Gupta [Thu, 10 Jul 2014 00:27:07 +0000 (17:27 -0700)]
Fix style resolution for styles with '.' [DO NOT MERGE]
Bug: b.android.com/72698
Change-Id: I96fb549cf5787d9e8cde2245524a8173471a60ca
(cherry picked from commit
f2fa79e9b56b71f8aa30e6675255df69f88a173d)
Deepanshu Gupta [Wed, 4 Jun 2014 20:10:55 +0000 (20:10 +0000)]
am
8782a120: resolved conflicts for merge of
61fb5784 to jb-mr1-dev
* commit '
8782a12005e90bbd49be579fb8ede3a42a007380':
Distinguish between menus in ActionBar and popup. [DO NOT MERGE]
Deepanshu Gupta [Wed, 4 Jun 2014 19:43:01 +0000 (12:43 -0700)]
resolved conflicts for merge of
61fb5784 to jb-mr1-dev
Change-Id: I079d5db0d69fd1972e6754cdd1829dfd1645202d
Deepanshu Gupta [Wed, 4 Jun 2014 19:32:05 +0000 (19:32 +0000)]
am
3ff08eb6: Distinguish between menus in ActionBar and popup. [DO NOT MERGE]
* commit '
3ff08eb6bf68868d4f4e872fbbf1ecaf521934a9':
Distinguish between menus in ActionBar and popup. [DO NOT MERGE]
Deepanshu Gupta [Tue, 3 Jun 2014 20:28:48 +0000 (20:28 +0000)]
am
5f56ea8d: am
f48ab8fe: am
3b7c09b4: LayoutLib: Correctly resolve ?attr/foo [DO NOT MERGE]
* commit '
5f56ea8d802b3a7ce5ba8992a84dd3b462676e0e':
LayoutLib: Correctly resolve ?attr/foo [DO NOT MERGE]
Deepanshu Gupta [Tue, 3 Jun 2014 20:24:25 +0000 (20:24 +0000)]
am
f48ab8fe: am
3b7c09b4: LayoutLib: Correctly resolve ?attr/foo [DO NOT MERGE]
* commit '
f48ab8feec71419e574a2d2f08a29be87743ef07':
LayoutLib: Correctly resolve ?attr/foo [DO NOT MERGE]
Deepanshu Gupta [Tue, 3 Jun 2014 20:21:10 +0000 (20:21 +0000)]
am
3b7c09b4: LayoutLib: Correctly resolve ?attr/foo [DO NOT MERGE]
* commit '
3b7c09b4336f421c489523c10278ecfbfb0708a7':
LayoutLib: Correctly resolve ?attr/foo [DO NOT MERGE]
Deepanshu Gupta [Thu, 15 May 2014 16:32:12 +0000 (09:32 -0700)]
Distinguish between menus in ActionBar and popup. [DO NOT MERGE]
Mark the menus in the ActionBar and the ones in the Overflow popup
separately. This enables the IDE to differentiate between the two and
enable gestures such as double-click to open the menu xml for menus in
the ActionBar and single click for the menus in the Overflow popup.
Change-Id: I7a23f87d34d618a134ffbe3a665be695915d4bae
(cherry picked from commit
03c0735017a34bac9ea69600b8cf980775331f0e)
Deepanshu Gupta [Fri, 16 May 2014 00:37:34 +0000 (17:37 -0700)]
LayoutLib: Correctly resolve ?attr/foo [DO NOT MERGE]
?attr/foo in platform files wasn't resolved properly. The IDE checked
the app namespace for the attribute even though it is being referenced
from a platform file.
Change-Id: I7db6dfef5b540d99804c298120578da9d060b886
(cherry picked from commit
08d2007b33838570a96c8df890f0757fa920904c)
Deepanshu Gupta [Tue, 13 May 2014 23:40:37 +0000 (23:40 +0000)]
am
40bfb60e: Fix build due to incorrect merges [DO NOT MERGE]
* commit '
40bfb60efa0e92259a417a5cbfd6095759c678b7':
Fix build due to incorrect merges [DO NOT MERGE]
Deepanshu Gupta [Tue, 13 May 2014 23:40:34 +0000 (23:40 +0000)]
Deepanshu Gupta [Tue, 13 May 2014 22:52:39 +0000 (15:52 -0700)]
Fix build due to incorrect merges [DO NOT MERGE]
Change-Id: Ib3b4dafeed6ba4c07450d13d9908fb05a1a4542f
Deepanshu Gupta [Tue, 13 May 2014 22:46:28 +0000 (15:46 -0700)]
Fix build
remove a line that shouldn't have been merged into this branch.
The build will still be broken for this branch, but this will fix it for
many branches downstream.
Change-Id: I2f556636640eb823dc2834afae7b536e79b79607
Deepanshu Gupta [Tue, 13 May 2014 17:58:17 +0000 (17:58 +0000)]
am
bd5a3e65: am
1677a9bd: Merge "resolve conflicts for merge
5a7b3b65 correctly" into jb-dev-plus-aosp
* commit '
bd5a3e6510e83b161a0e40c191d349524ae4a8e6':
resolve conflicts for merge
5a7b3b65 correctly
Deepanshu Gupta [Tue, 13 May 2014 17:58:14 +0000 (17:58 +0000)]
am
0ad4f2ce: resolved conflicts for merge of
7377c7be to jb-mr1-dev
* commit '
0ad4f2cedde037c2b09a7f09c5f95f0984267c64':
Add Navigation Bar to BridgeWindowManager [DO NOT MERGE]
Deepanshu Gupta [Tue, 13 May 2014 17:53:55 +0000 (17:53 +0000)]
am
1677a9bd: Merge "resolve conflicts for merge
5a7b3b65 correctly" into jb-dev-plus-aosp
* commit '
1677a9bdeba3961625236925e754920fca1b7e89':
resolve conflicts for merge
5a7b3b65 correctly
Deepanshu Gupta [Tue, 13 May 2014 17:44:24 +0000 (10:44 -0700)]
resolved conflicts for merge of
7377c7be to jb-mr1-dev
Change-Id: I26d2e3478536826608413094e17cd36da43b4e23
Deepanshu Gupta [Tue, 13 May 2014 17:42:09 +0000 (17:42 +0000)]
am
5dae7fda: am
9359dc2e: am
2d3fa7ba: Support actionProviderClass attribute for menus [DO NOT MERGE]
* commit '
5dae7fda38850a5146a6b8a4edbfd9aa96aea484':
Support actionProviderClass attribute for menus [DO NOT MERGE]
Deepanshu Gupta [Tue, 13 May 2014 17:42:06 +0000 (17:42 +0000)]
am
b6de60e0: am
df2da3d7: am
7bc363ba: Add special system view cookie to OverflowButton. [DO NOT MERGE]
* commit '
b6de60e0020dbed906b1d275de17f8c615b2b242':
Add special system view cookie to OverflowButton. [DO NOT MERGE]
Deepanshu Gupta [Tue, 13 May 2014 17:42:03 +0000 (17:42 +0000)]
am
ae5e0c7b: am
4eab4e14: am
5268248e: Use ApplicationInfo only when not in edit mode [DO NOT MERGE]
* commit '
ae5e0c7b9f24564547d38a77641b120d6685dd5a':
Use ApplicationInfo only when not in edit mode [DO NOT MERGE]
Deepanshu Gupta [Tue, 13 May 2014 17:42:00 +0000 (17:42 +0000)]
am
673d9734: resolved conflicts for merge of
00d09649 to jb-mr1-dev
* commit '
673d9734c2d9b62ecd41dcac3c730d242952989e':
Fix style warnings in RenderSessionImpl [DO NOT MERGE]
Deepanshu Gupta [Tue, 13 May 2014 17:40:55 +0000 (17:40 +0000)]
am
9359dc2e: am
2d3fa7ba: Support actionProviderClass attribute for menus [DO NOT MERGE]
* commit '
9359dc2e7d6bc671af3fee0c1dc540dd3685365c':
Support actionProviderClass attribute for menus [DO NOT MERGE]
Deepanshu Gupta [Tue, 13 May 2014 17:40:52 +0000 (17:40 +0000)]
am
df2da3d7: am
7bc363ba: Add special system view cookie to OverflowButton. [DO NOT MERGE]
* commit '
df2da3d7c9f82ff2304f630f4ff9fc2cb3001c6f':
Add special system view cookie to OverflowButton. [DO NOT MERGE]
Deepanshu Gupta [Tue, 13 May 2014 17:40:49 +0000 (17:40 +0000)]
am
4eab4e14: am
5268248e: Use ApplicationInfo only when not in edit mode [DO NOT MERGE]
* commit '
4eab4e14c8453a0b41923c714a05dccdd72d7829':
Use ApplicationInfo only when not in edit mode [DO NOT MERGE]
Deepanshu Gupta [Tue, 13 May 2014 17:17:09 +0000 (10:17 -0700)]
resolved conflicts for merge of
00d09649 to jb-mr1-dev
Change-Id: Ib3c34a1989d4251c3ac4755c52fe05a81644930a
Deepanshu Gupta [Tue, 13 May 2014 17:14:17 +0000 (17:14 +0000)]
am
5280c911: am
0df5ae65: am
0f209967: Add view cookies for action bar menus. [DO NOT MERGE]
* commit '
5280c911d81a7db5ec8854850bef60d8b0951358':
Add view cookies for action bar menus. [DO NOT MERGE]
Deepanshu Gupta [Tue, 13 May 2014 17:14:15 +0000 (17:14 +0000)]
am
f192096a: am
17585160: am
26c37321: Add missing layout params to xlarge action bar. [DO NOT MERGE]
* commit '
f192096a137ea0a789b2adca2111742beccb4533':
Add missing layout params to xlarge action bar. [DO NOT MERGE]
Deepanshu Gupta [Tue, 13 May 2014 17:14:12 +0000 (17:14 +0000)]
am
1867f58d: am
3027b69e: am
f7e57949: Overflow menu popup for Action Bar in Layoutlib [DO NOT MERGE]
* commit '
1867f58d6ceebac899b60b029e34f3a1fcabba7f':
Overflow menu popup for Action Bar in Layoutlib [DO NOT MERGE]
Deepanshu Gupta [Tue, 13 May 2014 17:14:09 +0000 (17:14 +0000)]
am
a5461ebf: resolved conflicts for merge of
6d3c4ab2 to jb-mr1-dev
* commit '
a5461ebfaebf3337a0cf1c752334f23de145a6d1':
Action bar rendering in layoutlib [DO NOT MERGE]
Deepanshu Gupta [Tue, 13 May 2014 17:11:26 +0000 (17:11 +0000)]
am
0df5ae65: am
0f209967: Add view cookies for action bar menus. [DO NOT MERGE]
* commit '
0df5ae65a91174c99d1af633b45b3a1a7861cd1c':
Add view cookies for action bar menus. [DO NOT MERGE]
Deepanshu Gupta [Tue, 13 May 2014 17:11:23 +0000 (17:11 +0000)]
am
17585160: am
26c37321: Add missing layout params to xlarge action bar. [DO NOT MERGE]
* commit '
175851600c7757c73f91d1be0f960de157228b1c':
Add missing layout params to xlarge action bar. [DO NOT MERGE]
Deepanshu Gupta [Tue, 13 May 2014 17:11:20 +0000 (17:11 +0000)]
am
3027b69e: am
f7e57949: Overflow menu popup for Action Bar in Layoutlib [DO NOT MERGE]
* commit '
3027b69e154cffc6e286caf90b0f9af01c473c14':
Overflow menu popup for Action Bar in Layoutlib [DO NOT MERGE]
Deepanshu Gupta [Tue, 13 May 2014 16:40:35 +0000 (09:40 -0700)]
resolved conflicts for merge of
6d3c4ab2 to jb-mr1-dev
Change-Id: I5c4634897882deb663f32d8148202d7c9189521d
Deepanshu Gupta [Tue, 13 May 2014 16:36:56 +0000 (16:36 +0000)]
am
9053261a: am
052e0c58: am
770e40f8: Fix theme/style resolution in Layoutlib [DO NOT MERGE]
* commit '
9053261a5413f401168d25fa4a9749723b232949':
Fix theme/style resolution in Layoutlib [DO NOT MERGE]
Deepanshu Gupta [Tue, 13 May 2014 16:36:53 +0000 (16:36 +0000)]
am
5594616c: am
9602fc1c: am
87665388: Fix visitFieldInsn in layoutlib_create. [DO NOT MERGE]
* commit '
5594616c4f4513dc97b08d6cabb6fd7127dde131':
Fix visitFieldInsn in layoutlib_create. [DO NOT MERGE]
Deepanshu Gupta [Tue, 13 May 2014 16:36:50 +0000 (16:36 +0000)]
am
45693e50: am
c9a4badb: am
d915dcac: Layoutlib tests now check methods return value [DO NOT MERGE]
* commit '
45693e50ecdae9b456e4974dd91758f9e25df2b4':
Layoutlib tests now check methods return value [DO NOT MERGE]
Deepanshu Gupta [Tue, 13 May 2014 16:36:48 +0000 (16:36 +0000)]
am
e3b43270: am
bdd8fbf6: am
877ae535: Set default text style in layoutlib as NORMAL [DO NOT MERGE]
* commit '
e3b43270e87fd85a6281c91f2897233aac6b6397':
Set default text style in layoutlib as NORMAL [DO NOT MERGE]
Deepanshu Gupta [Tue, 13 May 2014 16:36:45 +0000 (16:36 +0000)]
am
45ca5ba7: am
01cdd312: am
669792b3: Fix sans-serif-thin and sans-serif-light fonts in layoutlib. [DO NOT MERGE]
* commit '
45ca5ba7dc3b70dd39991217894eed114eefb1b8':
Fix sans-serif-thin and sans-serif-light fonts in layoutlib. [DO NOT MERGE]
Deepanshu Gupta [Tue, 13 May 2014 16:36:42 +0000 (16:36 +0000)]
am
9f965258: am
d094742d: am
cda89ca0: Fix a bug in Nine Patch library. [DO NOT MERGE]
* commit '
9f9652587dd08e5a4f7c8195eb904cd0f0c3f6c4':
Fix a bug in Nine Patch library. [DO NOT MERGE]
Deepanshu Gupta [Tue, 13 May 2014 16:36:39 +0000 (16:36 +0000)]
am
8c5c2410: am
7bb8de58: am
a2b34c96: Optimize layout rendering in layoutlib [DO NOT MERGE]
* commit '
8c5c2410ae9df60d9462784370965a0417e06fa4':
Optimize layout rendering in layoutlib [DO NOT MERGE]
Deepanshu Gupta [Tue, 13 May 2014 16:36:36 +0000 (16:36 +0000)]
am
48bf7b49: am
69b3115e: am
e183855c: Add methods for Time_Delegate [DO NOT MERGE]
* commit '
48bf7b49bb361a4084e5fb4c6d0ae497a606c700':
Add methods for Time_Delegate [DO NOT MERGE]
Deepanshu Gupta [Tue, 13 May 2014 16:36:33 +0000 (16:36 +0000)]
am
94d33cfc: am
82d5bd98: am
e5a2347b: Fix NPE in layoutlib. [DO NOT MERGE]
* commit '
94d33cfce1f32af4480f941fdd6c9942bb203d2c':
Fix NPE in layoutlib. [DO NOT MERGE]
Deepanshu Gupta [Tue, 13 May 2014 16:36:30 +0000 (16:36 +0000)]
am
d4e6727d: am
d5de1bd6: am
30505abe: Fix text size in Fake Action Bar. [DO NOT MERGE]
* commit '
d4e6727d02f7507fdfd6cbbabd03d6e922127e4b':
Fix text size in Fake Action Bar. [DO NOT MERGE]
Deepanshu Gupta [Tue, 13 May 2014 16:36:28 +0000 (16:36 +0000)]
am
ed98abec: am
8a70bcef: resolved conflicts for merge
5a7b3b65 to jb-dev-plus-aosp
* commit '
ed98abecad359ab1765ac1f698c8ba06dbd00745':
Remove references to non-std Java classes. [DO NOT MERGE]
Deepanshu Gupta [Tue, 13 May 2014 16:36:25 +0000 (16:36 +0000)]
am
2cbe100a: am
40fea8b1: am
4b5da86d: Fix DatePicker and Calendar widget in layoutlib. [DO NOT MERGE]
* commit '
2cbe100a9bc6d2b3bf828432a1527f0ac239e575':
Fix DatePicker and Calendar widget in layoutlib. [DO NOT MERGE]
Deepanshu Gupta [Tue, 13 May 2014 16:36:22 +0000 (16:36 +0000)]
am
632c9e2d: am
065ce2e8: am
5c166c9c: Layoutlib: Update the wifi icon in the status bar. [DO NOT MERGE]
* commit '
632c9e2dabc44b24f04c3418e4a3540b22db792b':
Layoutlib: Update the wifi icon in the status bar. [DO NOT MERGE]
Deepanshu Gupta [Tue, 13 May 2014 16:32:02 +0000 (16:32 +0000)]
am
052e0c58: am
770e40f8: Fix theme/style resolution in Layoutlib [DO NOT MERGE]
* commit '
052e0c589e5cf714ca71bc8d7b3ce8b3f6c4cb96':
Fix theme/style resolution in Layoutlib [DO NOT MERGE]
Deepanshu Gupta [Tue, 13 May 2014 16:31:59 +0000 (16:31 +0000)]
am
9602fc1c: am
87665388: Fix visitFieldInsn in layoutlib_create. [DO NOT MERGE]
* commit '
9602fc1c00e5e5cdf26cdc3fe22022ffcd115361':
Fix visitFieldInsn in layoutlib_create. [DO NOT MERGE]
Deepanshu Gupta [Tue, 13 May 2014 16:31:53 +0000 (16:31 +0000)]
am
c9a4badb: am
d915dcac: Layoutlib tests now check methods return value [DO NOT MERGE]
* commit '
c9a4badb54320f8c52d2da06a762b5e6eef00ee0':
Layoutlib tests now check methods return value [DO NOT MERGE]
Deepanshu Gupta [Tue, 13 May 2014 16:31:50 +0000 (16:31 +0000)]
am
bdd8fbf6: am
877ae535: Set default text style in layoutlib as NORMAL [DO NOT MERGE]
* commit '
bdd8fbf6eae886dc3b2cd716745ede918773a2c4':
Set default text style in layoutlib as NORMAL [DO NOT MERGE]
Deepanshu Gupta [Tue, 13 May 2014 16:31:47 +0000 (16:31 +0000)]
am
01cdd312: am
669792b3: Fix sans-serif-thin and sans-serif-light fonts in layoutlib. [DO NOT MERGE]
* commit '
01cdd3123f408dc41a2bd4786f3a943157ab6c69':
Fix sans-serif-thin and sans-serif-light fonts in layoutlib. [DO NOT MERGE]
Deepanshu Gupta [Tue, 13 May 2014 16:31:44 +0000 (16:31 +0000)]
am
d094742d: am
cda89ca0: Fix a bug in Nine Patch library. [DO NOT MERGE]
* commit '
d094742d2e19371291409886bb80f070df099533':
Fix a bug in Nine Patch library. [DO NOT MERGE]
Deepanshu Gupta [Tue, 13 May 2014 16:31:41 +0000 (16:31 +0000)]
am
7bb8de58: am
a2b34c96: Optimize layout rendering in layoutlib [DO NOT MERGE]
* commit '
7bb8de580a451621480913d7839fd7eb784ab689':
Optimize layout rendering in layoutlib [DO NOT MERGE]
Deepanshu Gupta [Tue, 13 May 2014 16:31:38 +0000 (16:31 +0000)]
am
69b3115e: am
e183855c: Add methods for Time_Delegate [DO NOT MERGE]
* commit '
69b3115e1c02f2b22165b93bd9bcc5c90ec69b12':
Add methods for Time_Delegate [DO NOT MERGE]
Deepanshu Gupta [Tue, 13 May 2014 16:31:35 +0000 (16:31 +0000)]
am
82d5bd98: am
e5a2347b: Fix NPE in layoutlib. [DO NOT MERGE]
* commit '
82d5bd98b77a9955e375b075e262639625c40232':
Fix NPE in layoutlib. [DO NOT MERGE]
Deepanshu Gupta [Tue, 13 May 2014 16:31:31 +0000 (16:31 +0000)]
am
d5de1bd6: am
30505abe: Fix text size in Fake Action Bar. [DO NOT MERGE]
* commit '
d5de1bd6305dc8885027504996602755b1e79099':
Fix text size in Fake Action Bar. [DO NOT MERGE]
Deepanshu Gupta [Tue, 13 May 2014 16:31:28 +0000 (16:31 +0000)]
am
8a70bcef: resolved conflicts for merge
5a7b3b65 to jb-dev-plus-aosp
* commit '
8a70bcef5a724906e3c35c58cb2266ee9c9e1b78':
Remove references to non-std Java classes. [DO NOT MERGE]
Deepanshu Gupta [Tue, 13 May 2014 16:31:23 +0000 (16:31 +0000)]
am
40fea8b1: am
4b5da86d: Fix DatePicker and Calendar widget in layoutlib. [DO NOT MERGE]
* commit '
40fea8b1bf689933e63941b5fa5e3379f82c88b5':
Fix DatePicker and Calendar widget in layoutlib. [DO NOT MERGE]
Deepanshu Gupta [Tue, 13 May 2014 16:31:20 +0000 (16:31 +0000)]
am
065ce2e8: am
5c166c9c: Layoutlib: Update the wifi icon in the status bar. [DO NOT MERGE]
* commit '
065ce2e8b3e11ff8bb1699748edbd23d272bc8a6':
Layoutlib: Update the wifi icon in the status bar. [DO NOT MERGE]
Deepanshu Gupta [Tue, 13 May 2014 16:31:05 +0000 (16:31 +0000)]
am
2fb139e0: resolved conflicts for merge of
9f2f5e77 to jb-mr1-dev
* commit '
2fb139e02c1e9d2d7c92acf813445a063e73d94f':
Fix CalendarView to show the right labels. [DO NOT MERGE]
Deepanshu Gupta [Tue, 13 May 2014 02:32:30 +0000 (02:32 +0000)]
Merge "resolve conflicts for merge
5a7b3b65 correctly" into jb-dev-plus-aosp
Deepanshu Gupta [Tue, 13 May 2014 02:31:25 +0000 (19:31 -0700)]
resolve conflicts for merge
5a7b3b65 correctly
Change-Id: I832b7ee50002bcd1429bf431cc91f12e60d19f84
Deepanshu Gupta [Tue, 13 May 2014 02:20:58 +0000 (02:20 +0000)]
am
3a115628: Add Navigation Bar to BridgeWindowManager [DO NOT MERGE]
* commit '
3a115628236ee9051518d4f96840cbb76070cf92':
Add Navigation Bar to BridgeWindowManager [DO NOT MERGE]
Deepanshu Gupta [Tue, 13 May 2014 02:20:54 +0000 (02:20 +0000)]
am
2d3fa7ba: Support actionProviderClass attribute for menus [DO NOT MERGE]
* commit '
2d3fa7ba782238afb891db38e29ef7ec755bfdf6':
Support actionProviderClass attribute for menus [DO NOT MERGE]
Deepanshu Gupta [Tue, 13 May 2014 02:20:51 +0000 (02:20 +0000)]
am
7bc363ba: Add special system view cookie to OverflowButton. [DO NOT MERGE]
* commit '
7bc363ba72d4cdd9a0b3b1601e432acfc09c0dc0':
Add special system view cookie to OverflowButton. [DO NOT MERGE]
Deepanshu Gupta [Tue, 13 May 2014 02:20:47 +0000 (02:20 +0000)]
am
5268248e: Use ApplicationInfo only when not in edit mode [DO NOT MERGE]
* commit '
5268248e0708951966e4f6514736a4030d5052da':
Use ApplicationInfo only when not in edit mode [DO NOT MERGE]
Deepanshu Gupta [Tue, 13 May 2014 02:20:44 +0000 (02:20 +0000)]
am
85f53c33: Fix style warnings in RenderSessionImpl [DO NOT MERGE]
* commit '
85f53c3335daf0e55cec757fd66fe560e0b020ef':
Fix style warnings in RenderSessionImpl [DO NOT MERGE]
Deepanshu Gupta [Tue, 13 May 2014 02:20:42 +0000 (02:20 +0000)]
am
0f209967: Add view cookies for action bar menus. [DO NOT MERGE]
* commit '
0f209967bfc4a6f1eec46cc34a39cfe8af9f8af9':
Add view cookies for action bar menus. [DO NOT MERGE]
Deepanshu Gupta [Tue, 13 May 2014 02:20:38 +0000 (02:20 +0000)]
am
26c37321: Add missing layout params to xlarge action bar. [DO NOT MERGE]
* commit '
26c373213592ce7fb5a09f23a3d9d3ca0727e346':
Add missing layout params to xlarge action bar. [DO NOT MERGE]
Deepanshu Gupta [Tue, 13 May 2014 02:20:35 +0000 (02:20 +0000)]
am
f7e57949: Overflow menu popup for Action Bar in Layoutlib [DO NOT MERGE]
* commit '
f7e5794990831df87d4097126f6d24455da50efe':
Overflow menu popup for Action Bar in Layoutlib [DO NOT MERGE]
Deepanshu Gupta [Tue, 13 May 2014 02:20:23 +0000 (02:20 +0000)]
am
43b15371: Action bar rendering in layoutlib [DO NOT MERGE]
* commit '
43b15371f9f1da7d97fe0500eb1536d981097e31':
Action bar rendering in layoutlib [DO NOT MERGE]
Deepanshu Gupta [Tue, 13 May 2014 02:20:20 +0000 (02:20 +0000)]
am
770e40f8: Fix theme/style resolution in Layoutlib [DO NOT MERGE]
* commit '
770e40f839f059e1e3a15a2b14157c7cbb3b0553':
Fix theme/style resolution in Layoutlib [DO NOT MERGE]
Deepanshu Gupta [Tue, 13 May 2014 02:20:16 +0000 (02:20 +0000)]
am
87665388: Fix visitFieldInsn in layoutlib_create. [DO NOT MERGE]
* commit '
87665388466812897e888680c0b2a1d7db1b9cbd':
Fix visitFieldInsn in layoutlib_create. [DO NOT MERGE]
Deepanshu Gupta [Tue, 13 May 2014 02:20:13 +0000 (02:20 +0000)]
am
d915dcac: Layoutlib tests now check methods return value [DO NOT MERGE]
* commit '
d915dcac365b6d3ad88afab52e74ccca7dfbefec':
Layoutlib tests now check methods return value [DO NOT MERGE]
Deepanshu Gupta [Tue, 13 May 2014 02:20:10 +0000 (02:20 +0000)]
am
877ae535: Set default text style in layoutlib as NORMAL [DO NOT MERGE]
* commit '
877ae53586c3f7f5b788a40dfb0a58bef54a7446':
Set default text style in layoutlib as NORMAL [DO NOT MERGE]
Deepanshu Gupta [Tue, 13 May 2014 02:20:07 +0000 (02:20 +0000)]
am
669792b3: Fix sans-serif-thin and sans-serif-light fonts in layoutlib. [DO NOT MERGE]
* commit '
669792b303b99a003bbcbf8d962f5be1debf9b63':
Fix sans-serif-thin and sans-serif-light fonts in layoutlib. [DO NOT MERGE]
Deepanshu Gupta [Tue, 13 May 2014 02:19:59 +0000 (02:19 +0000)]
am
cda89ca0: Fix a bug in Nine Patch library. [DO NOT MERGE]
* commit '
cda89ca02548c19250ae55671c055536b64b74f8':
Fix a bug in Nine Patch library. [DO NOT MERGE]
Deepanshu Gupta [Tue, 13 May 2014 02:19:56 +0000 (02:19 +0000)]
am
a2b34c96: Optimize layout rendering in layoutlib [DO NOT MERGE]
* commit '
a2b34c96f1ef24d96854d1e23426dec7774510e8':
Optimize layout rendering in layoutlib [DO NOT MERGE]
Deepanshu Gupta [Tue, 13 May 2014 02:19:52 +0000 (02:19 +0000)]
am
e183855c: Add methods for Time_Delegate [DO NOT MERGE]
* commit '
e183855c1eb7baf750c67bb20e70fb887eba7af6':
Add methods for Time_Delegate [DO NOT MERGE]
Deepanshu Gupta [Tue, 13 May 2014 02:19:49 +0000 (02:19 +0000)]
am
e5a2347b: Fix NPE in layoutlib. [DO NOT MERGE]
* commit '
e5a2347bc6cf1506799136af4c9724275ca0247e':
Fix NPE in layoutlib. [DO NOT MERGE]
Deepanshu Gupta [Tue, 13 May 2014 02:19:46 +0000 (02:19 +0000)]
am
30505abe: Fix text size in Fake Action Bar. [DO NOT MERGE]
* commit '
30505abeb6cda9d042ec41f2563d561714eac46b':
Fix text size in Fake Action Bar. [DO NOT MERGE]
Deepanshu Gupta [Tue, 13 May 2014 02:02:56 +0000 (02:02 +0000)]
am
f20c9c66: am
06c4f23d: am
64dc0380: Fix layoutlib [DO NOT MERGE]
* commit '
f20c9c660edcce0fe90ba5f8464f726dcd51229e':
Fix layoutlib [DO NOT MERGE]
Deepanshu Gupta [Tue, 13 May 2014 02:02:54 +0000 (02:02 +0000)]
am
3990ec34: am
cdb87d8d: am
a59c27dd: Fix ClassCastException when rendering ListView [DO NOT MERGE]
* commit '
3990ec3490cc43a2690163f2a973b5ac6c4bdc46':
Fix ClassCastException when rendering ListView [DO NOT MERGE]
Deepanshu Gupta [Tue, 13 May 2014 02:02:50 +0000 (02:02 +0000)]
am
4d69ca22: am
edae4e69: am
8a39c3af: Add orientation to configuration for layoutlib. [DO NOT MERGE]
* commit '
4d69ca223b268d4ed93baf9d3c354e1df79d55ce':
Add orientation to configuration for layoutlib. [DO NOT MERGE]
Deepanshu Gupta [Tue, 13 May 2014 02:01:41 +0000 (19:01 -0700)]
resolved conflicts for merge of
9f2f5e77 to jb-mr1-dev
Change-Id: Id8cb5e2e9d0c41bdaf767563ebd6e3951ae68a3c
Deepanshu Gupta [Tue, 13 May 2014 01:57:34 +0000 (18:57 -0700)]
resolved conflicts for merge
5a7b3b65 to jb-dev-plus-aosp
Change-Id: I6bafdb9c6a8dfc6f55a4d9adf67f447661137eb8
Deepanshu Gupta [Tue, 13 May 2014 01:57:25 +0000 (01:57 +0000)]
am
06c4f23d: am
64dc0380: Fix layoutlib [DO NOT MERGE]
* commit '
06c4f23d737082717f37f5f3583d9c12f4b64bf2':
Fix layoutlib [DO NOT MERGE]
Deepanshu Gupta [Tue, 13 May 2014 01:57:22 +0000 (01:57 +0000)]
am
cdb87d8d: am
a59c27dd: Fix ClassCastException when rendering ListView [DO NOT MERGE]
* commit '
cdb87d8d83e8a76a4cf78d24d5c49ee8548eba1f':
Fix ClassCastException when rendering ListView [DO NOT MERGE]
Deepanshu Gupta [Tue, 13 May 2014 01:57:18 +0000 (01:57 +0000)]
am
edae4e69: am
8a39c3af: Add orientation to configuration for layoutlib. [DO NOT MERGE]
* commit '
edae4e69512a7c9df1076fde70de83e15053a30a':
Add orientation to configuration for layoutlib. [DO NOT MERGE]
Deepanshu Gupta [Tue, 13 May 2014 01:52:32 +0000 (01:52 +0000)]
am
4b5da86d: Fix DatePicker and Calendar widget in layoutlib. [DO NOT MERGE]
* commit '
4b5da86d04200ba278b62ff99da91e212b87e9af':
Fix DatePicker and Calendar widget in layoutlib. [DO NOT MERGE]
Deepanshu Gupta [Tue, 13 May 2014 01:52:28 +0000 (01:52 +0000)]
am
5c166c9c: Layoutlib: Update the wifi icon in the status bar. [DO NOT MERGE]
* commit '
5c166c9c04b6ea9d4955830e7ba277be71f17a6f':
Layoutlib: Update the wifi icon in the status bar. [DO NOT MERGE]
OSDN Git Service
