OSDN Git Service
Quddus Chong [Wed, 21 May 2014 23:43:25 +0000 (23:43 +0000)]
am
b11a52cb: am
a3c773e8: am
539f9e31: docs: Update the sample Gradle dependency declaration to reflect GMS K version.
* commit '
b11a52cb6f7db5e1b78582649801632b8d32b978':
docs: Update the sample Gradle dependency declaration to reflect GMS K version.
Quddus Chong [Wed, 21 May 2014 23:39:46 +0000 (23:39 +0000)]
am
a3c773e8: am
539f9e31: docs: Update the sample Gradle dependency declaration to reflect GMS K version.
* commit '
a3c773e836dcb97c7f1045c8347dc7267bd21936':
docs: Update the sample Gradle dependency declaration to reflect GMS K version.
Quddus Chong [Wed, 21 May 2014 23:23:33 +0000 (23:23 +0000)]
am
539f9e31: docs: Update the sample Gradle dependency declaration to reflect GMS K version.
* commit '
539f9e31726dc780f26901de06c35a4b2446c37a':
docs: Update the sample Gradle dependency declaration to reflect GMS K version.
Mindy Pereira [Wed, 21 May 2014 22:38:06 +0000 (22:38 +0000)]
am
a718943d: Merge "Make a smaller cliff for dismissing cards" into klp-modular-dev
* commit '
a718943d422876488f8723bfe6f35f352ffcb586':
Make a smaller cliff for dismissing cards
Mindy Pereira [Wed, 21 May 2014 21:54:37 +0000 (21:54 +0000)]
Merge "Make a smaller cliff for dismissing cards" into klp-modular-dev
Quddus Chong [Wed, 21 May 2014 21:34:56 +0000 (14:34 -0700)]
docs: Update the sample Gradle dependency declaration to reflect GMS K version.
Change-Id: I5e5c40974b2fbaf61256d320d24acf5e0e9178d6
Jim Miller [Wed, 21 May 2014 20:43:18 +0000 (20:43 +0000)]
am
af103dd3: am
911176d7: am
607d5998: Fix crash in widget pager - DO NOT MERGE
* commit '
af103dd39346d1bae3566cafbfcd1008bc6cef5c':
Fix crash in widget pager - DO NOT MERGE
Jim Miller [Wed, 21 May 2014 20:39:41 +0000 (20:39 +0000)]
am
911176d7: am
607d5998: Fix crash in widget pager - DO NOT MERGE
* commit '
911176d7e6c8ba28ed7f7be63edcb17456f615fe':
Fix crash in widget pager - DO NOT MERGE
Jim Miller [Wed, 21 May 2014 20:35:51 +0000 (20:35 +0000)]
am
607d5998: Fix crash in widget pager - DO NOT MERGE
* commit '
607d59982a046d23770a7289be6272ad5983d6ae':
Fix crash in widget pager - DO NOT MERGE
narayan [Wed, 21 May 2014 20:22:03 +0000 (20:22 +0000)]
am
ab3d85ab: am
838b1e22: Merge "Fix NPE in PackageManagerService."
* commit '
ab3d85ab1a0ae58add5df6efc30607624475405b':
Fix NPE in PackageManagerService.
narayan [Wed, 21 May 2014 20:17:52 +0000 (20:17 +0000)]
am
838b1e22: Merge "Fix NPE in PackageManagerService."
* commit '
838b1e2215cbc27e77530f4c79124c088353e0e7':
Fix NPE in PackageManagerService.
narayan [Wed, 21 May 2014 20:14:56 +0000 (20:14 +0000)]
Merge "Fix NPE in PackageManagerService."
narayan [Wed, 21 May 2014 19:54:50 +0000 (20:54 +0100)]
Fix NPE in PackageManagerService.
Check that each package from the setting has
a parsed pkg before we attempt to perform dex-opt
on it. If it doesn't have a parsed package, adjust
the ABI in the settings, but don't perform dexopt.
It will be dexopted later if it's still active
based on the setting.
bug:
15081286
Change-Id: Ifb6d1d5efdc9c59b251731972afa951ad930d05c
Vinod Krishnan [Wed, 21 May 2014 17:46:16 +0000 (17:46 +0000)]
am
4f65a545: Merge "Adding more DeviceDefault for CTS tests" into klp-modular-dev
* commit '
4f65a5456159b64185bb99c193bcff93b07770f8':
Adding more DeviceDefault for CTS tests
Vinod Krishnan [Wed, 21 May 2014 17:40:06 +0000 (17:40 +0000)]
Merge "Adding more DeviceDefault for CTS tests" into klp-modular-dev
Vinod Krishnan [Wed, 21 May 2014 17:28:57 +0000 (10:28 -0700)]
Adding more DeviceDefault for CTS tests
Bug:
15091518
Change-Id: Iddabacbd023f031c9c4ec6fd4c4f60ce17b606c4
Dan Sandler [Wed, 21 May 2014 16:26:29 +0000 (16:26 +0000)]
am
7509733c: Elide extras strings from noman dumpsys output.
* commit '
7509733c8dfb4e65dbb45ab582e09d599dfaaa28':
Elide extras strings from noman dumpsys output.
Jeff Sharkey [Wed, 21 May 2014 16:13:18 +0000 (16:13 +0000)]
am
9ef2117f: am
bc06158a: Merge "Check for null in LocalSocketImpl.SocketInputStream.available()"
* commit '
9ef2117f0e65db60cb3f9708174bcaca4db813b2':
Check for null in LocalSocketImpl.SocketInputStream.available()
Jeff Sharkey [Wed, 21 May 2014 16:05:34 +0000 (16:05 +0000)]
am
bc06158a: Merge "Check for null in LocalSocketImpl.SocketInputStream.available()"
* commit '
bc06158a78297747605981702c8e41956ea1aa2d':
Check for null in LocalSocketImpl.SocketInputStream.available()
Jeff Sharkey [Wed, 21 May 2014 16:03:08 +0000 (16:03 +0000)]
Merge "Check for null in LocalSocketImpl.SocketInputStream.available()"
Dan Sandler [Fri, 16 May 2014 02:22:10 +0000 (22:22 -0400)]
Elide extras strings from noman dumpsys output.
Bug:
14292528
Change-Id: I19cfb6b692e6901fa7f115ea675b1b03fc5ba176
(cherry picked from commit
44de3cfc08428378b93172a2b03f9785a3638678)
Baligh Uddin [Wed, 21 May 2014 15:38:26 +0000 (15:38 +0000)]
am
ef2b35cc: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-modular-dev
* commit '
ef2b35cc2e87058ead622bd1858d358690c201fd':
Import translations. DO NOT MERGE
Baligh Uddin [Wed, 21 May 2014 15:34:11 +0000 (15:34 +0000)]
Merge "Import translations. DO NOT MERGE" into klp-modular-dev
Jeff Brown [Wed, 21 May 2014 08:40:39 +0000 (08:40 +0000)]
am
6099fd21: Merge "Fix build." into klp-modular-dev
* commit '
6099fd21e190ffdf8e03ba6d96cce0d53c2765fd':
Fix build.
Jeff Brown [Wed, 21 May 2014 08:40:36 +0000 (08:40 +0000)]
am
9beccf9f: Merge "Defer display ready until brightness ramp completes." into klp-modular-dev
* commit '
9beccf9f9e28f74bd78041e4381b59ce0a2351e7':
Defer display ready until brightness ramp completes.
Jeff Brown [Wed, 21 May 2014 08:40:33 +0000 (08:40 +0000)]
am
6fb904bf: Merge "Make power button behavior configurable." into klp-modular-dev
* commit '
6fb904bfd1f943547d6e5bc6f199ffec2290da01':
Make power button behavior configurable.
Brian Carlstrom [Wed, 21 May 2014 08:27:03 +0000 (08:27 +0000)]
am
e77a77d0: am
ec71fed0: Merge "Improve ABI handling for shared user ids."
* commit '
e77a77d081ff9d05100702f5880f356da27fd087':
Improve ABI handling for shared user ids.
Brian Carlstrom [Wed, 21 May 2014 06:46:26 +0000 (06:46 +0000)]
am
ec71fed0: Merge "Improve ABI handling for shared user ids."
* commit '
ec71fed089965c4d731eaa90344849a1775f937a':
Improve ABI handling for shared user ids.
Brian Carlstrom [Wed, 21 May 2014 06:01:06 +0000 (06:01 +0000)]
Merge "Improve ABI handling for shared user ids."
Jeff Brown [Wed, 21 May 2014 05:17:31 +0000 (05:17 +0000)]
Merge "Fix build." into klp-modular-dev
Jeff Brown [Wed, 21 May 2014 05:16:25 +0000 (22:16 -0700)]
Fix build.
Change-Id: I00f040ab16cf8a3b7a995b4626d49e70b97fb294
Jeff Brown [Wed, 21 May 2014 05:09:15 +0000 (05:09 +0000)]
Merge "Defer display ready until brightness ramp completes." into klp-modular-dev
Jeff Brown [Wed, 21 May 2014 05:02:46 +0000 (22:02 -0700)]
Defer display ready until brightness ramp completes.
Bug:
14494096
Change-Id: I6da6fffbbce2c7058170e5c6139eae4cb5a06d88
Jeff Brown [Wed, 21 May 2014 04:28:34 +0000 (04:28 +0000)]
Merge "Make power button behavior configurable." into klp-modular-dev
Jeff Brown [Wed, 21 May 2014 04:24:38 +0000 (21:24 -0700)]
Make power button behavior configurable.
Allow power button to be used to either go to sleep as usual,
which may doze, or skip that completely and really go to sleep.
May also really go to sleep and go home all at once.
Bug:
14406056
Change-Id: Ia19e2551b9c2a72271bb2eddd5c0d1749761e019
Griff Hazen [Wed, 21 May 2014 02:44:16 +0000 (02:44 +0000)]
am
ef6aae62: Merge "Fixes to WearableActionExtensions" into klp-modular-dev
* commit '
ef6aae62f6c92bc9413db60c28cc4b3230f4d2fa':
Fixes to WearableActionExtensions
Griff Hazen [Wed, 21 May 2014 02:41:01 +0000 (02:41 +0000)]
Merge "Fixes to WearableActionExtensions" into klp-modular-dev
Jeff Brown [Wed, 21 May 2014 02:38:11 +0000 (02:38 +0000)]
am
2d9b513d: Merge "I\'m feeling the good vibrations." into klp-modular-dev
* commit '
2d9b513dab78242281bca125b4abc6b8235089a6':
I'm feeling the good vibrations.
Jeff Brown [Wed, 21 May 2014 02:38:07 +0000 (02:38 +0000)]
am
0702786d: Merge "Allow display timeouts to be set in config.xml." into klp-modular-dev
* commit '
0702786d81eb9f9bf47c3a0827d3f2824c3f4228':
Allow display timeouts to be set in config.xml.
Jeff Brown [Wed, 21 May 2014 02:35:09 +0000 (02:35 +0000)]
Merge "I'm feeling the good vibrations." into klp-modular-dev
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
Jeff Brown [Wed, 21 May 2014 02:29:29 +0000 (19:29 -0700)]
I'm feeling the good vibrations.
When the device enters a non-interactive state, we normally
cancel all active vibrations as a safety precaution. However if
the system is performing haptic feedback then we want to allow
it to run to completion.
Bug:
14319563
Change-Id: I673781bbf32562e45c1595689e6b423bd178ea73
Dirk Dougherty [Wed, 21 May 2014 02:29:04 +0000 (02:29 +0000)]
am
f7963fab: am
c1bb79d9: am
bb0b8449: Remove monetization image in edu guidelines.
* commit '
f7963fab0decb70b72b848fe3d7a14c5ed54ff95':
Remove monetization image in edu guidelines.
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
Griff Hazen [Wed, 21 May 2014 01:46:16 +0000 (18:46 -0700)]
Fixes to WearableActionExtensions
* Add missing parcelable creator.
* Review fixes.
* Minor doc fixes.
* Kill SIZE_FULLSCREEN
Change-Id: Iaf6458fdd3482202aa416ebaf2302f79cb48635e
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 23:21:01 +0000 (23:21 +0000)]
am
7ea18e1c: Add wearable notification extensions to frameworks/base.
* commit '
7ea18e1c92ab84d1a0d00087e6e3784646661fe8':
Add wearable notification extensions to frameworks/base.
Griff Hazen [Tue, 20 May 2014 20:50:06 +0000 (13:50 -0700)]
Add wearable notification extensions to frameworks/base.
Change-Id: Ic312cec7dc11e637002ff2be3975940a93a6babf
Jeff Brown [Tue, 20 May 2014 20:44:21 +0000 (20:44 +0000)]
am
b0a7f84b: am
63bf04d8: Merge "Fix NullException in QwertyKeyListener.KeyDown"
* commit '
b0a7f84b6de20edc6337163a4a07e3c524991ddb':
Fix NullException in QwertyKeyListener.KeyDown
Jeff Brown [Tue, 20 May 2014 20:40:20 +0000 (20:40 +0000)]
am
63bf04d8: Merge "Fix NullException in QwertyKeyListener.KeyDown"
* commit '
63bf04d88bcc00876c30c9f2848da8c44b42185b':
Fix NullException in QwertyKeyListener.KeyDown
Jeff Brown [Tue, 20 May 2014 20:37:44 +0000 (20:37 +0000)]
Merge "Fix NullException in QwertyKeyListener.KeyDown"
Griff Hazen [Tue, 20 May 2014 20:07:32 +0000 (20:07 +0000)]
am
9e1379f1: Fix sdk docs build for framework from remote input api addition.
* commit '
9e1379f1126c1101f69445572bd441b2211791fa':
Fix sdk docs build for framework from remote input api addition.
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 18:41:46 +0000 (18:41 +0000)]
am
5cadc3b0: Add RemoteInput, Grouping, and Extender to Notification api.
* commit '
5cadc3b00aa775a63518383046c902b130e09b4c':
Add RemoteInput, Grouping, and Extender to Notification api.
Mindy Pereira [Tue, 20 May 2014 17:19:03 +0000 (10:19 -0700)]
Make a smaller cliff for dismissing cards
Fixes b/
14997474 swipe to dismiss cliff guard may be too big
Change-Id: I3e681f1c6dc3eaac37a0e840b36f4c7041e86e62
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
Baligh Uddin [Tue, 20 May 2014 15:27:22 +0000 (08:27 -0700)]
Import translations. DO NOT MERGE
Change-Id: I813af1cbb2db0674a3cf81649f0d130ebb2d6164
Auto-generated-cl: translation import
Narayan Kamath [Tue, 20 May 2014 12:55:09 +0000 (13:55 +0100)]
Improve ABI handling for shared user ids.
The key improvement is that we need to keep track of
the package that's currently being scanned (this includes
new installs and upgrades of existing packages) and treat
it specially. If we didn't do that, In the case of upgrades
we would perform the shared UID calculation based on the ABI
of the old package, and not the current package.
This change also allows us to perform the CPU ABI calculation
before dexopt, which saves us from having to do it twice and
fixes a bug where we were using the wrong package path to
dexopt a package.
This also has the side effect of fixing
15081286.
bug:
15081286
Change-Id: I20f8ad36941fc3df29007f0e83ce82f38f3585c8
Ben Murdoch [Tue, 20 May 2014 09:39:05 +0000 (09:39 +0000)]
am
e0d6a6b0: Merge "Add PackagManager flag for WebView system feature." into klp-modular-dev
* commit '
e0d6a6b05b0861a5aa6dd8189de61a4da8d39dae':
Add PackagManager flag for WebView system feature.
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
Michael Wright [Tue, 20 May 2014 09:28:40 +0000 (09:28 +0000)]
am
889814ce: resolved conflicts for merge of
32912e0a to stage-aosp-master
* commit '
889814cee0ebcf70069d04d3ae77c97c09efb5a1':
wallpaper: limit wallpaper width to sys.max_texture_size
Guang Zhu [Tue, 20 May 2014 09:26:18 +0000 (09:26 +0000)]
am
6071e45a: Merge "add a command to list all bonded devices" into klp-modular-dev
* commit '
6071e45a64ab764eb86603f2f4496cfd5c8de708':
add a command to list all bonded devices
Michael Wright [Tue, 20 May 2014 05:42:58 +0000 (22:42 -0700)]
resolved conflicts for merge of
32912e0a to stage-aosp-master
Change-Id: I140e2024bd0e6e81ab550718103d45220d8bde26
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
Michael Wright [Tue, 20 May 2014 04:04:00 +0000 (04:04 +0000)]
Merge "wallpaper: limit wallpaper width to sys.max_texture_size"
Donghan Ryu [Tue, 15 Nov 2011 02:56:11 +0000 (18:56 -0800)]
wallpaper: limit wallpaper width to sys.max_texture_size
Image wallpapers are created ~1.5x screen size. On some devices this
may exceed the maximum supported texture size, which will either fail
allocation or fail to composite.
Bug 991597
Change-Id: I9948b09f6e00a724212e73d36901f2bbea42e2f4
quddusc [Mon, 19 May 2014 21:03:02 +0000 (21:03 +0000)]
am
9e58b46b: 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 '
9e58b46b566e2b1963ea1e42a9696a32784859f4':
docs: Updated Google Play Services highlights and landing pages for Kenafa (Google Play Services v4.4).
Quddus Chong [Mon, 19 May 2014 21:02:57 +0000 (21:02 +0000)]
am
4b2b91d4: am
47064793: am
f4b64495: Merge "docs: Updated Javadoc for GMS Kenafa release." into klp-docs
* commit '
4b2b91d47c1430f3c69893466cf2b8b025876888':
docs: Updated Javadoc for GMS Kenafa release.
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:40:51 +0000 (20:40 +0000)]
am
6a7843c9: Merge "Override windowContentOverlay and windowBackground for Theme.Micro.*" into klp-modular-dev
* commit '
6a7843c972122bd90819fe991cb463088f19be0a':
Override windowContentOverlay and windowBackground for Theme.Micro.*
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
Chris Craik [Mon, 19 May 2014 19:32:38 +0000 (19:32 +0000)]
am
00fabcbe: am
b1708e9b: Merge "Use alpha channel instead of red in drawCachedGlyphBitmap"
* commit '
00fabcbeb035fb513293ea01d245002f40b3234f':
Use alpha channel instead of red in drawCachedGlyphBitmap
Chris Craik [Mon, 19 May 2014 19:27:52 +0000 (19:27 +0000)]
am
b1708e9b: Merge "Use alpha channel instead of red in drawCachedGlyphBitmap"
* commit '
b1708e9b764268a06d91219a5c39ee9efd32ab00':
Use alpha channel instead of red in drawCachedGlyphBitmap
Chris Craik [Mon, 19 May 2014 19:23:07 +0000 (19:23 +0000)]
Merge "Use alpha channel instead of red in drawCachedGlyphBitmap"
Mark Renouf [Mon, 19 May 2014 17:40:17 +0000 (13:40 -0400)]
Override windowContentOverlay and windowBackground for Theme.Micro.*
Change-Id: Iab40fb70398ad2ce87b613aa9278cb87f7a35d84
Michael Wright [Mon, 19 May 2014 18:23:50 +0000 (18:23 +0000)]
am
7099995b: am
a84d24c3: Merge "Extend support for nordic languages with Sami"
* commit '
7099995be5bfadcb03973d4ae952fd345bae264b':
Extend support for nordic languages with Sami
Michael Wright [Mon, 19 May 2014 18:19:20 +0000 (18:19 +0000)]
am
a84d24c3: Merge "Extend support for nordic languages with Sami"
* commit '
a84d24c37a3e27cdd4f50807e9dc5fb6f14ea009':
Extend support for nordic languages with Sami
Michael Wright [Mon, 19 May 2014 18:15:38 +0000 (18:15 +0000)]
Merge "Extend support for nordic languages with Sami"
Dirk Dougherty [Mon, 19 May 2014 18:12:40 +0000 (18:12 +0000)]
am
94fb0454: am
4d37d7ef: am
c385b1e4: Merge "Remove neg margin in wear css to resolve layout issue." into klp-docs
* commit '
94fb04547ca35c09409cfc6e3b930805acddc7d6':
Remove neg margin in wear css to resolve layout issue.
Scott Rowe [Mon, 19 May 2014 18:12:37 +0000 (18:12 +0000)]
am
3d55247a: am
a0144782: am
6d05170a: docs: b/
14510382 ISO language code, add link
* commit '
3d55247a3f8e488b13f7f467cbc70ac4864d2dd2':
docs: b/
14510382 ISO language code, add link
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:59:48 +0000 (17:59 +0000)]
am
e5c9d855: Merge "docs: updates for changes to notification APIs" into klp-modular-dev
* commit '
e5c9d8551b22c1708723b89e8e8d6f830168f292':
docs: updates for changes to notification APIs
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
Narayan Kamath [Mon, 19 May 2014 13:33:19 +0000 (13:33 +0000)]
am
deda5467: am
a4fd1baa: Merge "Fail if we\'re unable to agree on an ISA for shared UIDs."
* commit '
deda5467f44fc4a03c3435f0c6d7bda4ea298b99':
Fail if we're unable to agree on an ISA for shared UIDs.
Narayan Kamath [Mon, 19 May 2014 13:29:57 +0000 (13:29 +0000)]
am
a4fd1baa: Merge "Fail if we\'re unable to agree on an ISA for shared UIDs."
* commit '
a4fd1baac68dcd73957e0fca0c02089ecf9a268a':
Fail if we're unable to agree on an ISA for shared UIDs.
Narayan Kamath [Mon, 19 May 2014 13:26:44 +0000 (13:26 +0000)]
Merge "Fail if we're unable to agree on an ISA for shared UIDs."
Narayan Kamath [Thu, 15 May 2014 14:01:46 +0000 (15:01 +0100)]
Fail if we're unable to agree on an ISA for shared UIDs.
It's not worth the complexity of rescanning the APK and
extracting a shared library with a different ABI.
Also gets rid of an unnecessary command line argument and
checks for dex-opt failures while adjusting shared ABIs.
bug:
14453227
Change-Id: I6a0695e24cba37e93540c540507088e95b89089b
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