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

81379 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Scott Main
2be5147e88 am 4faac02a: am 0dc12ee0: Merge "docs: new dashboard stats for 7/2" into jb-dev 
* commit '4faac02a1d7f2b139e931e05365fbb8f481aeca1':
  docs: new dashboard stats for 7/2
 2012-07-02 12:39:37 -07:00
Scott Main
4faac02a1d am 0dc12ee0: Merge "docs: new dashboard stats for 7/2" into jb-dev 
* commit '0dc12ee0f1cde86522724f176ed5a6d62142c47d':
  docs: new dashboard stats for 7/2
 2012-07-02 12:36:14 -07:00
Scott Main
0dc12ee0f1 Merge "docs: new dashboard stats for 7/2" into jb-dev 2012-07-02 12:33:03 -07:00
Scott Main
6039f148f2 docs: new dashboard stats for 7/2 
Change-Id: I29cdbbc9ef11ccd6398613b8dce8e25ab406318f
 2012-07-02 12:23:52 -07:00
Dirk Dougherty
8dd3132e49 am e030c61a: am 73d90e79: Merge "Doc change: fix incorrect links to dashboard." into jb-dev 
* commit 'e030c61a72ababbfb02162dd38f6d6fcf998d0a4':
  Doc change: fix incorrect links to dashboard.
 2012-07-02 11:21:42 -07:00
Dirk Dougherty
e030c61a72 am 73d90e79: Merge "Doc change: fix incorrect links to dashboard." into jb-dev 
* commit '73d90e797bf52b52372314477553b140818717c9':
  Doc change: fix incorrect links to dashboard.
 2012-07-02 11:18:38 -07:00
Dirk Dougherty
73d90e797b Merge "Doc change: fix incorrect links to dashboard." into jb-dev 2012-07-02 11:15:29 -07:00
Dirk Dougherty
4cdf3a2002 am e8ee48ea: am 418203d1: Doc change: Add Google Play balance back into monetizing docs. 
* commit 'e8ee48ea9fb281366e1edec685e3778bb32b7425':
  Doc change: Add Google Play balance back into monetizing docs.
 2012-07-02 11:11:21 -07:00
Dirk Dougherty
e8ee48ea9f am 418203d1: Doc change: Add Google Play balance back into monetizing docs. 
* commit '418203d1d57d9aca455e84b6a4e6bee8a000fdd6':
  Doc change: Add Google Play balance back into monetizing docs.
 2012-07-02 11:07:20 -07:00
Dirk Dougherty
63cb3d474f Doc change: fix incorrect links to dashboard. 
Change-Id: I31c754aa036b0770c7cd8596594bb2cedd47f1a7
 2012-07-02 11:05:55 -07:00
Dirk Dougherty
418203d1d5 Doc change: Add Google Play balance back into monetizing docs. 
Change-Id: I4326cbd7b93f0429b34f56f7ad67d910bcb0c6e1
 2012-07-02 11:03:31 -07:00
The Android Open Source Project
53d5415b87 am f632562f: Reconcile with jb-release 
* commit 'f632562f7d2e94978d185d192a62eb73925a59a2':
 2012-06-29 18:33:08 -07:00
The Android Open Source Project
f632562f7d Reconcile with jb-release 
Change-Id: I815e9292c3078eddde37ede41876d9219e4e2784
 2012-06-29 18:28:24 -07:00
Siva Velusamy
50d16bada3 am 4fae0620: am 27ad058a: Merge "Fix Minor typos" into jb-dev 
* commit '4fae0620ce46ba4ba6eebdf3d4edb96c78ef6dd7':
  Fix Minor typos
 2012-06-29 18:15:59 -07:00
Siva Velusamy
4fae0620ce am 27ad058a: Merge "Fix Minor typos" into jb-dev 
* commit '27ad058a941e742bc519b76d3a7940f31f988f1f':
  Fix Minor typos
 2012-06-29 18:13:14 -07:00
Siva Velusamy
27ad058a94 Merge "Fix Minor typos" into jb-dev 2012-06-29 18:10:29 -07:00
Ying Wang
2834bb5bd9 am 6979f522: (-s ours) am 2612de14: Merge "Import translations. DO NOT MERGE" into jb-dev 
* commit '6979f522082ea27f21982c68ed65b7c2a2b8967a':
  Import translations. DO NOT MERGE
 2012-06-29 17:57:00 -07:00
Ying Wang
6979f52208 am 2612de14: Merge "Import translations. DO NOT MERGE" into jb-dev 
* commit '2612de14d2dcfd5a6eedf882cf5cd9ac3e6fb73a':
  Import translations. DO NOT MERGE
 2012-06-29 17:53:20 -07:00
Ying Wang
846387c13d Merge "Import translations. DO NOT MERGE" 2012-06-29 17:51:30 -07:00
Ying Wang
a3fbe753e4 Merge "Import translations. DO NOT MERGE" 2012-06-29 17:50:58 -07:00
Ying Wang
2612de14d2 Merge "Import translations. DO NOT MERGE" into jb-dev 2012-06-29 17:50:47 -07:00
Siva Velusamy
4605a039ec Fix Minor typos 
Change-Id: I6d0581b7f3dcf1aad7ef3a622a750b8cbba221d5
 2012-06-29 17:49:55 -07:00
