drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
121,544 Commits 1 Branch 0 Tags
Commit Graph

121544 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
Justin Koh
0ade263c28 Merge "If there is only 1 simple global action, autolaunch it" into klp-modular-dev 2014-05-15 17:17:14 +00:00
Baligh Uddin
bd44640c7f Merge "Import translations. DO NOT MERGE" into klp-modular-dev 2014-05-15 14:26:05 +00:00
Dirk Dougherty
d1afa68d03 Remove neg margin in wear css to resolve layout issue. 
Change-Id: I68cc26e55b8bf486a20ec9fa1de48e9caf505165
 2014-05-14 20:23:48 -07:00
Ricardo Cervera
7c05fd850b 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
 2014-05-14 23:53:20 +00:00
Ricardo Cervera
59ab011eeb am 0e286ab1: Merge "docs: Removed outdated troubleshooting guidelines for Android Studio" into klp-docs 
* commit '0e286ab1f0eaeb2bb75c7a76ff8f3d08267e7fc3':
  docs: Removed outdated troubleshooting guidelines for Android Studio
 2014-05-14 23:49:24 +00:00
Ricardo Cervera
0e286ab1f0 Merge "docs: Removed outdated troubleshooting guidelines for Android Studio" into klp-docs 2014-05-14 22:44:57 +00:00
Dirk Dougherty
0f5822847a 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.
 2014-05-14 21:21:23 +00:00
Dirk Dougherty
0540bc373c am a4e6c7d1: am 3506ac87: Doc change: Updated content for distribute. 
* commit 'a4e6c7d1d4e6c8ca2b50f91ae8881fb4838d7955':
  Doc change: Updated content for distribute.
 2014-05-14 21:21:15 +00:00
Dirk Dougherty
980a285b4c 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.
 2014-05-14 21:17:27 +00:00
Dirk Dougherty
a4e6c7d1d4 am 3506ac87: Doc change: Updated content for distribute. 
* commit '3506ac87c09c0748d92ef594c94365a5d7b07262':
  Doc change: Updated content for distribute.
 2014-05-14 21:17:22 +00:00
Dirk Dougherty
5eb99943d5 Merge "update wear reference docs to support sticky nav. DO NOT SUBMIT UNTIL DYNAMIC TEMPLATE IS MERGED." into klp-docs 2014-05-14 21:16:31 +00:00
Dirk Dougherty
3506ac87c0 Doc change: Updated content for distribute. 
Change-Id: I612fbb8e5b7aedd73c0e633e5517bb89375760ed
 2014-05-14 14:10:51 -07:00
Baligh Uddin
aab161cf2c Import translations. DO NOT MERGE 
Change-Id: I443d4950531e7ab7018cb5db1b8316f1b8baaa9e
Auto-generated-cl: translation import
 2014-05-14 10:44:46 -07:00
Justin Koh
1c46c2d784 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
 2014-05-14 17:30:32 +00:00
Joe LaPenna
f3de98a2d0 Log accept and close debug statements in BluetoothSocket. 
Bug: 14902781
Bug: 14784262

Change-Id: Id0c2cd216244e05c218568427bda863a538b1041
 2014-05-13 18:53:11 -07:00
Deepanshu Gupta
80816bfcaf 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]
 2014-05-14 00:31:20 +00:00
Deepanshu Gupta
7dfe1fdac6 am c289ec6b: am 3a559d56: am b5b47565: am 98822f0e: am 6e923e1b: am 90d57721: am 209745a3: am c251147a: am 85ec1445: am f266873c: am 1c55797d: Fix build 
* commit 'c289ec6b465648d7d93e6f2dc9ed28822683f7d6':
  Fix build
 2014-05-14 00:31:15 +00:00
Deepanshu Gupta
f73dbcc378 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]
 2014-05-14 00:26:43 +00:00
Deepanshu Gupta
c289ec6b46 am 3a559d56: am b5b47565: am 98822f0e: am 6e923e1b: am 90d57721: am 209745a3: am c251147a: am 85ec1445: am f266873c: am 1c55797d: Fix build 
* commit '3a559d56a627687d56dc06cc459ef1e7e6b1cd79':
  Fix build
 2014-05-14 00:26:38 +00:00
Deepanshu Gupta
9916c17e66 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]
 2014-05-14 00:21:36 +00:00
Deepanshu Gupta
3a559d56a6 am b5b47565: am 98822f0e: am 6e923e1b: am 90d57721: am 209745a3: am c251147a: am 85ec1445: am f266873c: am 1c55797d: Fix build 
* commit 'b5b4756565a5f74c6eb2ca7f90ac839a4289daae':
  Fix build
 2014-05-14 00:21:33 +00:00
Deepanshu Gupta
472cbad479 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]
 2014-05-14 00:15:28 +00:00
Deepanshu Gupta
b5b4756565 am 98822f0e: am 6e923e1b: am 90d57721: am 209745a3: am c251147a: am 85ec1445: am f266873c: am 1c55797d: Fix build 
* commit '98822f0eba746b4f8c8a622f21c2d32dad08453f':
  Fix build
 2014-05-14 00:15:24 +00:00