OSDN Git Service
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: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: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]
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: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: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: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: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
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: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: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: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: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
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: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: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: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: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:01 +0000 (20:56 +0000)]
am
c1847b54: am
5454be00: am
5dae7fda: am
9359dc2e: am
2d3fa7ba: Support actionProviderClass attribute for menus [DO NOT MERGE]
* commit '
c1847b54a391857f0871a15e97fbaae0fef0ff33':
Support actionProviderClass attribute for menus [DO NOT MERGE]
Deepanshu Gupta [Tue, 13 May 2014 20:55:59 +0000 (20:55 +0000)]
am
e969ee5e: resolved conflicts for merge of
d388afad to jb-mr1.1-dev
* commit '
e969ee5e5ddc112df4759b308e3e1eafc9cbcf84':
Add special system view cookie to OverflowButton. [DO NOT MERGE]
Deepanshu Gupta [Tue, 13 May 2014 20:54:20 +0000 (20:54 +0000)]
am
e5c518cb: am
4e8b055b: am
6dad59e1: am
85b75194: resolved conflicts for merge of
cc9e3596 to jb-mr1.1-dev
* commit '
e5c518cbd0544a44bae8cb2a0b90d18bb91c5b8a':
Add view cookies for action bar menus. [DO NOT MERGE]
Deepanshu Gupta [Tue, 13 May 2014 20:54:09 +0000 (20:54 +0000)]
am
5454be00: am
5dae7fda: am
9359dc2e: am
2d3fa7ba: Support actionProviderClass attribute for menus [DO NOT MERGE]
* commit '
5454be00b182b206bbc9dcd35b88da63631f7e8e':
Support actionProviderClass attribute for menus [DO NOT MERGE]
Deepanshu Gupta [Tue, 13 May 2014 20:53:35 +0000 (20:53 +0000)]
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 '
48931fcc0d7f6d82011414ffc234a52a1cce11a4':
Add missing layout params to xlarge action bar. [DO NOT MERGE]
Deepanshu Gupta [Tue, 13 May 2014 20:53:32 +0000 (20:53 +0000)]
am
34aa1bd3: am
54b946fe: am
f46900c5: am
87a54055: am
5878115a: resolved conflicts for merge of
9978c036 to jb-mr1.1-dev
* commit '
34aa1bd392ab71b22e8b2bc2a0fe29be88428762':
Overflow menu popup for Action Bar in Layoutlib [DO NOT MERGE]
Deepanshu Gupta [Tue, 13 May 2014 20:51:32 +0000 (20:51 +0000)]
am
e0105901: am
52b49665: am
eff94bc3: am
8c19c6a1: am
16f3a616: am
c0e9c66d: resolved conflicts for merge of
8e015b7b to jb-mr1.1-dev
* commit '
e0105901ea442e2f760f4fb657afc5db2d65e02a':
Action bar rendering in layoutlib [DO NOT MERGE]
Deepanshu Gupta [Tue, 13 May 2014 20:51:14 +0000 (20:51 +0000)]
am
aab60856: am
ebd909cc: am
ae5e0c7b: am
4eab4e14: am
5268248e: Use ApplicationInfo only when not in edit mode [DO NOT MERGE]
* commit '
aab60856f9df28da8246568621b59ed57bdc424b':
Use ApplicationInfo only when not in edit mode [DO NOT MERGE]
Deepanshu Gupta [Tue, 13 May 2014 20:51:11 +0000 (20:51 +0000)]
am
ec1b4df6: resolved conflicts for merge of
b161d6ba to jb-mr1.1-dev
* commit '
ec1b4df6d2ccfe35c251344b43a29af65c3b56e1':
Fix style warnings in RenderSessionImpl [DO NOT MERGE]
Deepanshu Gupta [Tue, 13 May 2014 20:50:23 +0000 (13:50 -0700)]
resolved conflicts for merge of
d388afad to jb-mr1.1-dev
Deepanshu Gupta [Tue, 13 May 2014 20:49:25 +0000 (20:49 +0000)]
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 '
a312214f736638486983874b4f266bb537bab723':
Add missing layout params to xlarge action bar. [DO NOT MERGE]
Deepanshu Gupta [Tue, 13 May 2014 20:49:22 +0000 (20:49 +0000)]
am
54b946fe: am
f46900c5: am
87a54055: am
5878115a: resolved conflicts for merge of
9978c036 to jb-mr1.1-dev
* commit '
54b946fe3c0f86f4cba3bc5bc07d920b654a0ef0':
Overflow menu popup for Action Bar in Layoutlib [DO NOT MERGE]
Deepanshu Gupta [Tue, 13 May 2014 20:49:06 +0000 (20:49 +0000)]
am
4e8b055b: am
6dad59e1: am
85b75194: resolved conflicts for merge of
cc9e3596 to jb-mr1.1-dev
* commit '
4e8b055b2ad23f6e336872f775058bcf18c46dfd':
Add view cookies for action bar menus. [DO NOT MERGE]
Deepanshu Gupta [Tue, 13 May 2014 20:48:06 +0000 (20:48 +0000)]
am
ebd909cc: am
ae5e0c7b: am
4eab4e14: am
5268248e: Use ApplicationInfo only when not in edit mode [DO NOT MERGE]
* commit '
ebd909cca1f69028878f15e6fb0ece6e8c8da584':
Use ApplicationInfo only when not in edit mode [DO NOT MERGE]
Deepanshu Gupta [Tue, 13 May 2014 20:46:41 +0000 (20:46 +0000)]
am
52b49665: am
eff94bc3: am
8c19c6a1: am
16f3a616: am
c0e9c66d: resolved conflicts for merge of
8e015b7b to jb-mr1.1-dev
* commit '
52b49665f526c7b4de977f3c424dc85d1b9a5d1f':
Action bar rendering in layoutlib [DO NOT MERGE]
Deepanshu Gupta [Tue, 13 May 2014 20:43:51 +0000 (20:43 +0000)]
am
6dad59e1: am
85b75194: resolved conflicts for merge of
cc9e3596 to jb-mr1.1-dev
* commit '
6dad59e146dc16a2386124a5cd3b28411c024c4f':
Add view cookies for action bar menus. [DO NOT MERGE]
Deepanshu Gupta [Tue, 13 May 2014 20:43:18 +0000 (20:43 +0000)]
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 '
9358cf04dc0db493a8702a4a8051f9839e9de6d7':
Add missing layout params to xlarge action bar. [DO NOT MERGE]
Deepanshu Gupta [Tue, 13 May 2014 20:43:16 +0000 (20:43 +0000)]
am
f46900c5: am
87a54055: am
5878115a: resolved conflicts for merge of
9978c036 to jb-mr1.1-dev
* commit '
f46900c5eaeff0fbba7f20466be87db67002d6bf':
Overflow menu popup for Action Bar in Layoutlib [DO NOT MERGE]
Deepanshu Gupta [Tue, 13 May 2014 20:41:24 +0000 (20:41 +0000)]
am
eff94bc3: am
8c19c6a1: am
16f3a616: am
c0e9c66d: resolved conflicts for merge of
8e015b7b to jb-mr1.1-dev
* commit '
eff94bc3647c23c223abe4946595d51d80985eec':
Action bar rendering in layoutlib [DO NOT MERGE]
Deepanshu Gupta [Tue, 13 May 2014 20:40:14 +0000 (13:40 -0700)]
resolved conflicts for merge of
b161d6ba to jb-mr1.1-dev
Deepanshu Gupta [Tue, 13 May 2014 20:38:17 +0000 (20:38 +0000)]
am
ccf6b347: am
a1546876: am
7ef27645: am
f192096a: am
17585160: am
26c37321: Add missing layout params to xlarge action bar. [DO NOT MERGE]
* commit '
ccf6b34799efb14e5883ed4901ff03bf75ac4c1c':
Add missing layout params to xlarge action bar. [DO NOT MERGE]
Deepanshu Gupta [Tue, 13 May 2014 20:38:15 +0000 (20:38 +0000)]
am
87a54055: am
5878115a: resolved conflicts for merge of
9978c036 to jb-mr1.1-dev
* commit '
87a54055e61918986021eb5e1e3dbefe40839367':
Overflow menu popup for Action Bar in Layoutlib [DO NOT MERGE]
Deepanshu Gupta [Tue, 13 May 2014 20:38:12 +0000 (20:38 +0000)]
am
85b75194: resolved conflicts for merge of
cc9e3596 to jb-mr1.1-dev
* commit '
85b751949b3d383494523bb98b016157d76787f3':
Add view cookies for action bar menus. [DO NOT MERGE]
Deepanshu Gupta [Tue, 13 May 2014 20:36:24 +0000 (20:36 +0000)]
am
8c19c6a1: am
16f3a616: am
c0e9c66d: resolved conflicts for merge of
8e015b7b to jb-mr1.1-dev
* commit '
8c19c6a17d8a019086a36988937462acfb6b830f':
Action bar rendering in layoutlib [DO NOT MERGE]
Deepanshu Gupta [Tue, 13 May 2014 20:33:33 +0000 (20:33 +0000)]
am
a1546876: am
7ef27645: am
f192096a: am
17585160: am
26c37321: Add missing layout params to xlarge action bar. [DO NOT MERGE]
* commit '
a154687620a6d53f17c7abc36d419884cd6df2b7':
Add missing layout params to xlarge action bar. [DO NOT MERGE]
Deepanshu Gupta [Tue, 13 May 2014 20:33:30 +0000 (20:33 +0000)]
am
5878115a: resolved conflicts for merge of
9978c036 to jb-mr1.1-dev
* commit '
5878115a6e19041439b335efae066862e21775a1':
Overflow menu popup for Action Bar in Layoutlib [DO NOT MERGE]
Deepanshu Gupta [Tue, 13 May 2014 20:32:59 +0000 (13:32 -0700)]
resolved conflicts for merge of
cc9e3596 to jb-mr1.1-dev
Aaron Whyte [Tue, 13 May 2014 20:32:21 +0000 (20:32 +0000)]
Merge "Disallow FEATURE_INDETERMINATE_PROGRESS for clockwork. Make LauncherActivity CTS tests pass on clockwork. Bug:
14657859" into klp-modular-dev
Deepanshu Gupta [Tue, 13 May 2014 20:31:33 +0000 (20:31 +0000)]
am
7ef27645: am
f192096a: am
17585160: am
26c37321: Add missing layout params to xlarge action bar. [DO NOT MERGE]
* commit '
7ef276450f3157cc68f714b0d5805319e6f4c555':
Add missing layout params to xlarge action bar. [DO NOT MERGE]
Deepanshu Gupta [Tue, 13 May 2014 20:30:39 +0000 (20:30 +0000)]
am
16f3a616: am
c0e9c66d: resolved conflicts for merge of
8e015b7b to jb-mr1.1-dev
* commit '
16f3a6167bdcbd49e47d843fcb43fe9ffd461531':
Action bar rendering in layoutlib [DO NOT MERGE]
Deepanshu Gupta [Tue, 13 May 2014 20:29:07 +0000 (13:29 -0700)]
resolved conflicts for merge of
9978c036 to jb-mr1.1-dev
Deepanshu Gupta [Tue, 13 May 2014 20:27:46 +0000 (20:27 +0000)]
am
c0e9c66d: resolved conflicts for merge of
8e015b7b to jb-mr1.1-dev
* commit '
c0e9c66d7d59873443714cc19e5cea8c044931bb':
Action bar rendering in layoutlib [DO NOT MERGE]
Deepanshu Gupta [Tue, 13 May 2014 19:17:15 +0000 (19:17 +0000)]
am
874040d1: am
84f5acea: am
0b878070: (-s ours) am
61b1fd5c: am
e14b24f3: am
06ca4c6a: (-s ours) am
1281853a: am
2de8509e: am
7d5299c2: am
0f26b510: am
9053261a: am
052e0c58: am
770e40f8: Fix theme/style resolution in Layoutlib [DO NOT MERGE]
* commit '
874040d10d5ad3b7235f24779c6e9cc142326df0':
Fix theme/style resolution in Layoutlib [DO NOT MERGE]
Deepanshu Gupta [Tue, 13 May 2014 19:17:12 +0000 (19:17 +0000)]
am
b59cac72: am
382a0c70: am
3d9c18f2: am
9bdf54d3: am
41b3ef3a: am
29171d5a: am
eb036026: am
14788ef3: am
f8c56858: resolved conflicts for merge of
727ad350 to jb-mr1.1-dev
* commit '
b59cac7255e04a97ea230484ee6602836ebd669b':
Fix visitFieldInsn in layoutlib_create. [DO NOT MERGE]
Deepanshu Gupta [Tue, 13 May 2014 19:12:52 +0000 (19:12 +0000)]
am
84f5acea: am
0b878070: (-s ours) am
61b1fd5c: am
e14b24f3: am
06ca4c6a: (-s ours) am
1281853a: am
2de8509e: am
7d5299c2: am
0f26b510: am
9053261a: am
052e0c58: am
770e40f8: Fix theme/style resolution in Layoutlib [DO NOT MERGE]
* commit '
84f5aceabd57f349b0e43c0cf45bc2ff76873ee1':
Fix theme/style resolution in Layoutlib [DO NOT MERGE]
Deepanshu Gupta [Tue, 13 May 2014 19:12:48 +0000 (19:12 +0000)]
am
382a0c70: am
3d9c18f2: am
9bdf54d3: am
41b3ef3a: am
29171d5a: am
eb036026: am
14788ef3: am
f8c56858: resolved conflicts for merge of
727ad350 to jb-mr1.1-dev
* commit '
382a0c70bf4f972034ee95059b8e29758ce08607':
Fix visitFieldInsn in layoutlib_create. [DO NOT MERGE]
Deepanshu Gupta [Tue, 13 May 2014 19:07:35 +0000 (19:07 +0000)]
am
0b878070: (-s ours) am
61b1fd5c: am
e14b24f3: am
06ca4c6a: (-s ours) am
1281853a: am
2de8509e: am
7d5299c2: am
0f26b510: am
9053261a: am
052e0c58: am
770e40f8: Fix theme/style resolution in Layoutlib [DO NOT MERGE]
* commit '
0b878070ed6f20580508a921ab0babff9826931b':
Fix theme/style resolution in Layoutlib [DO NOT MERGE]
Deepanshu Gupta [Tue, 13 May 2014 19:07:32 +0000 (19:07 +0000)]
am
3d9c18f2: am
9bdf54d3: am
41b3ef3a: am
29171d5a: am
eb036026: am
14788ef3: am
f8c56858: resolved conflicts for merge of
727ad350 to jb-mr1.1-dev
* commit '
3d9c18f27059f1b242690dec400c90c78db1e527':
Fix visitFieldInsn in layoutlib_create. [DO NOT MERGE]
Deepanshu Gupta [Tue, 13 May 2014 19:02:20 +0000 (19:02 +0000)]
am
61b1fd5c: am
e14b24f3: am
06ca4c6a: (-s ours) am
1281853a: am
2de8509e: am
7d5299c2: am
0f26b510: am
9053261a: am
052e0c58: am
770e40f8: Fix theme/style resolution in Layoutlib [DO NOT MERGE]
* commit '
61b1fd5cd9238db5f5970c30cc46dc5087b229cb':
Fix theme/style resolution in Layoutlib [DO NOT MERGE]
Deepanshu Gupta [Tue, 13 May 2014 19:02:17 +0000 (19:02 +0000)]
am
9bdf54d3: am
41b3ef3a: am
29171d5a: am
eb036026: am
14788ef3: am
f8c56858: resolved conflicts for merge of
727ad350 to jb-mr1.1-dev
* commit '
9bdf54d3d7421c052013eb2200afbd18e3c9b48a':
Fix visitFieldInsn in layoutlib_create. [DO NOT MERGE]
Deepanshu Gupta [Tue, 13 May 2014 18:57:04 +0000 (18:57 +0000)]
am
e14b24f3: am
06ca4c6a: (-s ours) am
1281853a: am
2de8509e: am
7d5299c2: am
0f26b510: am
9053261a: am
052e0c58: am
770e40f8: Fix theme/style resolution in Layoutlib [DO NOT MERGE]
* commit '
e14b24f3a0c39c2e3755b55cca2600e12620ee32':
Fix theme/style resolution in Layoutlib [DO NOT MERGE]
Deepanshu Gupta [Tue, 13 May 2014 18:57:01 +0000 (18:57 +0000)]
am
41b3ef3a: am
29171d5a: am
eb036026: am
14788ef3: am
f8c56858: resolved conflicts for merge of
727ad350 to jb-mr1.1-dev
* commit '
41b3ef3ae266ea766ef38947e2d5f01c55006735':
Fix visitFieldInsn in layoutlib_create. [DO NOT MERGE]
Deepanshu Gupta [Tue, 13 May 2014 18:53:04 +0000 (18:53 +0000)]
am
9a5d6556: am
c174bdcd: am
76cc9bcc: (-s ours) am
6d091cdb: am
2d84de2f: am
0d76fd64: (-s ours) am
3e7f0a20: am
776c1923: am
3c9fceae: am
627cab12: am
45693e50: am
c9a4badb: am
d915dcac: Layoutlib tests now check methods return value [DO NOT MERGE]
* commit '
9a5d655696c65dbe05b1309713330b73e8cadb1c':
Layoutlib tests now check methods return value [DO NOT MERGE]
Deepanshu Gupta [Tue, 13 May 2014 18:53:01 +0000 (18:53 +0000)]
am
9141c288: am
90c30544: am
d23b318c: (-s ours) am
5806ec71: am
f29a0516: am
0c11327b: (-s ours) am
d4d66df6: am
26dd61c5: am
07009057: am
effef172: am
e3b43270: am
bdd8fbf6: am
877ae535: Set default text style in layoutlib as NORMAL [DO NOT MERGE]
* commit '
9141c2880cbeeb93c4e99e2b699a47796da4407f':
Set default text style in layoutlib as NORMAL [DO NOT MERGE]
Deepanshu Gupta [Tue, 13 May 2014 18:52:58 +0000 (18:52 +0000)]
am
1d7c7eaf: am
2ffe14b8: am
7bbd0358: (-s ours) am
b110aa8c: am
41764152: am
8a505e5c: (-s ours) am
74d2a533: am
bb7cfa1e: am
85c5cdcd: am
c3a0c9f6: am
45ca5ba7: am
01cdd312: am
669792b3: Fix sans-serif-thin and sans-serif-light fonts in layoutlib. [DO NOT MERGE]
* commit '
1d7c7eaf844216d25113e07c2d15c0a563fdefdf':
Fix sans-serif-thin and sans-serif-light fonts in layoutlib. [DO NOT MERGE]
Deepanshu Gupta [Tue, 13 May 2014 18:52:55 +0000 (18:52 +0000)]
am
ef77c00d: am
9c30d2e8: am
ceb9b606: (-s ours) am
4024fe96: am
28c76e3e: am
5db08e87: (-s ours) am
ce68e782: am
e535ff28: am
488f6247: am
835cbaa1: am
9f965258: am
d094742d: am
cda89ca0: Fix a bug in Nine Patch library. [DO NOT MERGE]
* commit '
ef77c00d6a7010c3e511e88cf1bb8387394fbdbd':
Fix a bug in Nine Patch library. [DO NOT MERGE]
Deepanshu Gupta [Tue, 13 May 2014 18:52:52 +0000 (18:52 +0000)]
am
b806bde9: am
7475771a: am
7be53b24: am
a73bc03b: am
471061ce: am
e74d437a: am
c5c49dcd: am
8b78a1d7: am
9f00e655: resolved conflicts for merge of
ce9e87f7 to jb-mr1.1-dev
* commit '
b806bde9fa0225ed38fc0f999cfaaa53b436f5e0':
Optimize layout rendering in layoutlib [DO NOT MERGE]
Deepanshu Gupta [Tue, 13 May 2014 18:51:50 +0000 (18:51 +0000)]
am
06ca4c6a: (-s ours) am
1281853a: am
2de8509e: am
7d5299c2: am
0f26b510: am
9053261a: am
052e0c58: am
770e40f8: Fix theme/style resolution in Layoutlib [DO NOT MERGE]
* commit '
06ca4c6a4657c20ecb32bcfacabdc95c7063c99a':
Fix theme/style resolution in Layoutlib [DO NOT MERGE]
Deepanshu Gupta [Tue, 13 May 2014 18:51:47 +0000 (18:51 +0000)]
am
29171d5a: am
eb036026: am
14788ef3: am
f8c56858: resolved conflicts for merge of
727ad350 to jb-mr1.1-dev
* commit '
29171d5a9ae0f406128cf6c8cdf6ceeed0a0be49':
Fix visitFieldInsn in layoutlib_create. [DO NOT MERGE]
Deepanshu Gupta [Tue, 13 May 2014 18:47:46 +0000 (18:47 +0000)]
am
561fc1b6: am
99b33914: am
3f615bf2: (-s ours) am
e0d3e66d: am
2f8da100: am
81ac665c: (-s ours) am
060836bd: am
fed25eb8: am
c233bb65: am
8a4f3935: am
48bf7b49: am
69b3115e: am
e183855c: Add methods for Time_Delegate [DO NOT MERGE]
* commit '
561fc1b69de0e9f82c1ab2dcbf5ec031476cd27c':
Add methods for Time_Delegate [DO NOT MERGE]
Deepanshu Gupta [Tue, 13 May 2014 18:47:42 +0000 (18:47 +0000)]
am
1f21b31e: am
0c2aeb4a: am
8816bdfa: (-s ours) am
39daf02e: am
1eadb79e: am
fd8af673: (-s ours) am
9e614b25: am
204316c5: am
8cf3343d: am
838e5482: am
94d33cfc: am
82d5bd98: am
e5a2347b: Fix NPE in layoutlib. [DO NOT MERGE]
* commit '
1f21b31ed51e58c996d428434885e7ca3e1e9367':
Fix NPE in layoutlib. [DO NOT MERGE]
Deepanshu Gupta [Tue, 13 May 2014 18:47:39 +0000 (18:47 +0000)]
am
a42d321c: am
56d3c9d1: am
851aece2: (-s ours) am
a63a1f9b: am
910c7153: am
be0c94ea: (-s ours) am
be2184e4: am
cfc9e4ed: am
d62dcc29: am
df8a15b3: am
d4e6727d: am
d5de1bd6: am
30505abe: Fix text size in Fake Action Bar. [DO NOT MERGE]
* commit '
a42d321c6ac7eef80d24e3b178306418926ce659':
Fix text size in Fake Action Bar. [DO NOT MERGE]
OSDN Git Service