Scott Main
9a13fdf2e9 am 861b074f: am e02e5d8d: docs: fix link to gcm 
* commit '861b074fb429036bf13bda3e760c75bfe4ff8e1c':
  docs: fix link to gcm
 2012-06-29 16:52:46 -07:00
Scott Main
861b074fb4 am e02e5d8d: docs: fix link to gcm 
* commit 'e02e5d8d5874d9b247b3dff9153b7c9802f60130':
  docs: fix link to gcm
 2012-06-29 16:50:05 -07:00
Scott Main
e02e5d8d58 docs: fix link to gcm 
Change-Id: If198e72f1c3a37c82fe782ec88dd6a0c98e17105
 2012-06-29 16:45:55 -07:00
Scott Main
f94e26c374 am 8d374569: am ef2b7fa2: Merge "docs: move FAQ and old notepad tutorial to other places where we can properly redirect. This way the docs are accessible from existing links and they at least appear with a sidenav Also resolve a bunch of links to the notepad docs." in 
* commit '8d37456987246f95ab66d81658445c5ac319fb88':
  docs: move FAQ and old notepad tutorial to other places where we can properly redirect. This way the docs are accessible from existing links and they at least appear with a sidenav Also resolve a bunch of links to the notepad docs.
 2012-06-29 16:36:29 -07:00
Scott Main
0a6305b75f am 67756964: am f0d68a97: Merge "docs: Google IO bug fixes - http://b.corp.google.com/issue?id=6756248 - http://code.google.com/p/android/issues/detail?id=33877" into jb-dev 
* commit '67756964129004061346ae029c792cc0213b7e70':
  docs: Google IO bug fixes - http://b.corp.google.com/issue?id=6756248 - http://code.google.com/p/android/issues/detail?id=33877
 2012-06-29 16:36:24 -07:00
Scott Main
8d37456987 am ef2b7fa2: Merge "docs: move FAQ and old notepad tutorial to other places where we can properly redirect. This way the docs are accessible from existing links and they at least appear with a sidenav Also resolve a bunch of links to the notepad docs." into jb-dev 
* commit 'ef2b7fa2c311b91108a6a7296e004e89bc87fa9c':
  docs: move FAQ and old notepad tutorial to other places where we can properly redirect. This way the docs are accessible from existing links and they at least appear with a sidenav Also resolve a bunch of links to the notepad docs.
 2012-06-29 16:28:48 -07:00
Scott Main
ef2b7fa2c3 Merge "docs: move FAQ and old notepad tutorial to other places where we can properly redirect. This way the docs are accessible from existing links and they at least appear with a sidenav Also resolve a bunch of links to the notepad docs." into jb-dev 2012-06-29 16:26:19 -07:00
Dianne Hackborn
c32e190ea6 resolved conflicts for merge of a9c38461 to master 
Change-Id: Ie7044c4f9f15384c3edd328fa8e2932c731d9d5c
 2012-06-29 16:23:49 -07:00
Scott Main
6775696412 am f0d68a97: Merge "docs: Google IO bug fixes - http://b.corp.google.com/issue?id=6756248 - http://code.google.com/p/android/issues/detail?id=33877" into jb-dev 
* commit 'f0d68a975fc4cf0e43c94f1678a311b2ed201c92':
  docs: Google IO bug fixes - http://b.corp.google.com/issue?id=6756248 - http://code.google.com/p/android/issues/detail?id=33877
 2012-06-29 16:22:42 -07:00
Scott Main
64b1188356 docs: move FAQ and old notepad tutorial to other places where we can properly redirect. 
This way the docs are accessible from existing links and they at least appear with a sidenav
Also resolve a bunch of links to the notepad docs.

Change-Id: I828e0bb8df32ee5658cae22c8f34b9fc1512fbae
 2012-06-29 16:21:51 -07:00
Scott Main
f0d68a975f Merge "docs: Google IO bug fixes - http://b.corp.google.com/issue?id=6756248 - http://code.google.com/p/android/issues/detail?id=33877" into jb-dev 2012-06-29 16:19:52 -07:00
The Android Automerger
5df368fac7 merge in jb-release history after reset to jb-dev 2012-06-29 15:51:56 -07:00
Dianne Hackborn
a9c3846194 am bfb752f8: Merge "Fix issue #6761130: Clearing app data in settings does not clear app\'s USB storage" into jb-dev 
* commit 'bfb752f8f0e4d73dc251c19d2ef79649fbbe4fd1':
  Fix issue #6761130: Clearing app data in settings does not clear app's USB storage
 2012-06-29 15:43:37 -07:00
Dianne Hackborn
bfb752f8f0 Merge "Fix issue #6761130: Clearing app data in settings does not clear app's USB storage" into jb-dev 2012-06-29 15:40:18 -07:00
Joe Fernandez
79dee590a8 docs: Google IO bug fixes 
- http://b.corp.google.com/issue?id=6756248
- http://code.google.com/p/android/issues/detail?id=33877

