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

88761 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jeff Brown
3b971598ed Improve heuristics for detecting wireless chargers. 
On some devices, we need to apply heuristics to determine whether
the device is docked on a wireless charger because the charging
circuits do not provide sufficient information to know whether
the device is on the charger unless it is actually receiving
power.

The previous heuristics only considered the battery level to
suppress spurious dock signals.

The new heuristics also take into account whether the device
appears to have moved from its previous position on the dock.

Bug: 7744185
Change-Id: I5ba885dac25b37840b6db46b8a0f30968a06776c
 2013-01-10 10:01:56 -08:00
Scott Main
93a4ab2fa2 am 8f70a7c4: move the nsdchat sample to proper download directory 
* commit '8f70a7c46cc3c4732b11fd8088b47c3434cf64d9':
  move the nsdchat sample to proper download directory
 2013-01-04 18:57:18 -08:00
Scott Main
8f70a7c46c move the nsdchat sample to proper download directory 
Change-Id: I9679e5642ffaa1baad104c5fa1c1f90b59a5b1ff
 2013-01-04 18:54:08 -08:00
Scott Main
4bc407e3e1 am 47e8d20d: move network usage sample zip 
* commit '47e8d20d7b87be59ce38828659231afd425d05f8':
  move network usage sample zip
 2013-01-04 18:51:32 -08:00
Scott Main
47e8d20d7b move network usage sample zip 
Change-Id: I4ed2ebe357d420fea20d69515d9e91dc73579bba
 2013-01-04 18:47:39 -08:00
Scott Main
921c8a5d86 am 4e483ed3: Merge "docs: misc bug fixes. including important versioning fixes for first app class" into jb-mr1-dev 
* commit '4e483ed30697472aceb05bb1555f14b066ee8502':
  docs: misc bug fixes. including important versioning fixes for first app class
 2013-01-04 18:19:00 -08:00
Scott Main
4e483ed306 Merge "docs: misc bug fixes. including important versioning fixes for first app class" into jb-mr1-dev 2013-01-04 18:16:16 -08:00
Scott Main
f8daf19971 docs: misc bug fixes. including important versioning fixes for first app class 
Change-Id: Ifda2509fc90dd795bfd6c5e9b3d7eebcbd77892a
 2013-01-04 18:09:29 -08:00
Katie McCormick
928d2634ff am 2b13a475: Doc update: fixed manifest typo in Network zip 
* commit '2b13a475409aa28890c93088e86c065da1b07044':
  Doc update: fixed manifest typo in Network zip
 2013-01-04 16:34:19 -08:00
Katie McCormick
2b13a47540 Doc update: fixed manifest typo in Network zip 
Change-Id: Iccf6dbce9d975337ab23b26dce63d3ec31303320
 2013-01-04 16:17:45 -08:00
Scott Main
7edf807471 am 197d0a66: Merge "docs: update sony driver link and name bug: 6566732" into jb-mr1-dev 
* commit '197d0a6688ccf72632b461987671f1f2802935b7':
  docs: update sony driver link and name bug: 6566732
 2013-01-04 11:33:59 -08:00
Scott Main
197d0a6688 Merge "docs: update sony driver link and name bug: 6566732" into jb-mr1-dev 2013-01-04 11:29:32 -08:00
Scott Main
9c6cec7b89 docs: update sony driver link and name 
bug: 6566732

Change-Id: I8cb6e3295a24a7876d9cc9493889d85688357f79
 2013-01-04 11:24:10 -08:00
Robert Ly
e478fb4fa7 am 6b79e954: Merge "docs: update gms and gcm javadocs with new TOC" into jb-mr1-dev 
* commit '6b79e9542b2b2fae18a882696e61adb4fce144eb':
  docs: update gms and gcm javadocs with new TOC
 2013-01-04 11:03:04 -08:00
Robert Ly
6b79e9542b Merge "docs: update gms and gcm javadocs with new TOC" into jb-mr1-dev 2013-01-04 10:58:55 -08:00
Robert Ly
d84d5ccdd4 docs: update gms and gcm javadocs with new TOC 
Change-Id: Ic54c4e4e6e2b0008450abe9d3aa1ae53535d9160
 2013-01-04 10:41:41 -08:00
Scott Main
38a642e987 am 3e2479dd: Merge "docs: fix broken links and add new sitemap text file" into jb-mr1-dev 
* commit '3e2479dd20ee9a1dab17e5dbec7fc835f2fa427f':
  docs: fix broken links and add new sitemap text file
 2013-01-03 18:36:45 -08:00
