OSDN Git Service
Justin Koh [Tue, 13 May 2014 23:52:17 +0000 (16:52 -0700)]
resolved conflicts for merge of
32c5f299 to master
Change-Id: I72656792e109fea82c63a3a42151c024630f5997
George Mount [Tue, 13 May 2014 23:31:09 +0000 (23:31 +0000)]
Merge "Check for null Drawable in MoveImage"
Justin Koh [Tue, 13 May 2014 23:24:33 +0000 (23:24 +0000)]
am
78b94de4: Set KITKAT_WATCH to be level 20, document API specific changes.
* commit '
78b94de4b527c26bb3c038ae4f8cc351b3b4881f':
Set KITKAT_WATCH to be level 20, document API specific changes.
Justin Koh [Tue, 13 May 2014 22:48:42 +0000 (15:48 -0700)]
Set KITKAT_WATCH to be level 20, document API specific changes.
Bug:
14116162
Change-Id: Iab094dbd0add414a365234c275bd473787b8803b
Justin Koh [Tue, 13 May 2014 22:50:46 +0000 (22:50 +0000)]
am
72a4c15c: (-s ours) am
5e6b8d37: Merge "Hide new methods in notificationlistenerservice DO NOT MERGE" into klp-modular-dev
* commit '
72a4c15c49332965251315901f44905a66653adc':
Hide new methods in notificationlistenerservice DO NOT MERGE
Justin Koh [Tue, 13 May 2014 22:45:50 +0000 (22:45 +0000)]
am
5e6b8d37: Merge "Hide new methods in notificationlistenerservice DO NOT MERGE" into klp-modular-dev
* commit '
5e6b8d37cfdf6849890c730045f01ca5a0b4b8e8':
Hide new methods in notificationlistenerservice DO NOT MERGE
John Spurlock [Tue, 13 May 2014 22:45:41 +0000 (22:45 +0000)]
Merge "New quick settings implementation."
John Spurlock [Wed, 7 May 2014 21:49:08 +0000 (17:49 -0400)]
New quick settings implementation.
Bug:
14133785
Change-Id: I7f57f8e7ebcc3e1a06fa5204f477470f14299e1f
Justin Koh [Tue, 13 May 2014 22:42:46 +0000 (22:42 +0000)]
Merge "Hide new methods in notificationlistenerservice DO NOT MERGE" into klp-modular-dev
Justin Koh [Tue, 13 May 2014 22:09:28 +0000 (15:09 -0700)]
Hide new methods in notificationlistenerservice DO NOT MERGE
Hide new methods in notificationlistenerservice for now.
Bug:
14116162
Change-Id: Ib57fd2feff174ab8638bd172710873e9e2be553a
John Reck [Tue, 13 May 2014 21:59:35 +0000 (21:59 +0000)]
Merge "Clamp to uint8 for alpha"
John Reck [Tue, 13 May 2014 21:59:31 +0000 (21:59 +0000)]
Merge "Wire up texture atlas"
John Reck [Tue, 13 May 2014 20:39:31 +0000 (13:39 -0700)]
Wire up texture atlas
Bug:
14590563
Change-Id: I2dffbc089dc801f5fb2d1c8fd38e1c71d160e110
Deepanshu Gupta [Tue, 13 May 2014 21:43:58 +0000 (21:43 +0000)]
am
dcf080d5: am
56a794f2: am
96e30774: am
fea4b4dd: am
3450dc32: am
06018d92: am
f41a380b: am
d10ca17d: am
8921409a: am
10fb4fe4: am
d99dd3e7: am
70efbad0: am
bd5a3e65: am
1677a9bd: Merge "resolve conflicts for merge
5a7b3b65 correctly" into jb-dev-plus-aosp
* commit '
dcf080d571e9b40266a961ddd1a421efecdded1a':
resolve conflicts for merge
5a7b3b65 correctly
Deepanshu Gupta [Tue, 13 May 2014 21:43:52 +0000 (21:43 +0000)]
am
465a9926: am
21dc46b1: am
569dc64c: am
69ab5946: am
fcfb8801: am
18b1525a: am
ef24a509: am
900954e3: am
2100476a: am
31a3760a: am
964023c5: am
8bf73eae: am
0ad4f2ce: resolved conflicts for merge of
7377c7be to jb-mr1-dev
* commit '
465a99260ea1d868e9aa43d08e63cb85892f188e':
Add Navigation Bar to BridgeWindowManager [DO NOT MERGE]
Deepanshu Gupta [Tue, 13 May 2014 21:43:49 +0000 (21:43 +0000)]
am
83dcd3f9: am
bda6d9a1: am
9a3e6ec7: am
cdc40eb0: am
6fd1703e: (-s ours) am
0d33f604: am
4dff881b: am
7b9cc710: (-s ours) am
9c7e3064: am
1b0f6056: am
c1847b54: am
5454be00: am
5dae7fda: am
9359dc2e: am
2d3fa7ba: Support actionProviderClass attribute for menus [DO N
* commit '
83dcd3f97fd2b48c8a6625fd596bdf577c22f390':
Support actionProviderClass attribute for menus [DO NOT MERGE]
Deepanshu Gupta [Tue, 13 May 2014 21:43:45 +0000 (21:43 +0000)]
am
55f0c874: am
5f421714: am
03ccc80d: am
c909b4d5: am
2322a910: am
75fc74d6: am
203964c0: am
b7e1bef1: am
b607cb82: am
27c9b568: am
e969ee5e: resolved conflicts for merge of
d388afad to jb-mr1.1-dev
* commit '
55f0c8743555cbc9276c79afad8a0b633b012ec7':
Add special system view cookie to OverflowButton. [DO NOT MERGE]
Deepanshu Gupta [Tue, 13 May 2014 21:43:41 +0000 (21:43 +0000)]
am
4f9bb377: am
93d10eda: am
db83a08b: am
86726f58: am
eb5b38b1: (-s ours) am
a350f96e: am
0eb268a0: am
22dabb52: (-s ours) am
c261cb0d: am
f354d01a: am
aab60856: am
ebd909cc: am
ae5e0c7b: am
4eab4e14: am
5268248e: Use ApplicationInfo only when not in edit mode [DO NO
* commit '
4f9bb377590f81e80da1caf69243507a5a704189':
Use ApplicationInfo only when not in edit mode [DO NOT MERGE]
Deepanshu Gupta [Tue, 13 May 2014 21:43:38 +0000 (21:43 +0000)]
am
8fdd8f65: am
3d491e37: am
84cea707: am
0573cffa: am
b520cc45: am
cf2af661: am
752b90f2: am
919ce205: am
03bf747f: am
858ab06a: am
ec1b4df6: resolved conflicts for merge of
b161d6ba to jb-mr1.1-dev
* commit '
8fdd8f6576f2ec02da1a5b7c25d9b903b4fe8c05':
Fix style warnings in RenderSessionImpl [DO NOT MERGE]
Deepanshu Gupta [Tue, 13 May 2014 21:38:02 +0000 (21:38 +0000)]
am
56a794f2: am
96e30774: am
fea4b4dd: am
3450dc32: am
06018d92: am
f41a380b: am
d10ca17d: am
8921409a: am
10fb4fe4: am
d99dd3e7: am
70efbad0: am
bd5a3e65: am
1677a9bd: Merge "resolve conflicts for merge
5a7b3b65 correctly" into jb-dev-plus-aosp
* commit '
56a794f2bf3093c9b24889e44abdcefaa976ed12':
resolve conflicts for merge
5a7b3b65 correctly
Deepanshu Gupta [Tue, 13 May 2014 21:37:58 +0000 (21:37 +0000)]
am
21dc46b1: am
569dc64c: am
69ab5946: am
fcfb8801: am
18b1525a: am
ef24a509: am
900954e3: am
2100476a: am
31a3760a: am
964023c5: am
8bf73eae: am
0ad4f2ce: resolved conflicts for merge of
7377c7be to jb-mr1-dev
* commit '
21dc46b14df9456eede9d4eb7082c85bec732058':
Add Navigation Bar to BridgeWindowManager [DO NOT MERGE]
Deepanshu Gupta [Tue, 13 May 2014 21:37:55 +0000 (21:37 +0000)]
am
bda6d9a1: am
9a3e6ec7: am
cdc40eb0: am
6fd1703e: (-s ours) am
0d33f604: am
4dff881b: am
7b9cc710: (-s ours) am
9c7e3064: am
1b0f6056: am
c1847b54: am
5454be00: am
5dae7fda: am
9359dc2e: am
2d3fa7ba: Support actionProviderClass attribute for menus [DO NOT MERGE]
* commit '
bda6d9a15a845611e0d68acbf09787da71532287':
Support actionProviderClass attribute for menus [DO NOT MERGE]
Deepanshu Gupta [Tue, 13 May 2014 21:37:52 +0000 (21:37 +0000)]
am
5f421714: am
03ccc80d: am
c909b4d5: am
2322a910: am
75fc74d6: am
203964c0: am
b7e1bef1: am
b607cb82: am
27c9b568: am
e969ee5e: resolved conflicts for merge of
d388afad to jb-mr1.1-dev
* commit '
5f421714a64def639e112e0537d16b8a10829938':
Add special system view cookie to OverflowButton. [DO NOT MERGE]
Deepanshu Gupta [Tue, 13 May 2014 21:37:49 +0000 (21:37 +0000)]
am
93d10eda: am
db83a08b: am
86726f58: am
eb5b38b1: (-s ours) am
a350f96e: am
0eb268a0: am
22dabb52: (-s ours) am
c261cb0d: am
f354d01a: am
aab60856: am
ebd909cc: am
ae5e0c7b: am
4eab4e14: am
5268248e: Use ApplicationInfo only when not in edit mode [DO NOT MERGE]
* commit '
93d10eda4f4bfd6bafcffb6f3c5bea7662cd0193':
Use ApplicationInfo only when not in edit mode [DO NOT MERGE]
Deepanshu Gupta [Tue, 13 May 2014 21:37:46 +0000 (21:37 +0000)]
am
3d491e37: am
84cea707: am
0573cffa: am
b520cc45: am
cf2af661: am
752b90f2: am
919ce205: am
03bf747f: am
858ab06a: am
ec1b4df6: resolved conflicts for merge of
b161d6ba to jb-mr1.1-dev
* commit '
3d491e379045d571367e1eaef404393a80c5771d':
Fix style warnings in RenderSessionImpl [DO NOT MERGE]
Deepanshu Gupta [Tue, 13 May 2014 21:33:14 +0000 (21:33 +0000)]
am
96e30774: am
fea4b4dd: am
3450dc32: am
06018d92: am
f41a380b: am
d10ca17d: am
8921409a: am
10fb4fe4: am
d99dd3e7: am
70efbad0: am
bd5a3e65: am
1677a9bd: Merge "resolve conflicts for merge
5a7b3b65 correctly" into jb-dev-plus-aosp
* commit '
96e30774c019e1f4400ac2d7a724ea7328bec1ac':
resolve conflicts for merge
5a7b3b65 correctly
Deepanshu Gupta [Tue, 13 May 2014 21:33:07 +0000 (21:33 +0000)]
am
569dc64c: am
69ab5946: am
fcfb8801: am
18b1525a: am
ef24a509: am
900954e3: am
2100476a: am
31a3760a: am
964023c5: am
8bf73eae: am
0ad4f2ce: resolved conflicts for merge of
7377c7be to jb-mr1-dev
* commit '
569dc64cd6b0bb7bdfec97967b192d2a706e3f81':
Add Navigation Bar to BridgeWindowManager [DO NOT MERGE]
Deepanshu Gupta [Tue, 13 May 2014 21:33:03 +0000 (21:33 +0000)]
am
9a3e6ec7: am
cdc40eb0: am
6fd1703e: (-s ours) am
0d33f604: am
4dff881b: am
7b9cc710: (-s ours) am
9c7e3064: am
1b0f6056: am
c1847b54: am
5454be00: am
5dae7fda: am
9359dc2e: am
2d3fa7ba: Support actionProviderClass attribute for menus [DO NOT MERGE]
* commit '
9a3e6ec73c2188eb5bf1406b974dfc34e55722ad':
Support actionProviderClass attribute for menus [DO NOT MERGE]
Deepanshu Gupta [Tue, 13 May 2014 21:33:00 +0000 (21:33 +0000)]
am
03ccc80d: am
c909b4d5: am
2322a910: am
75fc74d6: am
203964c0: am
b7e1bef1: am
b607cb82: am
27c9b568: am
e969ee5e: resolved conflicts for merge of
d388afad to jb-mr1.1-dev
* commit '
03ccc80d0a00df9d5a4d5039941a8edfe2404868':
Add special system view cookie to OverflowButton. [DO NOT MERGE]
Deepanshu Gupta [Tue, 13 May 2014 21:32:57 +0000 (21:32 +0000)]
am
db83a08b: am
86726f58: am
eb5b38b1: (-s ours) am
a350f96e: am
0eb268a0: am
22dabb52: (-s ours) am
c261cb0d: am
f354d01a: am
aab60856: am
ebd909cc: am
ae5e0c7b: am
4eab4e14: am
5268248e: Use ApplicationInfo only when not in edit mode [DO NOT MERGE]
* commit '
db83a08b133d5c618d21ba105b0852e463cfb6d7':
Use ApplicationInfo only when not in edit mode [DO NOT MERGE]
Deepanshu Gupta [Tue, 13 May 2014 21:32:54 +0000 (21:32 +0000)]
am
84cea707: am
0573cffa: am
b520cc45: am
cf2af661: am
752b90f2: am
919ce205: am
03bf747f: am
858ab06a: am
ec1b4df6: resolved conflicts for merge of
b161d6ba to jb-mr1.1-dev
* commit '
84cea70792145e345d5bde8838dad14cc3e9fa4c':
Fix style warnings in RenderSessionImpl [DO NOT MERGE]
Deepanshu Gupta [Tue, 13 May 2014 21:32:53 +0000 (21:32 +0000)]
am
f14922db: am
6368a39d: am
883a17cd: am
14480abe: am
bfc75f68: am
11243dd6: am
9f5f450d: am
e5c518cb: am
4e8b055b: am
6dad59e1: am
85b75194: resolved conflicts for merge of
cc9e3596 to jb-mr1.1-dev
* commit '
f14922db63c866eee3f3eda63c57e08955fa27cb':
Add view cookies for action bar menus. [DO NOT MERGE]
Deepanshu Gupta [Tue, 13 May 2014 21:28:32 +0000 (21:28 +0000)]
am
fea4b4dd: am
3450dc32: am
06018d92: am
f41a380b: am
d10ca17d: am
8921409a: am
10fb4fe4: am
d99dd3e7: am
70efbad0: am
bd5a3e65: am
1677a9bd: Merge "resolve conflicts for merge
5a7b3b65 correctly" into jb-dev-plus-aosp
* commit '
fea4b4dde360cf5caa0fe887dbcc51a0a2329e25':
resolve conflicts for merge
5a7b3b65 correctly
Deepanshu Gupta [Tue, 13 May 2014 21:28:18 +0000 (21:28 +0000)]
am
69ab5946: am
fcfb8801: am
18b1525a: am
ef24a509: am
900954e3: am
2100476a: am
31a3760a: am
964023c5: am
8bf73eae: am
0ad4f2ce: resolved conflicts for merge of
7377c7be to jb-mr1-dev
* commit '
69ab594625e274ed4ca6d4a1dc7f8fb19d44f020':
Add Navigation Bar to BridgeWindowManager [DO NOT MERGE]
Deepanshu Gupta [Tue, 13 May 2014 21:28:16 +0000 (21:28 +0000)]
am
cdc40eb0: am
6fd1703e: (-s ours) am
0d33f604: am
4dff881b: am
7b9cc710: (-s ours) am
9c7e3064: am
1b0f6056: am
c1847b54: am
5454be00: am
5dae7fda: am
9359dc2e: am
2d3fa7ba: Support actionProviderClass attribute for menus [DO NOT MERGE]
* commit '
cdc40eb0e02e5b7abc05a438f7fd51045ec91862':
Support actionProviderClass attribute for menus [DO NOT MERGE]
Deepanshu Gupta [Tue, 13 May 2014 21:28:14 +0000 (21:28 +0000)]
am
c909b4d5: am
2322a910: am
75fc74d6: am
203964c0: am
b7e1bef1: am
b607cb82: am
27c9b568: am
e969ee5e: resolved conflicts for merge of
d388afad to jb-mr1.1-dev
* commit '
c909b4d53b7359c794f7885e99f04746646275ec':
Add special system view cookie to OverflowButton. [DO NOT MERGE]
Deepanshu Gupta [Tue, 13 May 2014 21:28:12 +0000 (21:28 +0000)]
am
86726f58: am
eb5b38b1: (-s ours) am
a350f96e: am
0eb268a0: am
22dabb52: (-s ours) am
c261cb0d: am
f354d01a: am
aab60856: am
ebd909cc: am
ae5e0c7b: am
4eab4e14: am
5268248e: Use ApplicationInfo only when not in edit mode [DO NOT MERGE]
* commit '
86726f58dba0f2ee6d7e62255dbf7356a7201897':
Use ApplicationInfo only when not in edit mode [DO NOT MERGE]
Deepanshu Gupta [Tue, 13 May 2014 21:28:10 +0000 (21:28 +0000)]
am
0573cffa: am
b520cc45: am
cf2af661: am
752b90f2: am
919ce205: am
03bf747f: am
858ab06a: am
ec1b4df6: resolved conflicts for merge of
b161d6ba to jb-mr1.1-dev
* commit '
0573cffacc4a7247151aae62d176a9e947e1dabe':
Fix style warnings in RenderSessionImpl [DO NOT MERGE]
Deepanshu Gupta [Tue, 13 May 2014 21:26:33 +0000 (21:26 +0000)]
am
6368a39d: am
883a17cd: am
14480abe: am
bfc75f68: am
11243dd6: am
9f5f450d: am
e5c518cb: am
4e8b055b: am
6dad59e1: am
85b75194: resolved conflicts for merge of
cc9e3596 to jb-mr1.1-dev
* commit '
6368a39dd2b57907a47b7a1693de1c7744a0a39c':
Add view cookies for action bar menus. [DO NOT MERGE]
Deepanshu Gupta [Tue, 13 May 2014 21:25:04 +0000 (21:25 +0000)]
am
ae089999: am
ef33848a: am
a22e96bf: am
4e1023a1: am
89279ad1: (-s ours) am
9d3ec0be: am
48931fcc: am
a312214f: (-s ours) am
9358cf04: am
ccf6b347: am
a1546876: am
7ef27645: am
f192096a: am
17585160: am
26c37321: Add missing layout params to xlarge action bar. [DO N
* commit '
ae089999befdff1382266d11ac5fd3cc1e9270ae':
Add missing layout params to xlarge action bar. [DO NOT MERGE]
Deepanshu Gupta [Tue, 13 May 2014 21:25:00 +0000 (21:25 +0000)]
am
52483b6d: am
110e3f48: am
7b228464: am
ce33060c: am
563d0ee7: am
04f0cb6e: am
34aa1bd3: am
54b946fe: am
f46900c5: am
87a54055: am
5878115a: resolved conflicts for merge of
9978c036 to jb-mr1.1-dev
* commit '
52483b6d398fa42b8ad9876f0fbebc8ed89ad579':
Overflow menu popup for Action Bar in Layoutlib [DO NOT MERGE]
Deepanshu Gupta [Tue, 13 May 2014 21:23:50 +0000 (21:23 +0000)]
am
3450dc32: am
06018d92: am
f41a380b: am
d10ca17d: am
8921409a: am
10fb4fe4: am
d99dd3e7: am
70efbad0: am
bd5a3e65: am
1677a9bd: Merge "resolve conflicts for merge
5a7b3b65 correctly" into jb-dev-plus-aosp
* commit '
3450dc325670cc8e7855c93193cf6f59cf7be430':
resolve conflicts for merge
5a7b3b65 correctly
Deepanshu Gupta [Tue, 13 May 2014 21:23:47 +0000 (21:23 +0000)]
am
fcfb8801: am
18b1525a: am
ef24a509: am
900954e3: am
2100476a: am
31a3760a: am
964023c5: am
8bf73eae: am
0ad4f2ce: resolved conflicts for merge of
7377c7be to jb-mr1-dev
* commit '
fcfb8801b27fd40ff27c380b8bad9b9a210effca':
Add Navigation Bar to BridgeWindowManager [DO NOT MERGE]
Deepanshu Gupta [Tue, 13 May 2014 21:23:43 +0000 (21:23 +0000)]
am
6fd1703e: (-s ours) am
0d33f604: am
4dff881b: am
7b9cc710: (-s ours) am
9c7e3064: am
1b0f6056: am
c1847b54: am
5454be00: am
5dae7fda: am
9359dc2e: am
2d3fa7ba: Support actionProviderClass attribute for menus [DO NOT MERGE]
* commit '
6fd1703eb96669bb5c985c9de8d08107e800824c':
Support actionProviderClass attribute for menus [DO NOT MERGE]
Deepanshu Gupta [Tue, 13 May 2014 21:23:40 +0000 (21:23 +0000)]
am
2322a910: am
75fc74d6: am
203964c0: am
b7e1bef1: am
b607cb82: am
27c9b568: am
e969ee5e: resolved conflicts for merge of
d388afad to jb-mr1.1-dev
* commit '
2322a9107b63928529c29cabc719575692d5d934':
Add special system view cookie to OverflowButton. [DO NOT MERGE]
Deepanshu Gupta [Tue, 13 May 2014 21:23:37 +0000 (21:23 +0000)]
am
eb5b38b1: (-s ours) am
a350f96e: am
0eb268a0: am
22dabb52: (-s ours) am
c261cb0d: am
f354d01a: am
aab60856: am
ebd909cc: am
ae5e0c7b: am
4eab4e14: am
5268248e: Use ApplicationInfo only when not in edit mode [DO NOT MERGE]
* commit '
eb5b38b167dd5f094acc085ede494966ed0024c5':
Use ApplicationInfo only when not in edit mode [DO NOT MERGE]
Deepanshu Gupta [Tue, 13 May 2014 21:23:35 +0000 (21:23 +0000)]
am
b520cc45: am
cf2af661: am
752b90f2: am
919ce205: am
03bf747f: am
858ab06a: am
ec1b4df6: resolved conflicts for merge of
b161d6ba to jb-mr1.1-dev
* commit '
b520cc45996de4a172147d4e934768ec6c417666':
Fix style warnings in RenderSessionImpl [DO NOT MERGE]
Svetoslav [Thu, 8 May 2014 19:48:23 +0000 (12:48 -0700)]
Teach print manager services about user profiles.
For user profiles the printing layer will have a separate state and
set a set of print plugins. The rationale behind this is that if a user
uses different profiles for different domains he would expect that
each domain is separate as domains may have different security and
privacy requirements.
bug:
14567366
Change-Id: I461ae4636294fa8968785295afb952aeb14a13b5
Deepanshu Gupta [Tue, 13 May 2014 21:21:33 +0000 (21:21 +0000)]
am
883a17cd: am
14480abe: am
bfc75f68: am
11243dd6: am
9f5f450d: am
e5c518cb: am
4e8b055b: am
6dad59e1: am
85b75194: resolved conflicts for merge of
cc9e3596 to jb-mr1.1-dev
* commit '
883a17cd954c31fb7742fb415e3949623e81ba6b':
Add view cookies for action bar menus. [DO NOT MERGE]
Deepanshu Gupta [Tue, 13 May 2014 21:19:10 +0000 (21:19 +0000)]
am
ef33848a: am
a22e96bf: am
4e1023a1: am
89279ad1: (-s ours) am
9d3ec0be: am
48931fcc: am
a312214f: (-s ours) am
9358cf04: am
ccf6b347: am
a1546876: am
7ef27645: am
f192096a: am
17585160: am
26c37321: Add missing layout params to xlarge action bar. [DO NOT MERGE]
* commit '
ef33848aae9c482b43087ae4e326e0a40e7474f2':
Add missing layout params to xlarge action bar. [DO NOT MERGE]
Deepanshu Gupta [Tue, 13 May 2014 21:19:07 +0000 (21:19 +0000)]
am
110e3f48: am
7b228464: am
ce33060c: am
563d0ee7: am
04f0cb6e: am
34aa1bd3: am
54b946fe: am
f46900c5: am
87a54055: am
5878115a: resolved conflicts for merge of
9978c036 to jb-mr1.1-dev
* commit '
110e3f48f3f58a5178676112eb8c2693c62c640f':
Overflow menu popup for Action Bar in Layoutlib [DO NOT MERGE]
Deepanshu Gupta [Tue, 13 May 2014 21:18:06 +0000 (21:18 +0000)]
am
06018d92: am
f41a380b: am
d10ca17d: am
8921409a: am
10fb4fe4: am
d99dd3e7: am
70efbad0: am
bd5a3e65: am
1677a9bd: Merge "resolve conflicts for merge
5a7b3b65 correctly" into jb-dev-plus-aosp
* commit '
06018d92e8eedecc8b567f5d4c797cd8096cfffa':
resolve conflicts for merge
5a7b3b65 correctly
Deepanshu Gupta [Tue, 13 May 2014 21:18:03 +0000 (21:18 +0000)]
am
18b1525a: am
ef24a509: am
900954e3: am
2100476a: am
31a3760a: am
964023c5: am
8bf73eae: am
0ad4f2ce: resolved conflicts for merge of
7377c7be to jb-mr1-dev
* commit '
18b1525ac7666933befd6085461391ad1087b19a':
Add Navigation Bar to BridgeWindowManager [DO NOT MERGE]
Deepanshu Gupta [Tue, 13 May 2014 21:18:00 +0000 (21:18 +0000)]
am
0d33f604: am
4dff881b: am
7b9cc710: (-s ours) am
9c7e3064: am
1b0f6056: am
c1847b54: am
5454be00: am
5dae7fda: am
9359dc2e: am
2d3fa7ba: Support actionProviderClass attribute for menus [DO NOT MERGE]
* commit '
0d33f604d61b843a988d1bf5b9e6b421f553808b':
Support actionProviderClass attribute for menus [DO NOT MERGE]
Deepanshu Gupta [Tue, 13 May 2014 21:17:57 +0000 (21:17 +0000)]
am
75fc74d6: am
203964c0: am
b7e1bef1: am
b607cb82: am
27c9b568: am
e969ee5e: resolved conflicts for merge of
d388afad to jb-mr1.1-dev
* commit '
75fc74d6dbc06872d13d0db0300b530dc90bdb01':
Add special system view cookie to OverflowButton. [DO NOT MERGE]
Deepanshu Gupta [Tue, 13 May 2014 21:17:54 +0000 (21:17 +0000)]
am
a350f96e: am
0eb268a0: am
22dabb52: (-s ours) am
c261cb0d: am
f354d01a: am
aab60856: am
ebd909cc: am
ae5e0c7b: am
4eab4e14: am
5268248e: Use ApplicationInfo only when not in edit mode [DO NOT MERGE]
* commit '
a350f96ec97ce5ea6c61683f85f4e39fe45fa42b':
Use ApplicationInfo only when not in edit mode [DO NOT MERGE]
Deepanshu Gupta [Tue, 13 May 2014 21:17:51 +0000 (21:17 +0000)]
am
cf2af661: am
752b90f2: am
919ce205: am
03bf747f: am
858ab06a: am
ec1b4df6: resolved conflicts for merge of
b161d6ba to jb-mr1.1-dev
* commit '
cf2af66180e7debda36a1cece4732d0403ce37b7':
Fix style warnings in RenderSessionImpl [DO NOT MERGE]
Deepanshu Gupta [Tue, 13 May 2014 21:17:25 +0000 (21:17 +0000)]
am
ecf80ad3: am
0efb0759: am
9d0fcb73: am
9cc952e7: am
b7b64cc4: am
e0105901: am
52b49665: am
eff94bc3: am
8c19c6a1: am
16f3a616: am
c0e9c66d: resolved conflicts for merge of
8e015b7b to jb-mr1.1-dev
* commit '
ecf80ad35c15b96ef11034716a73bc607011e1bd':
Action bar rendering in layoutlib [DO NOT MERGE]
Deepanshu Gupta [Tue, 13 May 2014 21:14:56 +0000 (21:14 +0000)]
am
14480abe: am
bfc75f68: am
11243dd6: am
9f5f450d: am
e5c518cb: am
4e8b055b: am
6dad59e1: am
85b75194: resolved conflicts for merge of
cc9e3596 to jb-mr1.1-dev
* commit '
14480abeb6642d7b779d50f03e5340356a4e4b2b':
Add view cookies for action bar menus. [DO NOT MERGE]
Deepanshu Gupta [Tue, 13 May 2014 21:12:42 +0000 (21:12 +0000)]
am
f41a380b: am
d10ca17d: am
8921409a: am
10fb4fe4: am
d99dd3e7: am
70efbad0: am
bd5a3e65: am
1677a9bd: Merge "resolve conflicts for merge
5a7b3b65 correctly" into jb-dev-plus-aosp
* commit '
f41a380bd97a25bee1804e43e8deba74fa100163':
resolve conflicts for merge
5a7b3b65 correctly
Deepanshu Gupta [Tue, 13 May 2014 21:12:39 +0000 (21:12 +0000)]
am
a22e96bf: am
4e1023a1: am
89279ad1: (-s ours) am
9d3ec0be: am
48931fcc: am
a312214f: (-s ours) am
9358cf04: am
ccf6b347: am
a1546876: am
7ef27645: am
f192096a: am
17585160: am
26c37321: Add missing layout params to xlarge action bar. [DO NOT MERGE]
* commit '
a22e96bfecb933cb52a055c6f9d8f243d436b123':
Add missing layout params to xlarge action bar. [DO NOT MERGE]
Deepanshu Gupta [Tue, 13 May 2014 21:12:39 +0000 (21:12 +0000)]
am
ef24a509: am
900954e3: am
2100476a: am
31a3760a: am
964023c5: am
8bf73eae: am
0ad4f2ce: resolved conflicts for merge of
7377c7be to jb-mr1-dev
* commit '
ef24a5091b63fb512d4ca9eb34df6394c3842d33':
Add Navigation Bar to BridgeWindowManager [DO NOT MERGE]
Deepanshu Gupta [Tue, 13 May 2014 21:12:37 +0000 (21:12 +0000)]
am
4dff881b: am
7b9cc710: (-s ours) am
9c7e3064: am
1b0f6056: am
c1847b54: am
5454be00: am
5dae7fda: am
9359dc2e: am
2d3fa7ba: Support actionProviderClass attribute for menus [DO NOT MERGE]
* commit '
4dff881b997e3e8c871068ae4b237a9e0f4ab2e7':
Support actionProviderClass attribute for menus [DO NOT MERGE]
Deepanshu Gupta [Tue, 13 May 2014 21:12:35 +0000 (21:12 +0000)]
am
7b228464: am
ce33060c: am
563d0ee7: am
04f0cb6e: am
34aa1bd3: am
54b946fe: am
f46900c5: am
87a54055: am
5878115a: resolved conflicts for merge of
9978c036 to jb-mr1.1-dev
* commit '
7b22846433508139f466c66cfa78d94bbec3582e':
Overflow menu popup for Action Bar in Layoutlib [DO NOT MERGE]
Deepanshu Gupta [Tue, 13 May 2014 21:12:35 +0000 (21:12 +0000)]
am
203964c0: am
b7e1bef1: am
b607cb82: am
27c9b568: am
e969ee5e: resolved conflicts for merge of
d388afad to jb-mr1.1-dev
* commit '
203964c058857d01401c905918d0d64e83e51bab':
Add special system view cookie to OverflowButton. [DO NOT MERGE]
Deepanshu Gupta [Tue, 13 May 2014 21:12:32 +0000 (21:12 +0000)]
am
0eb268a0: am
22dabb52: (-s ours) am
c261cb0d: am
f354d01a: am
aab60856: am
ebd909cc: am
ae5e0c7b: am
4eab4e14: am
5268248e: Use ApplicationInfo only when not in edit mode [DO NOT MERGE]
* commit '
0eb268a0de02b73dd23ab2e672c35a2650a9eea4':
Use ApplicationInfo only when not in edit mode [DO NOT MERGE]
Deepanshu Gupta [Tue, 13 May 2014 21:12:29 +0000 (21:12 +0000)]
am
752b90f2: am
919ce205: am
03bf747f: am
858ab06a: am
ec1b4df6: resolved conflicts for merge of
b161d6ba to jb-mr1.1-dev
* commit '
752b90f2605956e0de880c2a406dc887aeb3d8c2':
Fix style warnings in RenderSessionImpl [DO NOT MERGE]
Deepanshu Gupta [Tue, 13 May 2014 21:11:51 +0000 (21:11 +0000)]
am
0efb0759: am
9d0fcb73: am
9cc952e7: am
b7b64cc4: am
e0105901: am
52b49665: am
eff94bc3: am
8c19c6a1: am
16f3a616: am
c0e9c66d: resolved conflicts for merge of
8e015b7b to jb-mr1.1-dev
* commit '
0efb07592a6a2fa0ecfe41fa617c99dfe4a45348':
Action bar rendering in layoutlib [DO NOT MERGE]
Deepanshu Gupta [Tue, 13 May 2014 21:09:22 +0000 (21:09 +0000)]
am
bfc75f68: am
11243dd6: am
9f5f450d: am
e5c518cb: am
4e8b055b: am
6dad59e1: am
85b75194: resolved conflicts for merge of
cc9e3596 to jb-mr1.1-dev
* commit '
bfc75f6895171aeac68f2506fd318a3eb5d4b9e4':
Add view cookies for action bar menus. [DO NOT MERGE]
Deepanshu Gupta [Tue, 13 May 2014 21:07:45 +0000 (21:07 +0000)]
am
d10ca17d: am
8921409a: am
10fb4fe4: am
d99dd3e7: am
70efbad0: am
bd5a3e65: am
1677a9bd: Merge "resolve conflicts for merge
5a7b3b65 correctly" into jb-dev-plus-aosp
* commit '
d10ca17d6feefd449595df1cb11d161c8f10dd57':
resolve conflicts for merge
5a7b3b65 correctly
Deepanshu Gupta [Tue, 13 May 2014 21:07:40 +0000 (21:07 +0000)]
am
900954e3: am
2100476a: am
31a3760a: am
964023c5: am
8bf73eae: am
0ad4f2ce: resolved conflicts for merge of
7377c7be to jb-mr1-dev
* commit '
900954e3cd135bf43db975961056e7661f26a6c6':
Add Navigation Bar to BridgeWindowManager [DO NOT MERGE]
Deepanshu Gupta [Tue, 13 May 2014 21:07:38 +0000 (21:07 +0000)]
am
7b9cc710: (-s ours) am
9c7e3064: am
1b0f6056: am
c1847b54: am
5454be00: am
5dae7fda: am
9359dc2e: am
2d3fa7ba: Support actionProviderClass attribute for menus [DO NOT MERGE]
* commit '
7b9cc71063869a98f35b49c2e072750dfa46e0b9':
Support actionProviderClass attribute for menus [DO NOT MERGE]
Deepanshu Gupta [Tue, 13 May 2014 21:07:35 +0000 (21:07 +0000)]
am
9d0fcb73: am
9cc952e7: am
b7b64cc4: am
e0105901: am
52b49665: am
eff94bc3: am
8c19c6a1: am
16f3a616: am
c0e9c66d: resolved conflicts for merge of
8e015b7b to jb-mr1.1-dev
* commit '
9d0fcb73e23beb5baa62cb8e5b428e5f0ef7a571':
Action bar rendering in layoutlib [DO NOT MERGE]
Deepanshu Gupta [Tue, 13 May 2014 21:07:35 +0000 (21:07 +0000)]
am
b7e1bef1: am
b607cb82: am
27c9b568: am
e969ee5e: resolved conflicts for merge of
d388afad to jb-mr1.1-dev
* commit '
b7e1bef1835bdb224d6ed09c3c219662e1db1f56':
Add special system view cookie to OverflowButton. [DO NOT MERGE]
Deepanshu Gupta [Tue, 13 May 2014 21:07:31 +0000 (21:07 +0000)]
am
22dabb52: (-s ours) am
c261cb0d: am
f354d01a: am
aab60856: am
ebd909cc: am
ae5e0c7b: am
4eab4e14: am
5268248e: Use ApplicationInfo only when not in edit mode [DO NOT MERGE]
* commit '
22dabb52820d81744f46d009a27bf9294928bbee':
Use ApplicationInfo only when not in edit mode [DO NOT MERGE]
Deepanshu Gupta [Tue, 13 May 2014 21:07:28 +0000 (21:07 +0000)]
am
919ce205: am
03bf747f: am
858ab06a: am
ec1b4df6: resolved conflicts for merge of
b161d6ba to jb-mr1.1-dev
* commit '
919ce2051595dfa5dd047660946038d23fa688f4':
Fix style warnings in RenderSessionImpl [DO NOT MERGE]
Deepanshu Gupta [Tue, 13 May 2014 21:07:01 +0000 (21:07 +0000)]
am
4e1023a1: am
89279ad1: (-s ours) am
9d3ec0be: am
48931fcc: am
a312214f: (-s ours) am
9358cf04: am
ccf6b347: am
a1546876: am
7ef27645: am
f192096a: am
17585160: am
26c37321: Add missing layout params to xlarge action bar. [DO NOT MERGE]
* commit '
4e1023a1fccc06f382a976a94bcb29c3764183f5':
Add missing layout params to xlarge action bar. [DO NOT MERGE]
Deepanshu Gupta [Tue, 13 May 2014 21:06:58 +0000 (21:06 +0000)]
am
ce33060c: am
563d0ee7: am
04f0cb6e: am
34aa1bd3: am
54b946fe: am
f46900c5: am
87a54055: am
5878115a: resolved conflicts for merge of
9978c036 to jb-mr1.1-dev
* commit '
ce33060c92a8e0d739f020b6227f2ee6007724fe':
Overflow menu popup for Action Bar in Layoutlib [DO NOT MERGE]
Deepanshu Gupta [Tue, 13 May 2014 21:04:28 +0000 (21:04 +0000)]
am
11243dd6: am
9f5f450d: am
e5c518cb: am
4e8b055b: am
6dad59e1: am
85b75194: resolved conflicts for merge of
cc9e3596 to jb-mr1.1-dev
* commit '
11243dd66484d0f99f56454491d5d82acfca6070':
Add view cookies for action bar menus. [DO NOT MERGE]
Deepanshu Gupta [Tue, 13 May 2014 21:02:23 +0000 (21:02 +0000)]
am
89279ad1: (-s ours) am
9d3ec0be: am
48931fcc: am
a312214f: (-s ours) am
9358cf04: am
ccf6b347: am
a1546876: am
7ef27645: am
f192096a: am
17585160: am
26c37321: Add missing layout params to xlarge action bar. [DO NOT MERGE]
* commit '
89279ad140a30e5d134d6d948c4c6d835b5ca5b3':
Add missing layout params to xlarge action bar. [DO NOT MERGE]
Deepanshu Gupta [Tue, 13 May 2014 21:02:23 +0000 (21:02 +0000)]
am
8921409a: am
10fb4fe4: am
d99dd3e7: am
70efbad0: am
bd5a3e65: am
1677a9bd: Merge "resolve conflicts for merge
5a7b3b65 correctly" into jb-dev-plus-aosp
* commit '
8921409a05c0e52ba453d3c4f37a9506fde9b321':
resolve conflicts for merge
5a7b3b65 correctly
Deepanshu Gupta [Tue, 13 May 2014 21:02:19 +0000 (21:02 +0000)]
am
2100476a: am
31a3760a: am
964023c5: am
8bf73eae: am
0ad4f2ce: resolved conflicts for merge of
7377c7be to jb-mr1-dev
* commit '
2100476ace68858bc7b7356b33aa525e38795592':
Add Navigation Bar to BridgeWindowManager [DO NOT MERGE]
Deepanshu Gupta [Tue, 13 May 2014 21:02:19 +0000 (21:02 +0000)]
am
563d0ee7: am
04f0cb6e: am
34aa1bd3: am
54b946fe: am
f46900c5: am
87a54055: am
5878115a: resolved conflicts for merge of
9978c036 to jb-mr1.1-dev
* commit '
563d0ee7d48df767c2d4da127f1224140fa65cfd':
Overflow menu popup for Action Bar in Layoutlib [DO NOT MERGE]
Deepanshu Gupta [Tue, 13 May 2014 21:02:17 +0000 (21:02 +0000)]
am
9c7e3064: am
1b0f6056: am
c1847b54: am
5454be00: am
5dae7fda: am
9359dc2e: am
2d3fa7ba: Support actionProviderClass attribute for menus [DO NOT MERGE]
* commit '
9c7e3064469e51a10503cfdf3d0215a62a3b6c8d':
Support actionProviderClass attribute for menus [DO NOT MERGE]
Deepanshu Gupta [Tue, 13 May 2014 21:02:14 +0000 (21:02 +0000)]
am
b607cb82: am
27c9b568: am
e969ee5e: resolved conflicts for merge of
d388afad to jb-mr1.1-dev
* commit '
b607cb82e0883a755fa6c6f9f5ec573cd79a731b':
Add special system view cookie to OverflowButton. [DO NOT MERGE]
Deepanshu Gupta [Tue, 13 May 2014 21:02:11 +0000 (21:02 +0000)]
am
c261cb0d: am
f354d01a: am
aab60856: am
ebd909cc: am
ae5e0c7b: am
4eab4e14: am
5268248e: Use ApplicationInfo only when not in edit mode [DO NOT MERGE]
* commit '
c261cb0dcd2ea4ca35dbef1973c0a08709ce5ae1':
Use ApplicationInfo only when not in edit mode [DO NOT MERGE]
Deepanshu Gupta [Tue, 13 May 2014 21:02:08 +0000 (21:02 +0000)]
am
03bf747f: am
858ab06a: am
ec1b4df6: resolved conflicts for merge of
b161d6ba to jb-mr1.1-dev
* commit '
03bf747fec291b355af531bf0b04a2b1669bf92e':
Fix style warnings in RenderSessionImpl [DO NOT MERGE]
Deepanshu Gupta [Tue, 13 May 2014 21:02:06 +0000 (21:02 +0000)]
am
9cc952e7: am
b7b64cc4: am
e0105901: am
52b49665: am
eff94bc3: am
8c19c6a1: am
16f3a616: am
c0e9c66d: resolved conflicts for merge of
8e015b7b to jb-mr1.1-dev
* commit '
9cc952e74a8f82b85a9bd8cbd7cbfb286c9b65d6':
Action bar rendering in layoutlib [DO NOT MERGE]
Deepanshu Gupta [Tue, 13 May 2014 21:00:22 +0000 (21:00 +0000)]
am
10fb4fe4: am
d99dd3e7: am
70efbad0: am
bd5a3e65: am
1677a9bd: Merge "resolve conflicts for merge
5a7b3b65 correctly" into jb-dev-plus-aosp
* commit '
10fb4fe400625a95b3bc00b10b92814d7bc6f118':
resolve conflicts for merge
5a7b3b65 correctly
Deepanshu Gupta [Tue, 13 May 2014 21:00:19 +0000 (21:00 +0000)]
am
31a3760a: am
964023c5: am
8bf73eae: am
0ad4f2ce: resolved conflicts for merge of
7377c7be to jb-mr1-dev
* commit '
31a3760a49f7495e73f4de1c11f2e3f64ff9a7ff':
Add Navigation Bar to BridgeWindowManager [DO NOT MERGE]
Deepanshu Gupta [Tue, 13 May 2014 21:00:16 +0000 (21:00 +0000)]
am
1b0f6056: am
c1847b54: am
5454be00: am
5dae7fda: am
9359dc2e: am
2d3fa7ba: Support actionProviderClass attribute for menus [DO NOT MERGE]
* commit '
1b0f605667dc286b1a1f423b43c4b6957993daaf':
Support actionProviderClass attribute for menus [DO NOT MERGE]
Deepanshu Gupta [Tue, 13 May 2014 21:00:13 +0000 (21:00 +0000)]
am
27c9b568: am
e969ee5e: resolved conflicts for merge of
d388afad to jb-mr1.1-dev
* commit '
27c9b568ed6b24f68aeee0f2a1d7b3fa83bcc056':
Add special system view cookie to OverflowButton. [DO NOT MERGE]
Deepanshu Gupta [Tue, 13 May 2014 20:59:25 +0000 (20:59 +0000)]
am
9f5f450d: am
e5c518cb: am
4e8b055b: am
6dad59e1: am
85b75194: resolved conflicts for merge of
cc9e3596 to jb-mr1.1-dev
* commit '
9f5f450dca41bcea94b2abae1c782a84c0387f6d':
Add view cookies for action bar menus. [DO NOT MERGE]
Deepanshu Gupta [Tue, 13 May 2014 20:58:36 +0000 (20:58 +0000)]
am
9d3ec0be: am
48931fcc: am
a312214f: (-s ours) am
9358cf04: am
ccf6b347: am
a1546876: am
7ef27645: am
f192096a: am
17585160: am
26c37321: Add missing layout params to xlarge action bar. [DO NOT MERGE]
* commit '
9d3ec0be302acf9f29d0fb2be644841d71ed5e63':
Add missing layout params to xlarge action bar. [DO NOT MERGE]
Deepanshu Gupta [Tue, 13 May 2014 20:58:33 +0000 (20:58 +0000)]
am
04f0cb6e: am
34aa1bd3: am
54b946fe: am
f46900c5: am
87a54055: am
5878115a: resolved conflicts for merge of
9978c036 to jb-mr1.1-dev
* commit '
04f0cb6e958cc1529e3be04ef454a35f416d9667':
Overflow menu popup for Action Bar in Layoutlib [DO NOT MERGE]
Deepanshu Gupta [Tue, 13 May 2014 20:57:20 +0000 (20:57 +0000)]
am
b7b64cc4: am
e0105901: am
52b49665: am
eff94bc3: am
8c19c6a1: am
16f3a616: am
c0e9c66d: resolved conflicts for merge of
8e015b7b to jb-mr1.1-dev
* commit '
b7b64cc4884e933d0da4664ce7195caa5003ef65':
Action bar rendering in layoutlib [DO NOT MERGE]
Deepanshu Gupta [Tue, 13 May 2014 20:56:33 +0000 (20:56 +0000)]
am
f354d01a: am
aab60856: am
ebd909cc: am
ae5e0c7b: am
4eab4e14: am
5268248e: Use ApplicationInfo only when not in edit mode [DO NOT MERGE]
* commit '
f354d01afde602034e3d531eb7cbfe5fa5c48a21':
Use ApplicationInfo only when not in edit mode [DO NOT MERGE]
Deepanshu Gupta [Tue, 13 May 2014 20:56:31 +0000 (20:56 +0000)]
am
858ab06a: am
ec1b4df6: resolved conflicts for merge of
b161d6ba to jb-mr1.1-dev
* commit '
858ab06a38769aaa05a4b87a600739c9294b382d':
Fix style warnings in RenderSessionImpl [DO NOT MERGE]
Deepanshu Gupta [Tue, 13 May 2014 20:56:07 +0000 (20:56 +0000)]
am
d99dd3e7: am
70efbad0: am
bd5a3e65: am
1677a9bd: Merge "resolve conflicts for merge
5a7b3b65 correctly" into jb-dev-plus-aosp
* commit '
d99dd3e7322fa0071ca709e71ab34ae54677e3dc':
resolve conflicts for merge
5a7b3b65 correctly
Deepanshu Gupta [Tue, 13 May 2014 20:56:04 +0000 (20:56 +0000)]
am
964023c5: am
8bf73eae: am
0ad4f2ce: resolved conflicts for merge of
7377c7be to jb-mr1-dev
* commit '
964023c5dcd0334cdcf624eff26d791d9c9617a8':
Add Navigation Bar to BridgeWindowManager [DO NOT MERGE]