Change-Id: Ib77bb865d7a5f8194ce8a1bac59c15612a3dc654
 2012-06-29 15:22:38 -07:00
Dianne Hackborn
183ce028f1 Fix issue #6761130: Clearing app data in settings does not clear app's USB storage 
The package manager calls to clear data / clear cache were not also
having default container service clear the data on external storage.  Now
they do.

Change-Id: Ib5e5eb6adf2cac5a4cc094cc1a02ac8cfb6a2edf
 2012-06-29 15:00:21 -07:00
Michael Jurka
4efade8a85 Merge "Removing setChildrenLayersEnabled" 2012-06-29 12:57:26 -07:00
Christopher Tate
b2d8f3f747 am b69c77cd: am 1598a508: Merge "Do not back up / restore the rotation-related settings" into jb-dev 
* commit 'b69c77cd194ccbe24a8b1e5d8457b44d150f9a96':
  Do not back up / restore the rotation-related settings
 2012-06-29 12:45:57 -07:00
Christopher Tate
b69c77cd19 am 1598a508: Merge "Do not back up / restore the rotation-related settings" into jb-dev 
* commit '1598a50818b638d20120f71bab01c1792ecd4b6a':
  Do not back up / restore the rotation-related settings
 2012-06-29 12:42:52 -07:00
Christopher Tate
1598a50818 Merge "Do not back up / restore the rotation-related settings" into jb-dev 2012-06-29 12:40:34 -07:00
Ying Wang
67992907ef Import translations. DO NOT MERGE 
Change-Id: I0c5a7b310930b1197642c981768a39112c4eb562
Auto-generated-cl: translation import
 2012-06-29 11:59:26 -07:00
Christopher Tate
596e1917d5 Do not back up / restore the rotation-related settings 
Change-Id: I4c5f8c31fa78acc1dfa2676e89b2c1c7bbd12a06
 2012-06-29 11:55:02 -07:00
Ying Wang
dca6edc53d Import translations. DO NOT MERGE 
Change-Id: I2277cb3516142cf5715c55c27a6497fac21fc1b2
Auto-generated-cl: translation import
 2012-06-29 11:48:50 -07:00
Ying Wang
c01ba1cd72 Import translations. DO NOT MERGE 
Change-Id: Iaf052543d1c7cd9afb6fe415df2ad72c5de94ea8
Auto-generated-cl: translation import
 2012-06-29 11:40:36 -07:00
John Grossman
c7f57c6f92 Fix for bug 6691452 
Hand merge from ics-aah

> Fix for bug 6691452 : DO NOT MERGE
>
> As it so happens, there seem to be panels out there who disapprove of
> sudden changes in their HDMI clock rate.  In particular, Sony LCD
> panels made from around 2010-2011 (including the Sony GTV panel) seem
> to dislike this behavior.  When exposed to a large jump in the clock
> rate (say from -100pmm to +100ppm in about 30mSec), they seem to
> panic, blank their audio and video, and then resync.  The whole
> panic process takes about 2 seconds.
>
> The HDMI spec says that its clock jitter requirements are defined by
> their differential signalling eye diagram requirements relative to an
> "Ideal Recovery Clock" (see section 4.2.3.1 of the HDMI 1.3a spec).
> Basically, if you pass the eye diagram tests, you pass the clock
> jitter requirements.  We have determined in lab that even being
> extremely aggressive in our VCXO rate changes does not come even close
> to violating the HDMI eye diagrams.  Its just this era of Sony panels
> which seem to be upset by this behavior.
>
> One way or the other, experiments which the GTV devices have seemed to
> indicate that a full range sweep of the VCXO done in 10mSec steps over
> anything faster than 190mSec can cause trouble.  Adding a healthy
> degree of margin to this finding, the fix is to limit the rate of VCXO
> control change such that it never goes at a rate faster than
> FullRange/300mSec.
>
> Change flagged as do not merge due to the code structure changes to master.
> This will need to be merged by hand.
>
> Signed-off-by: John Grossman <johngro@google.com>
> Change-Id: Ibfd361fe1cc2cbd4909489e3317fb12e005c6a75

Change-Id: If62f791c826f1145262a6b546b1dc1f9776c37d8
Signed-off-by: John Grossman <johngro@google.com>
 2012-06-29 10:22:19 -07:00
The Android Open Source Project
c59c168508 am c411fd2f: Reconcile with jb-release 
* commit 'c411fd2f784e83053f5e7e9c65342d0cc838bc6e':
 2012-06-29 08:19:47 -07:00
The Android Open Source Project
c411fd2f78 Reconcile with jb-release 
Change-Id: Ibb735de39e6d7a0452b9f04145121ee7154d9b99
 2012-06-29 08:13:44 -07:00
Michael Jurka
ba64974141 Removing setChildrenLayersEnabled 
Change-Id: I88d8228eadb59160648f2c4e131fcd85945f2109
 2012-06-28 19:15:20 -07:00