Scott Main
3e2479dd20 Merge "docs: fix broken links and add new sitemap text file" into jb-mr1-dev 2013-01-03 18:32:45 -08:00
Scott Main
188315cf8b docs: fix broken links and add new sitemap text file 
Change-Id: If0f7967a65a6e3a444a565a2e8229a04a5265f56
 2013-01-03 18:02:21 -08:00
Katie McCormick
d56e4eca33 am ed2a05bc: Merge "Doc change: minor fixes to support lib lesson." into jb-mr1-dev 
* commit 'ed2a05bc5b05e8aec0777ce2eb57bb91626524d8':
  Doc change: minor fixes to support lib lesson.
 2013-01-03 16:11:31 -08:00
Katie McCormick
ed2a05bc5b Merge "Doc change: minor fixes to support lib lesson." into jb-mr1-dev 2013-01-03 16:07:45 -08:00
Katie McCormick
e06b0838e3 Doc change: minor fixes to support lib lesson. 
Bug # 7633596

Change-Id: I380300b818cb6886c3c6857b64ba54e0602f7a37
 2013-01-03 16:01:33 -08:00
Scott Main
90c0548c05 am 9fe82f1b: Merge "docs: dashboard update for 1/3/13" into jb-mr1-dev 
* commit '9fe82f1bc7c880bb1ec5ac3a9a1b5fff2c0bdda9':
  docs: dashboard update for 1/3/13
 2013-01-03 11:47:20 -08:00
Scott Main
9fe82f1bc7 Merge "docs: dashboard update for 1/3/13" into jb-mr1-dev 2013-01-03 11:44:43 -08:00
Scott Main
b318318e0a docs: dashboard update for 1/3/13 
Change-Id: I0ff0b045d1c08a071fa706d8c0ff17943f2e752f
 2013-01-03 11:39:34 -08:00
Xavier Ducrohet
afa4d8bfaf am 22d7cf23: Add single crunch command to aapt. do not merge. 
* commit '22d7cf239d8a9b009ea7adf86d8826a8a8116d03':
  Add single crunch command to aapt. do not merge.
 2013-01-03 10:43:39 -08:00
Xavier Ducrohet
22d7cf239d Add single crunch command to aapt. do not merge. 
Previously the crunch command would work on a full res folder
and output a full res folder (with only the drawables). This
was only used in the SDK.

The incremental logic is moved to the SDK build system so we
change the crunch command (or rather add a new one) to only
crunch a single file.

(cherry picked from commit b1f6ad82dd8d1702617a757a88430604b3131fac)

Change-Id: I3653f67ee321eac37cb8a6d228b1ef6d104ff0be
 2013-01-02 15:41:52 -08:00
Scott Main
481102eed6 am 0dae634b: Merge "docs: add class on keyboards" into jb-mr1-dev 
* commit '0dae634b06f5dc6039a5aaa9c0f00250e10c6547':
  docs: add class on keyboards
 2012-12-21 16:29:16 -08:00
Scott Main
0dae634b06 Merge "docs: add class on keyboards" into jb-mr1-dev 2012-12-21 16:25:50 -08:00
Scott Main
cee5267b76 am dc2c1a0f: docs: add explanation of default permissions to Permission guide and fix code snippet error in WebView guide. external issue:41441 
* commit 'dc2c1a0f80042c42768fd868791e21412c3839b9':
  docs: add explanation of default permissions to Permission guide and fix code snippet error in WebView guide. external issue:41441
 2012-12-21 16:25:36 -08:00
Scott Main
c8a6f8a041 docs: add class on keyboards 
Change-Id: I3fb179457af50eec9d111f84eb9fabf49bc7ab1b
 2012-12-21 16:24:36 -08:00
Scott Main
dc2c1a0f80 docs: add explanation of default permissions to Permission guide 
and fix code snippet error in WebView guide.
external issue:41441

Change-Id: I5d021e4f04245385b62e992baebd702814fff930
 2012-12-21 16:19:52 -08:00
kmccormick@google.com
ec6d08475e am 5b03460f: Merge "cherrypick from jb-dev-docs: Gestures Class Change-Id: I9abebf58a9607c8f52f72ef2ce46308304386596" into jb-mr1-dev 
* commit '5b03460fcb69394b984fad1a63e244f9aa798886':
  cherrypick from jb-dev-docs: Gestures Class Change-Id: I9abebf58a9607c8f52f72ef2ce46308304386596
 2012-12-21 12:46:03 -08:00
