Deepanshu Gupta
494a7fcd18
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]
2014-05-13 21:43:45 +00:00
Deepanshu Gupta
3b7ab1cf7d
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]
2014-05-13 21:43:41 +00:00
Deepanshu Gupta
613cf6ed49
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]
2014-05-13 21:43:38 +00:00
Deepanshu Gupta
55f0c87435
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]
2014-05-13 21:37:52 +00:00
Deepanshu Gupta
4f9bb37759
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]
2014-05-13 21:37:49 +00:00
Deepanshu Gupta
8fdd8f6576
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]
2014-05-13 21:37:46 +00:00
Deepanshu Gupta
5f421714a6
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]
2014-05-13 21:33:00 +00:00
Deepanshu Gupta
93d10eda4f
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]
2014-05-13 21:32:57 +00:00
Deepanshu Gupta
3d491e3790
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]
2014-05-13 21:32:54 +00:00
Deepanshu Gupta
9dad1cff17
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]
2014-05-13 21:32:53 +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
f14922db63
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]
2014-05-13 21:26:33 +00:00
Deepanshu Gupta
425f172ab5
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]
2014-05-13 21:25:04 +00:00
Deepanshu Gupta
a6bc2e68b7
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]
2014-05-13 21:25:00 +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
Svetoslav
04533dd3ba
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
2014-05-13 21:21:36 +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
ae089999be
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]
2014-05-13 21:19:10 +00:00
Deepanshu Gupta
52483b6d39
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]
2014-05-13 21:19:07 +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
b09506dad9
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]
2014-05-13 21:17:25 +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
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
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
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
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
ecf80ad35c
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]
2014-05-13 21:11:51 +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
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
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
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
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
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
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
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
Deepanshu Gupta
11243dd664
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]
2014-05-13 20:59:25 +00:00
