OSDN Git Service
Jeff Brown [Wed, 21 May 2014 02:34:25 +0000 (02:34 +0000)]
Merge "Allow display timeouts to be set in config.xml." into klp-modular-dev
Dirk Dougherty [Wed, 21 May 2014 02:25:09 +0000 (02:25 +0000)]
am
c1bb79d9: am
bb0b8449: Remove monetization image in edu guidelines.
* commit '
c1bb79d966c5fee256a349d8902c7abd362ddc39':
Remove monetization image in edu guidelines.
Dirk Dougherty [Wed, 21 May 2014 02:20:16 +0000 (02:20 +0000)]
am
bb0b8449: Remove monetization image in edu guidelines.
* commit '
bb0b8449f80338a35768c9264e9c1e5eae54c7fa':
Remove monetization image in edu guidelines.
Dirk Dougherty [Wed, 21 May 2014 02:10:26 +0000 (19:10 -0700)]
Remove monetization image in edu guidelines.
Change-Id: I2cea7a3507eda30ab185560304d64fc455ba19f7
Jeff Brown [Wed, 21 May 2014 00:17:10 +0000 (17:17 -0700)]
Allow display timeouts to be set in config.xml.
Bug:
13671523
Change-Id: I79fc21999bc62743178d2d22071455a0c11070c9
Griff Hazen [Tue, 20 May 2014 20:50:06 +0000 (13:50 -0700)]
Add wearable notification extensions to frameworks/base.
Change-Id: Ic312cec7dc11e637002ff2be3975940a93a6babf
Griff Hazen [Tue, 20 May 2014 19:50:51 +0000 (12:50 -0700)]
Fix sdk docs build for framework from remote input api addition.
Change-Id: I6a6f3df06d924fe72f67466d67d9feced8d8719f
Griff Hazen [Tue, 20 May 2014 16:55:39 +0000 (09:55 -0700)]
Add RemoteInput, Grouping, and Extender to Notification api.
RemoteInputs annotate actions and content intents to request
input from the user as part of an intent being sent. Results
are sent along using ClipData to avoid unparcel of developer
provided bundle values. A helper method is expexted to be used
to extract results.
Grouping allows notifications to be bundled together, with an optional
summary notification for display on older platforms. SortKey is an
important part of grouping since child notifications will likely have
a prescribed ordering. It is also useful in top level notifications
for apps that want to provide an ordering all other fields being equal.
Also provide a fluid way to to extend Actions and Notifications
using Extenders, e.g.:
Notification n = new NotificationCompat.Builder(context)
.setOption1()
.apply(new SomeExtender()
.setOption2())
.build();
This helps extension libraries provide a nice API experience for devs.
Change-Id: Ib3438ef854772c2c34d21bf1eb4ed7c9e032106f
Ben Murdoch [Tue, 20 May 2014 09:32:42 +0000 (09:32 +0000)]
Merge "Add PackagManager flag for WebView system feature." into klp-modular-dev
Guang Zhu [Tue, 20 May 2014 04:36:47 +0000 (04:36 +0000)]
Merge "add a command to list all bonded devices" into klp-modular-dev
Guang Zhu [Tue, 20 May 2014 04:34:25 +0000 (21:34 -0700)]
add a command to list all bonded devices
Bug:
14601515
Change-Id: I3cc5bb664485ef768bb81f1f8870ed9bf62f8329
quddusc [Mon, 19 May 2014 20:58:49 +0000 (20:58 +0000)]
am
f269e732: am
728dbf8c: Merge "docs: Updated Google Play Services highlights and landing pages for Kenafa (Google Play Services v4.4)." into klp-docs
* commit '
f269e732bf76d7dc4b37f2ce023684b4fe691c60':
docs: Updated Google Play Services highlights and landing pages for Kenafa (Google Play Services v4.4).
Quddus Chong [Mon, 19 May 2014 20:58:41 +0000 (20:58 +0000)]
am
47064793: am
f4b64495: Merge "docs: Updated Javadoc for GMS Kenafa release." into klp-docs
* commit '
4706479326789b4b20cc370cdb28c7a0b4f09646':
docs: Updated Javadoc for GMS Kenafa release.
quddusc [Mon, 19 May 2014 20:55:35 +0000 (20:55 +0000)]
am
728dbf8c: Merge "docs: Updated Google Play Services highlights and landing pages for Kenafa (Google Play Services v4.4)." into klp-docs
* commit '
728dbf8cc8d6c8a84bf67b8b34295eab4503d230':
docs: Updated Google Play Services highlights and landing pages for Kenafa (Google Play Services v4.4).
Quddus Chong [Mon, 19 May 2014 20:55:31 +0000 (20:55 +0000)]
am
f4b64495: Merge "docs: Updated Javadoc for GMS Kenafa release." into klp-docs
* commit '
f4b6449515f212642e90e435b2a3a55766a41f9e':
docs: Updated Javadoc for GMS Kenafa release.
quddusc [Mon, 19 May 2014 20:52:05 +0000 (20:52 +0000)]
Merge "docs: Updated Google Play Services highlights and landing pages for Kenafa (Google Play Services v4.4)." into klp-docs
Quddus Chong [Mon, 19 May 2014 20:51:39 +0000 (20:51 +0000)]
Merge "docs: Updated Javadoc for GMS Kenafa release." into klp-docs
Mark Renouf [Mon, 19 May 2014 20:36:40 +0000 (20:36 +0000)]
Merge "Override windowContentOverlay and windowBackground for Theme.Micro.*" into klp-modular-dev
Mark Renouf [Mon, 19 May 2014 17:40:17 +0000 (13:40 -0400)]
Override windowContentOverlay and windowBackground for Theme.Micro.*
Change-Id: Iab40fb70398ad2ce87b613aa9278cb87f7a35d84
Dirk Dougherty [Mon, 19 May 2014 18:08:53 +0000 (18:08 +0000)]
am
4d37d7ef: am
c385b1e4: Merge "Remove neg margin in wear css to resolve layout issue." into klp-docs
* commit '
4d37d7ef141beaf8f7d1b2bf1c19e3fb8c84203f':
Remove neg margin in wear css to resolve layout issue.
Scott Rowe [Mon, 19 May 2014 18:08:45 +0000 (18:08 +0000)]
am
a0144782: am
6d05170a: docs: b/
14510382 ISO language code, add link
* commit '
a0144782b16b5b6a767a0c48fa5c3a79a5c74889':
docs: b/
14510382 ISO language code, add link
Robert Ly [Mon, 19 May 2014 17:56:18 +0000 (17:56 +0000)]
Merge "docs: updates for changes to notification APIs" into klp-modular-dev
Dirk Dougherty [Mon, 19 May 2014 17:27:41 +0000 (17:27 +0000)]
am
c385b1e4: Merge "Remove neg margin in wear css to resolve layout issue." into klp-docs
* commit '
c385b1e4be928133930d9264a92c98f4747adedb':
Remove neg margin in wear css to resolve layout issue.
Dirk Dougherty [Mon, 19 May 2014 17:23:33 +0000 (17:23 +0000)]
Merge "Remove neg margin in wear css to resolve layout issue." into klp-docs
Scott Rowe [Mon, 19 May 2014 17:04:53 +0000 (17:04 +0000)]
am
6d05170a: docs: b/
14510382 ISO language code, add link
* commit '
6d05170a55ac6a9401e6089ba49d675857c3c25d':
docs: b/
14510382 ISO language code, add link
Ben Murdoch [Fri, 16 May 2014 12:45:47 +0000 (13:45 +0100)]
Add PackagManager flag for WebView system feature.
Add a flag for PackageManager.hasSystemFeature to determine
if a functional webview is available on the device.
Bug:
13438487
Change-Id: I770f7e924b3e5fa6be0397904acf18c9306096e4
Ben Murdoch [Mon, 19 May 2014 11:26:31 +0000 (11:26 +0000)]
Merge "Fallback to NullWebView when Chromium WebView not present." into klp-modular-dev
Robert Ly [Sun, 11 May 2014 18:25:35 +0000 (11:25 -0700)]
docs: updates for changes to notification APIs
Change-Id: I8a016b0693e928eb864065bea1079be824987340
Joe LaPenna [Sat, 17 May 2014 01:55:06 +0000 (01:55 +0000)]
Merge "Log accept and close debug statements in BluetoothSocket." into klp-modular-dev
Scott Rowe [Fri, 16 May 2014 21:31:46 +0000 (14:31 -0700)]
docs: b/
14510382 ISO language code, add link
Change-Id: Id78858743b453d9e44624f491db183d9a099a1ce
Quddus Chong [Wed, 7 May 2014 00:02:49 +0000 (17:02 -0700)]
docs: Updated Javadoc for GMS Kenafa release.
Change-Id: Id3b7853282e317c85d58a7d84657e59a0159961d
Griff Hazen [Fri, 16 May 2014 16:46:31 +0000 (09:46 -0700)]
Fix Notification sdk docs build.
Builder#X looked like it was considered ambiguous even though Action
was not in scope. Intellij disagreed but this fixes the issue.
Change-Id: I51fac39b2a4834e25f936c6eae223cda8c9c610e
Ben Murdoch [Fri, 16 May 2014 12:41:12 +0000 (13:41 +0100)]
Fallback to NullWebView when Chromium WebView not present.
If it's not possible to load the Chromium WebView, fallback to loading
the NullWebView that will throw UnsupportedOperationException.
Bug:
13438487
Change-Id: If44b8b7a569c2f8e0e8bba7e6953288802d1c9e0
Griff Hazen [Fri, 16 May 2014 05:26:18 +0000 (22:26 -0700)]
Add support for extendable actions to Notification.
Change-Id: I2945a6994a28fc454af3f84e75c96d7619547f01
Justin Koh [Thu, 15 May 2014 17:17:13 +0000 (17:17 +0000)]
Merge "If there is only 1 simple global action, autolaunch it" into klp-modular-dev
Baligh Uddin [Thu, 15 May 2014 14:26:05 +0000 (14:26 +0000)]
Merge "Import translations. DO NOT MERGE" into klp-modular-dev
Dirk Dougherty [Thu, 15 May 2014 03:06:31 +0000 (20:06 -0700)]
Remove neg margin in wear css to resolve layout issue.
Change-Id: I68cc26e55b8bf486a20ec9fa1de48e9caf505165
Ricardo Cervera [Wed, 14 May 2014 23:53:20 +0000 (23:53 +0000)]
am
59ab011e: am
0e286ab1: Merge "docs: Removed outdated troubleshooting guidelines for Android Studio" into klp-docs
* commit '
59ab011eebc5deb008ae62c0fe353d6d0aac8ab8':
docs: Removed outdated troubleshooting guidelines for Android Studio
Ricardo Cervera [Wed, 14 May 2014 23:49:24 +0000 (23:49 +0000)]
am
0e286ab1: Merge "docs: Removed outdated troubleshooting guidelines for Android Studio" into klp-docs
* commit '
0e286ab1f0eaeb2bb75c7a76ff8f3d08267e7fc3':
docs: Removed outdated troubleshooting guidelines for Android Studio
Ricardo Cervera [Wed, 14 May 2014 22:44:56 +0000 (22:44 +0000)]
Merge "docs: Removed outdated troubleshooting guidelines for Android Studio" into klp-docs
Dirk Dougherty [Wed, 14 May 2014 21:21:23 +0000 (21:21 +0000)]
am
980a285b: am
5eb99943: Merge "update wear reference docs to support sticky nav. DO NOT SUBMIT UNTIL DYNAMIC TEMPLATE IS MERGED." into klp-docs
* commit '
980a285b4c29254fd65b0426256918ae2b5eea85':
update wear reference docs to support sticky nav. DO NOT SUBMIT UNTIL DYNAMIC TEMPLATE IS MERGED.
Dirk Dougherty [Wed, 14 May 2014 21:21:15 +0000 (21:21 +0000)]
am
a4e6c7d1: am
3506ac87: Doc change: Updated content for distribute.
* commit '
a4e6c7d1d4e6c8ca2b50f91ae8881fb4838d7955':
Doc change: Updated content for distribute.
Dirk Dougherty [Wed, 14 May 2014 21:17:27 +0000 (21:17 +0000)]
am
5eb99943: Merge "update wear reference docs to support sticky nav. DO NOT SUBMIT UNTIL DYNAMIC TEMPLATE IS MERGED." into klp-docs
* commit '
5eb99943d5cf4ad32c61d94e944c155d1c77a915':
update wear reference docs to support sticky nav. DO NOT SUBMIT UNTIL DYNAMIC TEMPLATE IS MERGED.
Dirk Dougherty [Wed, 14 May 2014 21:17:22 +0000 (21:17 +0000)]
am
3506ac87: Doc change: Updated content for distribute.
* commit '
3506ac87c09c0748d92ef594c94365a5d7b07262':
Doc change: Updated content for distribute.
Dirk Dougherty [Wed, 14 May 2014 21:16:31 +0000 (21:16 +0000)]
Merge "update wear reference docs to support sticky nav. DO NOT SUBMIT UNTIL DYNAMIC TEMPLATE IS MERGED." into klp-docs
Dirk Dougherty [Fri, 21 Feb 2014 19:15:52 +0000 (11:15 -0800)]
Doc change: Updated content for distribute.
Change-Id: I612fbb8e5b7aedd73c0e633e5517bb89375760ed
Baligh Uddin [Wed, 14 May 2014 17:44:46 +0000 (10:44 -0700)]
Import translations. DO NOT MERGE
Change-Id: I443d4950531e7ab7018cb5db1b8316f1b8baaa9e
Auto-generated-cl: translation import
Justin Koh [Mon, 12 May 2014 23:00:36 +0000 (16:00 -0700)]
If there is only 1 simple global action, autolaunch it
Requested by UX. Also made settings available before provisioning
Bug:
14683740
Bug:
14886954
Change-Id: If62ccc6472a72b7adb4d309ee89e51069f8e0413
Joe LaPenna [Wed, 14 May 2014 01:17:46 +0000 (18:17 -0700)]
Log accept and close debug statements in BluetoothSocket.
Bug:
14902781
Bug:
14784262
Change-Id: Id0c2cd216244e05c218568427bda863a538b1041
Deepanshu Gupta [Wed, 14 May 2014 00:31:20 +0000 (00:31 +0000)]
am
f73dbcc3: am
9916c17e: am
472cbad4: am
f57871f7: am
888dad0d: am
f33a2f62: am
f5af9a4a: am
273c5c3c: am
9ca7a039: resolved conflicts for merge of
e0be42a9 to jb-mr1.1-dev
* commit '
f73dbcc3780fbfb6a9eab7d43aebc3607ad1e8f8':
Fix build due to incorrect merges [DO NOT MERGE]
Deepanshu Gupta [Wed, 14 May 2014 00:31:15 +0000 (00:31 +0000)]
Deepanshu Gupta [Wed, 14 May 2014 00:26:43 +0000 (00:26 +0000)]
am
9916c17e: am
472cbad4: am
f57871f7: am
888dad0d: am
f33a2f62: am
f5af9a4a: am
273c5c3c: am
9ca7a039: resolved conflicts for merge of
e0be42a9 to jb-mr1.1-dev
* commit '
9916c17e6606607bbadacc4fb113018ecb7fcb41':
Fix build due to incorrect merges [DO NOT MERGE]
Deepanshu Gupta [Wed, 14 May 2014 00:26:38 +0000 (00:26 +0000)]
Deepanshu Gupta [Wed, 14 May 2014 00:21:36 +0000 (00:21 +0000)]
am
472cbad4: am
f57871f7: am
888dad0d: am
f33a2f62: am
f5af9a4a: am
273c5c3c: am
9ca7a039: resolved conflicts for merge of
e0be42a9 to jb-mr1.1-dev
* commit '
472cbad479b0f1361c816a2c0d5accb776fa3841':
Fix build due to incorrect merges [DO NOT MERGE]
Deepanshu Gupta [Wed, 14 May 2014 00:21:33 +0000 (00:21 +0000)]
Deepanshu Gupta [Wed, 14 May 2014 00:15:28 +0000 (00:15 +0000)]
am
f57871f7: am
888dad0d: am
f33a2f62: am
f5af9a4a: am
273c5c3c: am
9ca7a039: resolved conflicts for merge of
e0be42a9 to jb-mr1.1-dev
* commit '
f57871f799300614d37e93e376f9381fd01c2bcb':
Fix build due to incorrect merges [DO NOT MERGE]
Deepanshu Gupta [Wed, 14 May 2014 00:15:24 +0000 (00:15 +0000)]
Deepanshu Gupta [Wed, 14 May 2014 00:11:08 +0000 (00:11 +0000)]
am
888dad0d: am
f33a2f62: am
f5af9a4a: am
273c5c3c: am
9ca7a039: resolved conflicts for merge of
e0be42a9 to jb-mr1.1-dev
* commit '
888dad0df765256f4b47268400425103106894f0':
Fix build due to incorrect merges [DO NOT MERGE]
Deepanshu Gupta [Wed, 14 May 2014 00:11:06 +0000 (00:11 +0000)]
Deepanshu Gupta [Wed, 14 May 2014 00:05:38 +0000 (00:05 +0000)]
am
f33a2f62: am
f5af9a4a: am
273c5c3c: am
9ca7a039: resolved conflicts for merge of
e0be42a9 to jb-mr1.1-dev
* commit '
f33a2f62a54ef966375a7fe8706ce713386d843e':
Fix build due to incorrect merges [DO NOT MERGE]
Deepanshu Gupta [Wed, 14 May 2014 00:05:35 +0000 (00:05 +0000)]
Deepanshu Gupta [Wed, 14 May 2014 00:00:08 +0000 (00:00 +0000)]
am
f5af9a4a: am
273c5c3c: am
9ca7a039: resolved conflicts for merge of
e0be42a9 to jb-mr1.1-dev
* commit '
f5af9a4a9a0c0a3bab43235659e3adfa2cebb52f':
Fix build due to incorrect merges [DO NOT MERGE]
Deepanshu Gupta [Wed, 14 May 2014 00:00:05 +0000 (00:00 +0000)]
Deepanshu Gupta [Tue, 13 May 2014 23:55:20 +0000 (23:55 +0000)]
am
273c5c3c: am
9ca7a039: resolved conflicts for merge of
e0be42a9 to jb-mr1.1-dev
* commit '
273c5c3c4c74d29a127e614726ce2e5c5e274c20':
Fix build due to incorrect merges [DO NOT MERGE]
Deepanshu Gupta [Tue, 13 May 2014 23:55:17 +0000 (23:55 +0000)]
Deepanshu Gupta [Tue, 13 May 2014 23:54:21 +0000 (23:54 +0000)]
am
9ca7a039: resolved conflicts for merge of
e0be42a9 to jb-mr1.1-dev
* commit '
9ca7a039f73e5cf84f85282cf05d637517be2a17':
Fix build due to incorrect merges [DO NOT MERGE]
Deepanshu Gupta [Tue, 13 May 2014 23:50:44 +0000 (23:50 +0000)]
Deepanshu Gupta [Tue, 13 May 2014 23:48:31 +0000 (16:48 -0700)]
resolved conflicts for merge of
e0be42a9 to jb-mr1.1-dev
Deepanshu Gupta [Tue, 13 May 2014 23:45:30 +0000 (23:45 +0000)]
Deepanshu Gupta [Tue, 13 May 2014 23:40:37 +0000 (23:40 +0000)]
am
40bfb60e: Fix build due to incorrect merges [DO NOT MERGE]
* commit '
40bfb60efa0e92259a417a5cbfd6095759c678b7':
Fix build due to incorrect merges [DO NOT MERGE]
Deepanshu Gupta [Tue, 13 May 2014 23:40:34 +0000 (23:40 +0000)]
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
Deepanshu Gupta [Tue, 13 May 2014 22:52:39 +0000 (15:52 -0700)]
Fix build due to incorrect merges [DO NOT MERGE]
Change-Id: Ib3b4dafeed6ba4c07450d13d9908fb05a1a4542f
Deepanshu Gupta [Tue, 13 May 2014 22:46:28 +0000 (15:46 -0700)]
Fix build
remove a line that shouldn't have been merged into this branch.
The build will still be broken for this branch, but this will fix it for
many branches downstream.
Change-Id: I2f556636640eb823dc2834afae7b536e79b79607
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
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: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: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]
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: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]