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

121623 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jim Miller
607d59982a Fix crash in widget pager - DO NOT MERGE 
Fixes bug 14299491

Change-Id: I3c94cbd7f7923dc5a429c9929bc432a5dd29d04f
 2014-05-16 22:18:49 +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
Deepanshu Gupta
f57871f799 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]
 2014-05-14 00:11:08 +00:00
Deepanshu Gupta
98822f0eba am 6e923e1b: am 90d57721: am 209745a3: am c251147a: am 85ec1445: am f266873c: am 1c55797d: Fix build 
* commit '6e923e1b51c87e7b20a98dfc2fff52ca9115c9d4':
  Fix build
 2014-05-14 00:11:06 +00:00
Deepanshu Gupta
888dad0df7 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]
 2014-05-14 00:05:38 +00:00
Deepanshu Gupta
6e923e1b51 am 90d57721: am 209745a3: am c251147a: am 85ec1445: am f266873c: am 1c55797d: Fix build 
* commit '90d57721692e45fe6259136296e3cd5b669443fc':
  Fix build
 2014-05-14 00:05:35 +00:00
Deepanshu Gupta
f33a2f62a5 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]
 2014-05-14 00:00:08 +00:00
Deepanshu Gupta
90d5772169 am 209745a3: am c251147a: am 85ec1445: am f266873c: am 1c55797d: Fix build 
* commit '209745a32f0a68584aba57acf7c8d1de633b1cda':
  Fix build
 2014-05-14 00:00:05 +00:00
Deepanshu Gupta
f5af9a4a9a 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]
 2014-05-13 23:55:20 +00:00
Deepanshu Gupta
209745a32f am c251147a: am 85ec1445: am f266873c: am 1c55797d: Fix build 
* commit 'c251147a2b6f461427b1ce49f7066fadc97c1faf':
  Fix build
 2014-05-13 23:55:17 +00:00
Deepanshu Gupta
273c5c3c4c am 9ca7a039: resolved conflicts for merge of e0be42a9 to jb-mr1.1-dev 
* commit '9ca7a039f73e5cf84f85282cf05d637517be2a17':
  Fix build due to incorrect merges [DO NOT MERGE]
 2014-05-13 23:54:21 +00:00
Deepanshu Gupta
c251147a2b am 85ec1445: am f266873c: am 1c55797d: Fix build 
* commit '85ec144538de6c27b22dff1bd45491a334f626ef':
  Fix build
 2014-05-13 23:50:44 +00:00
Deepanshu Gupta
9ca7a039f7 resolved conflicts for merge of e0be42a9 to jb-mr1.1-dev 2014-05-13 16:48:31 -07:00
Deepanshu Gupta
85ec144538 am f266873c: am 1c55797d: Fix build 
* commit 'f266873c8059e78410bf43c83fb8f0fd5bfe3362':
  Fix build
 2014-05-13 23:45:30 +00:00
Deepanshu Gupta
e0be42a9f9 am 40bfb60e: Fix build due to incorrect merges [DO NOT MERGE] 
* commit '40bfb60efa0e92259a417a5cbfd6095759c678b7':
  Fix build due to incorrect merges [DO NOT MERGE]
 2014-05-13 23:40:37 +00:00
Deepanshu Gupta
f266873c80 am 1c55797d: Fix build 
* commit '1c55797d0e786b6594e769c2fa424e1b8386648e':
  Fix build
 2014-05-13 23:40:34 +00:00
Justin Koh
78b94de4b5 Set KITKAT_WATCH to be level 20, document API specific changes. 
Bug: 14116162
Change-Id: Iab094dbd0add414a365234c275bd473787b8803b
 2014-05-13 16:03:18 -07:00
Deepanshu Gupta
40bfb60efa Fix build due to incorrect merges [DO NOT MERGE] 
Change-Id: Ib3b4dafeed6ba4c07450d13d9908fb05a1a4542f
 2014-05-13 15:52:39 -07:00
Deepanshu Gupta
1c55797d0e 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
 2014-05-13 15:47:04 -07:00
Justin Koh
5e6b8d37cf Merge "Hide new methods in notificationlistenerservice DO NOT MERGE" into klp-modular-dev 2014-05-13 22:42:46 +00:00
Justin Koh
e98122ed5d Hide new methods in notificationlistenerservice DO NOT MERGE 
Hide new methods in notificationlistenerservice for now.
Bug: 14116162

Change-Id: Ib57fd2feff174ab8638bd172710873e9e2be553a
 2014-05-13 15:10:16 -07:00
Deepanshu Gupta
56a794f2bf 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
 2014-05-13 21:33:14 +00:00
Deepanshu Gupta
21dc46b14d 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]
 2014-05-13 21:33:07 +00:00
Deepanshu Gupta
bda6d9a15a 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]
 2014-05-13 21:33:03 +00:00