Baligh Uddin
7399ffccc8
Import translations. DO NOT MERGE
...
Change-Id: If6387f104f7761afe32026d821f927c15729ee76
Auto-generated-cl: translation import
2014-05-21 13:21:04 -07:00
Vinod Krishnan
4f65a54561
Merge "Adding more DeviceDefault for CTS tests" into klp-modular-dev
2014-05-21 17:40:06 +00:00
Vinod Krishnan
9b8e4d01f6
Adding more DeviceDefault for CTS tests
...
Bug: 15091518
Change-Id: Iddabacbd023f031c9c4ec6fd4c4f60ce17b606c4
2014-05-21 10:28:57 -07:00
Dan Sandler
7509733c8d
Elide extras strings from noman dumpsys output.
...
Bug: 14292528
Change-Id: I19cfb6b692e6901fa7f115ea675b1b03fc5ba176
(cherry picked from commit 44de3cfc08428378b93172a2b03f9785a3638678)
2014-05-21 15:57:10 +00:00
Baligh Uddin
ef2b35cc2e
Merge "Import translations. DO NOT MERGE" into klp-modular-dev
2014-05-21 15:34:11 +00:00
Jeff Brown
6099fd21e1
Merge "Fix build." into klp-modular-dev
2014-05-21 05:17:31 +00:00
Jeff Brown
61116acdc6
Fix build.
...
Change-Id: I00f040ab16cf8a3b7a995b4626d49e70b97fb294
2014-05-20 22:16:25 -07:00
Jeff Brown
9beccf9f9e
Merge "Defer display ready until brightness ramp completes." into klp-modular-dev
2014-05-21 05:09:15 +00:00
Jeff Brown
4255869ac0
Defer display ready until brightness ramp completes.
...
Bug: 14494096
Change-Id: I6da6fffbbce2c7058170e5c6139eae4cb5a06d88
2014-05-20 22:02:46 -07:00
Jeff Brown
6fb904bfd1
Merge "Make power button behavior configurable." into klp-modular-dev
2014-05-21 04:28:34 +00:00
Jeff Brown
6d8fd27e51
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
2014-05-20 21:24:38 -07:00
Griff Hazen
ef6aae62f6
Merge "Fixes to WearableActionExtensions" into klp-modular-dev
2014-05-21 02:41:02 +00:00
Jeff Brown
2d9b513dab
Merge "I'm feeling the good vibrations." into klp-modular-dev
2014-05-21 02:35:09 +00:00
Jeff Brown
0702786d81
Merge "Allow display timeouts to be set in config.xml." into klp-modular-dev
2014-05-21 02:34:25 +00:00
Jeff Brown
969579bb9d
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
2014-05-20 19:29:29 -07:00
Dirk Dougherty
f7963fab0d
am c1bb79d9: am bb0b8449: Remove monetization image in edu guidelines.
...
* commit 'c1bb79d966c5fee256a349d8902c7abd362ddc39':
Remove monetization image in edu guidelines.
2014-05-21 02:25:09 +00:00
Dirk Dougherty
c1bb79d966
am bb0b8449: Remove monetization image in edu guidelines.
...
* commit 'bb0b8449f80338a35768c9264e9c1e5eae54c7fa':
Remove monetization image in edu guidelines.
2014-05-21 02:20:16 +00:00
Dirk Dougherty
bb0b8449f8
Remove monetization image in edu guidelines.
...
Change-Id: I2cea7a3507eda30ab185560304d64fc455ba19f7
2014-05-20 19:10:26 -07:00
Griff Hazen
4ae73202c3
Fixes to WearableActionExtensions
...
* Add missing parcelable creator.
* Review fixes.
* Minor doc fixes.
* Kill SIZE_FULLSCREEN
Change-Id: Iaf6458fdd3482202aa416ebaf2302f79cb48635e
2014-05-20 18:46:16 -07:00
Jeff Brown
27736f5c0a
Allow display timeouts to be set in config.xml.
...
Bug: 13671523
Change-Id: I79fc21999bc62743178d2d22071455a0c11070c9
2014-05-20 17:17:10 -07:00
Griff Hazen
7ea18e1c92
Add wearable notification extensions to frameworks/base.
...
Change-Id: Ic312cec7dc11e637002ff2be3975940a93a6babf
2014-05-20 13:50:06 -07:00
Griff Hazen
9e1379f112
Fix sdk docs build for framework from remote input api addition.
...
Change-Id: I6a6f3df06d924fe72f67466d67d9feced8d8719f
2014-05-20 12:51:29 -07:00
Griff Hazen
5cadc3b00a
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
2014-05-20 09:55:39 -07:00
Baligh Uddin
e5762bc2b4
Import translations. DO NOT MERGE
...
Change-Id: I813af1cbb2db0674a3cf81649f0d130ebb2d6164
Auto-generated-cl: translation import
2014-05-20 08:27:22 -07:00
Ben Murdoch
e0d6a6b05b
Merge "Add PackagManager flag for WebView system feature." into klp-modular-dev
2014-05-20 09:32:43 +00:00
Guang Zhu
6071e45a64
Merge "add a command to list all bonded devices" into klp-modular-dev
2014-05-20 04:36:48 +00:00
Guang Zhu
d22b2413b9
add a command to list all bonded devices
...
Bug: 14601515
Change-Id: I3cc5bb664485ef768bb81f1f8870ed9bf62f8329
2014-05-19 21:36:10 -07:00
quddusc
9e58b46b56
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).
2014-05-19 20:58:49 +00:00
Quddus Chong
4b2b91d47c
am 47064793: am f4b64495: Merge "docs: Updated Javadoc for GMS Kenafa release." into klp-docs
...
* commit '4706479326789b4b20cc370cdb28c7a0b4f09646':
docs: Updated Javadoc for GMS Kenafa release.
2014-05-19 20:58:41 +00:00
quddusc
f269e732bf
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).
2014-05-19 20:55:35 +00:00
Quddus Chong
4706479326
am f4b64495: Merge "docs: Updated Javadoc for GMS Kenafa release." into klp-docs
...
* commit 'f4b6449515f212642e90e435b2a3a55766a41f9e':
docs: Updated Javadoc for GMS Kenafa release.
2014-05-19 20:55:31 +00:00
quddusc
728dbf8cc8
Merge "docs: Updated Google Play Services highlights and landing pages for Kenafa (Google Play Services v4.4)." into klp-docs
2014-05-19 20:52:05 +00:00
Quddus Chong
f4b6449515
Merge "docs: Updated Javadoc for GMS Kenafa release." into klp-docs
2014-05-19 20:51:39 +00:00
Mark Renouf
6a7843c972
Merge "Override windowContentOverlay and windowBackground for Theme.Micro.*" into klp-modular-dev
2014-05-19 20:36:40 +00:00
Mark Renouf
facdea7f69
Override windowContentOverlay and windowBackground for Theme.Micro.*
...
Change-Id: Iab40fb70398ad2ce87b613aa9278cb87f7a35d84
2014-05-19 15:10:05 -04:00
Dirk Dougherty
94fb04547c
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.
2014-05-19 18:08:53 +00:00
Scott Rowe
3d55247a3f
am a0144782: am 6d05170a: docs: b/14510382 ISO language code, add link
...
* commit 'a0144782b16b5b6a767a0c48fa5c3a79a5c74889':
docs: b/14510382 ISO language code, add link
2014-05-19 18:08:45 +00:00
Robert Ly
e5c9d8551b
Merge "docs: updates for changes to notification APIs" into klp-modular-dev
2014-05-19 17:56:18 +00:00
Dirk Dougherty
4d37d7ef14
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.
2014-05-19 17:27:41 +00:00
Dirk Dougherty
c385b1e4be
Merge "Remove neg margin in wear css to resolve layout issue." into klp-docs
2014-05-19 17:23:33 +00:00
Scott Rowe
a0144782b1
am 6d05170a: docs: b/14510382 ISO language code, add link
...
* commit '6d05170a55ac6a9401e6089ba49d675857c3c25d':
docs: b/14510382 ISO language code, add link
2014-05-19 17:04:53 +00:00
Ben Murdoch
422c7a5834
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
2014-05-19 12:46:41 +01:00
Ben Murdoch
3011fc1aa7
Merge "Fallback to NullWebView when Chromium WebView not present." into klp-modular-dev
2014-05-19 11:26:33 +00:00
Robert Ly
6cf59a3edb
docs: updates for changes to notification APIs
...
Change-Id: I8a016b0693e928eb864065bea1079be824987340
2014-05-16 21:10:52 -07:00
Joe LaPenna
45734b4ae1
Merge "Log accept and close debug statements in BluetoothSocket." into klp-modular-dev
2014-05-17 01:55:06 +00:00
Scott Rowe
6d05170a55
docs: b/14510382 ISO language code, add link
...
Change-Id: Id78858743b453d9e44624f491db183d9a099a1ce
2014-05-16 22:33:12 +00:00
Quddus Chong
26ca3fa77b
docs: Updated Javadoc for GMS Kenafa release.
...
Change-Id: Id3b7853282e317c85d58a7d84657e59a0159961d
2014-05-16 14:39:08 -07:00
Griff Hazen
50c11659f0
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
2014-05-16 09:46:31 -07:00
Ben Murdoch
0e04bcfbdc
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
2014-05-16 13:41:12 +01:00
Griff Hazen
959591e3ba
Add support for extendable actions to Notification.
...
Change-Id: I2945a6994a28fc454af3f84e75c96d7619547f01
2014-05-15 22:26:18 -07:00