summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Fix sdk docs build for framework from remote input api addition.Griff Hazen2014-05-202-2/+2
| | | | Change-Id: I6a6f3df06d924fe72f67466d67d9feced8d8719f
* Add RemoteInput, Grouping, and Extender to Notification api.Griff Hazen2014-05-203-14/+547
| | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* Merge "Add PackagManager flag for WebView system feature." into klp-modular-devBen Murdoch2014-05-202-0/+9
|\
| * Add PackagManager flag for WebView system feature.Ben Murdoch2014-05-192-0/+9
| | | | | | | | | | | | | | | | | | Add a flag for PackageManager.hasSystemFeature to determine if a functional webview is available on the device. Bug: 13438487 Change-Id: I770f7e924b3e5fa6be0397904acf18c9306096e4
* | Merge "add a command to list all bonded devices" into klp-modular-devGuang Zhu2014-05-201-0/+14
|\ \
| * | add a command to list all bonded devicesGuang Zhu2014-05-191-0/+14
| | | | | | | | | | | | | | | | | | Bug: 14601515 Change-Id: I3cc5bb664485ef768bb81f1f8870ed9bf62f8329
* | | am f269e732: am 728dbf8c: Merge "docs: Updated Google Play Services ↵quddusc2014-05-193-15/+89
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | 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).
| * \ \ am 728dbf8c: Merge "docs: Updated Google Play Services highlights and ↵quddusc2014-05-193-15/+89
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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).
| | * \ \ Merge "docs: Updated Google Play Services highlights and landing pages for ↵quddusc2014-05-193-15/+89
| | |\ \ \ | | | | | | | | | | | | | | | | | | Kenafa (Google Play Services v4.4)." into klp-docs
| | | * | | docs: Updated Google Play Services highlights and landing pages for Kenafa ↵quddusc2014-05-093-15/+89
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | (Google Play Services v4.4). Change-Id: Ibc5000dfa5509cb1448fa867eb87d4e19c31ff1f
* | | | | | am 47064793: am f4b64495: Merge "docs: Updated Javadoc for GMS Kenafa ↵Quddus Chong2014-05-19483-68229/+177637
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | release." into klp-docs * commit '4706479326789b4b20cc370cdb28c7a0b4f09646': docs: Updated Javadoc for GMS Kenafa release.
| * | | | | am f4b64495: Merge "docs: Updated Javadoc for GMS Kenafa release." into klp-docsQuddus Chong2014-05-19483-68229/+177637
| |\ \ \ \ \ | | |/ / / / | | | | | | | | | | | | | | | | | | * commit 'f4b6449515f212642e90e435b2a3a55766a41f9e': docs: Updated Javadoc for GMS Kenafa release.
| | * | | | Merge "docs: Updated Javadoc for GMS Kenafa release." into klp-docsQuddus Chong2014-05-19483-68229/+177637
| | |\ \ \ \
| | | * | | | docs: Updated Javadoc for GMS Kenafa release.Quddus Chong2014-05-16483-68229/+177637
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Id3b7853282e317c85d58a7d84657e59a0159961d
* | | | | | | Merge "Override windowContentOverlay and windowBackground for Theme.Micro.*" ↵Mark Renouf2014-05-191-0/+4
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | into klp-modular-dev
| * | | | | | | Override windowContentOverlay and windowBackground for Theme.Micro.*Mark Renouf2014-05-191-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Iab40fb70398ad2ce87b613aa9278cb87f7a35d84
* | | | | | | | am 4d37d7ef: am c385b1e4: Merge "Remove neg margin in wear css to resolve ↵Dirk Dougherty2014-05-191-1/+1
|\ \ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | layout issue." into klp-docs * commit '4d37d7ef141beaf8f7d1b2bf1c19e3fb8c84203f': Remove neg margin in wear css to resolve layout issue.
| * | | | | | | am c385b1e4: Merge "Remove neg margin in wear css to resolve layout issue." ↵Dirk Dougherty2014-05-191-1/+1
| |\ \ \ \ \ \ \ | | | |/ / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into klp-docs * commit 'c385b1e4be928133930d9264a92c98f4747adedb': Remove neg margin in wear css to resolve layout issue.
| | * | | | | | Merge "Remove neg margin in wear css to resolve layout issue." into klp-docsDirk Dougherty2014-05-191-1/+1
| | |\ \ \ \ \ \
| | | * | | | | | Remove neg margin in wear css to resolve layout issue.Dirk Dougherty2014-05-141-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I68cc26e55b8bf486a20ec9fa1de48e9caf505165
* | | | | | | | | am a0144782: am 6d05170a: docs: b/14510382 ISO language code, add linkScott Rowe2014-05-191-2/+3
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / | | | | / / / / / | |_|_|/ / / / / |/| | | | | | | * commit 'a0144782b16b5b6a767a0c48fa5c3a79a5c74889': docs: b/14510382 ISO language code, add link
| * | | | | | | am 6d05170a: docs: b/14510382 ISO language code, add linkScott Rowe2014-05-191-2/+3
| |\ \ \ \ \ \ \ | | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | * commit '6d05170a55ac6a9401e6089ba49d675857c3c25d': docs: b/14510382 ISO language code, add link
| | * | | | | | docs: b/14510382 ISO language code, add linkScott Rowe2014-05-161-2/+3
| | |/ / / / / | | | | | | | | | | | | | | Change-Id: Id78858743b453d9e44624f491db183d9a099a1ce
* | | | | | | Merge "docs: updates for changes to notification APIs" into klp-modular-devRobert Ly2014-05-194-108/+162
|\ \ \ \ \ \ \ | |_|_|_|_|_|/ |/| | | | | |
| * | | | | | docs: updates for changes to notification APIsRobert Ly2014-05-164-108/+162
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I8a016b0693e928eb864065bea1079be824987340
* | | | | | | Merge "Fallback to NullWebView when Chromium WebView not present." into ↵Ben Murdoch2014-05-191-1/+9
|\ \ \ \ \ \ \ | |_|_|_|_|_|/ |/| | | | | | | | | | | | | klp-modular-dev
| * | | | | | Fallback to NullWebView when Chromium WebView not present.Ben Murdoch2014-05-161-1/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If it's not possible to load the Chromium WebView, fallback to loading the NullWebView that will throw UnsupportedOperationException. Bug: 13438487 Change-Id: If44b8b7a569c2f8e0e8bba7e6953288802d1c9e0
* | | | | | | Merge "Log accept and close debug statements in BluetoothSocket." into ↵Joe LaPenna2014-05-171-11/+11
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | klp-modular-dev
| * | | | | | | Log accept and close debug statements in BluetoothSocket.Joe LaPenna2014-05-131-11/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 14902781 Bug: 14784262 Change-Id: Id0c2cd216244e05c218568427bda863a538b1041
* | | | | | | | Fix Notification sdk docs build.Griff Hazen2014-05-161-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | | | | | Add support for extendable actions to Notification.Griff Hazen2014-05-152-19/+135
| |/ / / / / / |/| | | | | | | | | | | | | | | | | | | | Change-Id: I2945a6994a28fc454af3f84e75c96d7619547f01
* | | | | | | Merge "If there is only 1 simple global action, autolaunch it" into ↵Justin Koh2014-05-152-8/+14
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | klp-modular-dev
| * | | | | | | If there is only 1 simple global action, autolaunch itJustin Koh2014-05-142-8/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Requested by UX. Also made settings available before provisioning Bug: 14683740 Bug: 14886954 Change-Id: If62ccc6472a72b7adb4d309ee89e51069f8e0413
* | | | | | | | Merge "Import translations. DO NOT MERGE" into klp-modular-devBaligh Uddin2014-05-151-1/+1
|\ \ \ \ \ \ \ \
| * | | | | | | | Import translations. DO NOT MERGEBaligh Uddin2014-05-141-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I443d4950531e7ab7018cb5db1b8316f1b8baaa9e Auto-generated-cl: translation import
* | | | | | | | | am 59ab011e: am 0e286ab1: Merge "docs: Removed outdated troubleshooting ↵Ricardo Cervera2014-05-143-66/+2
|\ \ \ \ \ \ \ \ \ | | |_|_|_|/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | guidelines for Android Studio" into klp-docs * commit '59ab011eebc5deb008ae62c0fe353d6d0aac8ab8': docs: Removed outdated troubleshooting guidelines for Android Studio
| * | | | | | | | am 0e286ab1: Merge "docs: Removed outdated troubleshooting guidelines for ↵Ricardo Cervera2014-05-143-66/+2
| |\ \ \ \ \ \ \ \ | | | |_|_|_|/ / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Android Studio" into klp-docs * commit '0e286ab1f0eaeb2bb75c7a76ff8f3d08267e7fc3': docs: Removed outdated troubleshooting guidelines for Android Studio
| | * | | | | | | Merge "docs: Removed outdated troubleshooting guidelines for Android Studio" ↵Ricardo Cervera2014-05-143-66/+2
| | |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into klp-docs
| | | * | | | | | | docs: Removed outdated troubleshooting guidelines for Android StudioRicardo Cervera2014-05-013-66/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ic06f9febbeae0e253c2aed50091612436a93921e
* | | | | | | | | | am 980a285b: am 5eb99943: Merge "update wear reference docs to support ↵Dirk Dougherty2014-05-148-414/+543
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
| * | | | | | | | | am 5eb99943: Merge "update wear reference docs to support sticky nav. DO NOT ↵Dirk Dougherty2014-05-148-414/+543
| |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
| | * | | | | | | | Merge "update wear reference docs to support sticky nav. DO NOT SUBMIT UNTIL ↵Dirk Dougherty2014-05-148-414/+543
| | |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | DYNAMIC TEMPLATE IS MERGED." into klp-docs
| | | * | | | | | | | update wear reference docs to support sticky nav.Scott Main2014-05-138-414/+543
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | DO NOT SUBMIT UNTIL DYNAMIC TEMPLATE IS MERGED. Change-Id: I829cd96ae0f36a31155adf8e80b6d965e9531c42
* | | | | | | | | | | am a4e6c7d1: am 3506ac87: Doc change: Updated content for distribute.Dirk Dougherty2014-05-14307-6280/+12099
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / | | | | | / / / / / / | |_|_|_|/ / / / / / |/| | | | | | | | | * commit 'a4e6c7d1d4e6c8ca2b50f91ae8881fb4838d7955': Doc change: Updated content for distribute.
| * | | | | | | | | am 3506ac87: Doc change: Updated content for distribute.Dirk Dougherty2014-05-14307-6280/+12099
| |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '3506ac87c09c0748d92ef594c94365a5d7b07262': Doc change: Updated content for distribute.
| | * | | | | | | | Doc change: Updated content for distribute.Dirk Dougherty2014-05-14307-6280/+12099
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I612fbb8e5b7aedd73c0e633e5517bb89375760ed
* | | | | | | | | | am f73dbcc3: am 9916c17e: am 472cbad4: am f57871f7: am 888dad0d: am ↵Deepanshu Gupta2014-05-140-0/+0
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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]
| * | | | | | | | | am 9916c17e: am 472cbad4: am f57871f7: am 888dad0d: am f33a2f62: am ↵Deepanshu Gupta2014-05-140-0/+0
| |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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]
| | * \ \ \ \ \ \ \ \ am 472cbad4: am f57871f7: am 888dad0d: am f33a2f62: am f5af9a4a: am ↵Deepanshu Gupta2014-05-140-0/+0
| | |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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]
| | | * \ \ \ \ \ \ \ \ am f57871f7: am 888dad0d: am f33a2f62: am f5af9a4a: am 273c5c3c: am ↵Deepanshu Gupta2014-05-140-0/+0
| | | |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 9ca7a039: resolved conflicts for merge of e0be42a9 to jb-mr1.1-dev * commit 'f57871f799300614d37e93e376f9381fd01c2bcb': Fix build due to incorrect merges [DO NOT MERGE]