Deepanshu Gupta
|
9a3e6ec73c
|
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]
|
2014-05-13 21:28:16 +00:00 |
|
Deepanshu Gupta
|
03ccc80d0a
|
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]
|
2014-05-13 21:28:14 +00:00 |
|
Deepanshu Gupta
|
db83a08b13
|
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]
|
2014-05-13 21:28:12 +00:00 |
|
Deepanshu Gupta
|
84cea70792
|
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]
|
2014-05-13 21:28:10 +00:00 |
|
Deepanshu Gupta
|
fea4b4dde3
|
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
|
2014-05-13 21:23:50 +00:00 |
|
Deepanshu Gupta
|
69ab594625
|
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]
|
2014-05-13 21:23:47 +00:00 |
|
Deepanshu Gupta
|
cdc40eb0e0
|
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]
|
2014-05-13 21:23:43 +00:00 |
|
Deepanshu Gupta
|
c909b4d53b
|
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]
|
2014-05-13 21:23:40 +00:00 |
|
Deepanshu Gupta
|
86726f58db
|
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]
|
2014-05-13 21:23:37 +00:00 |
|
Deepanshu Gupta
|
0573cffacc
|
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]
|
2014-05-13 21:23:35 +00:00 |
|
Deepanshu Gupta
|
6368a39dd2
|
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]
|
2014-05-13 21:21:33 +00:00 |
|
Deepanshu Gupta
|
3450dc3256
|
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
|
2014-05-13 21:18:06 +00:00 |
|
Deepanshu Gupta
|
fcfb8801b2
|
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]
|
2014-05-13 21:18:03 +00:00 |
|
Deepanshu Gupta
|
6fd1703eb9
|
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]
|
2014-05-13 21:18:00 +00:00 |
|
Deepanshu Gupta
|
2322a9107b
|
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]
|
2014-05-13 21:17:57 +00:00 |
|
Deepanshu Gupta
|
eb5b38b167
|
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]
|
2014-05-13 21:17:54 +00:00 |
|
Deepanshu Gupta
|
b520cc4599
|
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]
|
2014-05-13 21:17:51 +00:00 |
|
Deepanshu Gupta
|
883a17cd95
|
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]
|
2014-05-13 21:14:56 +00:00 |
|
Deepanshu Gupta
|
06018d92e8
|
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
|
2014-05-13 21:12:42 +00:00 |
|
Deepanshu Gupta
|
ef33848aae
|
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]
|
2014-05-13 21:12:39 +00:00 |
|
Deepanshu Gupta
|
18b1525ac7
|
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]
|
2014-05-13 21:12:39 +00:00 |
|
Deepanshu Gupta
|
0d33f604d6
|
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]
|
2014-05-13 21:12:37 +00:00 |
|
Deepanshu Gupta
|
75fc74d6db
|
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]
|
2014-05-13 21:12:35 +00:00 |
|
Deepanshu Gupta
|
110e3f48f3
|
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]
|
2014-05-13 21:12:35 +00:00 |
|
Deepanshu Gupta
|
a350f96ec9
|
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]
|
2014-05-13 21:12:32 +00:00 |
|
Deepanshu Gupta
|
cf2af66180
|
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]
|
2014-05-13 21:12:29 +00:00 |
|
Deepanshu Gupta
|
14480abeb6
|
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]
|
2014-05-13 21:09:22 +00:00 |
|
Deepanshu Gupta
|
f41a380bd9
|
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
|
2014-05-13 21:07:45 +00:00 |
|
Deepanshu Gupta
|
ef24a5091b
|
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]
|
2014-05-13 21:07:40 +00:00 |
|
Deepanshu Gupta
|
4dff881b99
|
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]
|
2014-05-13 21:07:38 +00:00 |
|
Deepanshu Gupta
|
203964c058
|
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]
|
2014-05-13 21:07:35 +00:00 |
|
Deepanshu Gupta
|
0efb07592a
|
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]
|
2014-05-13 21:07:35 +00:00 |
|
Deepanshu Gupta
|
0eb268a0de
|
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]
|
2014-05-13 21:07:31 +00:00 |
|
Deepanshu Gupta
|
752b90f260
|
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]
|
2014-05-13 21:07:28 +00:00 |
|
Deepanshu Gupta
|
a22e96bfec
|
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]
|
2014-05-13 21:07:01 +00:00 |
|
Deepanshu Gupta
|
7b22846433
|
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]
|
2014-05-13 21:06:58 +00:00 |
|
Deepanshu Gupta
|
bfc75f6895
|
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]
|
2014-05-13 21:04:28 +00:00 |
|
Deepanshu Gupta
|
d10ca17d6f
|
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
|
2014-05-13 21:02:23 +00:00 |
|
Deepanshu Gupta
|
4e1023a1fc
|
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]
|
2014-05-13 21:02:23 +00:00 |
|
Deepanshu Gupta
|
900954e3cd
|
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]
|
2014-05-13 21:02:19 +00:00 |
|
Deepanshu Gupta
|
ce33060c92
|
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]
|
2014-05-13 21:02:19 +00:00 |
|
Deepanshu Gupta
|
7b9cc71063
|
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]
|
2014-05-13 21:02:17 +00:00 |
|
Deepanshu Gupta
|
b7e1bef183
|
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]
|
2014-05-13 21:02:14 +00:00 |
|
Deepanshu Gupta
|
22dabb5282
|
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]
|
2014-05-13 21:02:11 +00:00 |
|
Deepanshu Gupta
|
919ce20515
|
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]
|
2014-05-13 21:02:08 +00:00 |
|
Deepanshu Gupta
|
9d0fcb73e2
|
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]
|
2014-05-13 21:02:06 +00:00 |
|
Deepanshu Gupta
|
8921409a05
|
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
|
2014-05-13 21:00:22 +00:00 |
|
Deepanshu Gupta
|
2100476ace
|
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]
|
2014-05-13 21:00:19 +00:00 |
|
Deepanshu Gupta
|
9c7e306446
|
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]
|
2014-05-13 21:00:16 +00:00 |
|
Deepanshu Gupta
|
b607cb82e0
|
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]
|
2014-05-13 21:00:13 +00:00 |
|