&& repo sync -j8
5b03460fcb Merge "cherrypick from jb-dev-docs: Gestures Class Change-Id: I9abebf58a9607c8f52f72ef2ce46308304386596" into jb-mr1-dev 2012-12-21 12:43:20 -08:00
&& repo sync -j8
518edbfa97 cherrypick from jb-dev-docs: Gestures Class Change-Id: I9abebf58a9607c8f52f72ef2ce46308304386596 
Change-Id: I72c2621dcc674a2f486ec2a49e0eb409d8c9b5bd
 2012-12-20 16:06:55 -08:00
Dirk Dougherty
e487e537b0 am 0402b653: Merge "Doc change: point developer landing page featured content to blog post." into jb-mr1-dev 
* commit '0402b65327aa568c7ea706879d9ddb222436aa87':
  Doc change: point developer landing page featured content to blog post.
 2012-12-20 12:49:22 -08:00
Dirk Dougherty
0402b65327 Merge "Doc change: point developer landing page featured content to blog post." into jb-mr1-dev 2012-12-20 12:46:00 -08:00
Dirk Dougherty
0f08867b93 Doc change: point developer landing page featured content to blog post. 
Change-Id: I8201d223b4b2c28227c7aac3499a81d29c3ec9e3
 2012-12-20 12:40:22 -08:00
Scott Main
226e973f39 am 8afb3ba4: Merge "docs: SDK r21.0.1 Release Notes" into jb-mr1-dev 
* commit '8afb3ba4dac2f3e42884cb40f8fa407e072382e3':
  docs: SDK r21.0.1 Release Notes
 2012-12-20 12:12:03 -08:00
Scott Main
76f7774db8 am f6e55123: Merge "docs: NDK r8d Release Notes" into jb-mr1-dev 
* commit 'f6e551239017745f88893acaf38b3bac097aceb1':
  docs: NDK r8d Release Notes
 2012-12-20 12:04:57 -08:00
Scott Main
8afb3ba4da Merge "docs: SDK r21.0.1 Release Notes" into jb-mr1-dev 2012-12-20 12:03:53 -08:00
Scott Main
f6e5512390 Merge "docs: NDK r8d Release Notes" into jb-mr1-dev 2012-12-20 12:02:29 -08:00
Dirk Dougherty
a232fa3f83 am 0f0d9b32: Merge "Doc change: update develop landing page." into jb-mr1-dev 
* commit '0f0d9b32cb41acc2e7b0b5556c64b366f5f08709':
  Doc change: update develop landing page.
 2012-12-20 09:34:47 -08:00
Dirk Dougherty
0f0d9b32cb Merge "Doc change: update develop landing page." into jb-mr1-dev 2012-12-20 09:28:37 -08:00
Scott Main
18ac55709d am db49d317: Merge "Doc change: add mention of localized promo graphics." into jb-mr1-dev 
* commit 'db49d317291861d8f885f3510f9b70b31e592f11':
  Doc change: add mention of localized promo graphics.
 2012-12-19 16:15:08 -08:00
Scott Main
db49d31729 Merge "Doc change: add mention of localized promo graphics." into jb-mr1-dev 2012-12-19 16:12:18 -08:00
Elliott Hughes
71fc6b860c am 84303f5c: Update the JNI spec link, and remove a dead link. 
* commit '84303f5cd613f24653cc08d156a533e23a76b34a':
  Update the JNI spec link, and remove a dead link.
 2012-12-19 11:15:17 -08:00
Elliott Hughes
84303f5cd6 Update the JNI spec link, and remove a dead link. 
Also remove the duplicate copy of this file. There's a redirect in place
from the old location.

Bug: http://code.google.com/p/android/issues/detail?id=41623

(cherry picked from commit 965da34de94cdb845b64bd676e45b260000cd09d)

Change-Id: I5a940383fb27900ba560822c060cc5ed864eb771
 2012-12-19 11:09:16 -08:00
Joe Malin
89523cfe92 am 4c59230a: am d4289c6e: am c84b3603: am 8dd6275e: Android Training: Multiple Threads 
* commit '4c59230a2fe0ec750b31a0908fbee5c5613b87c0':
  Android Training: Multiple Threads
 2012-12-19 10:37:41 -08:00
Joe Malin
4c59230a2f am d4289c6e: am c84b3603: am 8dd6275e: Android Training: Multiple Threads 
* commit 'd4289c6e20c0a42deba796d02b5a9bc60c9a4e7c':
  Android Training: Multiple Threads
 2012-12-19 10:35:32 -08:00