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

125193 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Joe Fernandez
64ae930359 am e1e81a9e: am e287cf33: docs: Update ADT-1 page with supported apps 
* commit 'e1e81a9ee0f3632898eff1056fd2283b79789e23':
  docs: Update ADT-1 page with supported apps
 2014-07-17 18:04:47 +00:00
David Friedman
5d59d371f2 Merge "Minor typos, consistency things, one grammatical error." into klp-modular-docs 2014-07-17 17:59:02 +00:00
David Friedman
d3161450fb Minor typos, consistency things, one grammatical error. 
Change-Id: I65ad160b9c49bc9c7e762d3628e69c518742ef4c
 2014-07-18 02:28:54 -07:00
Scott Rowe
ff424377df cherrypick from klp-docs docs: b/14524668 remove ANDROID_ID Change-Id: I83d4389bb8322c2dbca10042e666fc9b75ea8a12 
Change-Id: I2ee3cc1269fcd9b31f1f71fc5fc3cd8d62ebf31f
 2014-07-17 10:13:53 -07:00
Joe Fernandez
e1e81a9ee0 am e287cf33: docs: Update ADT-1 page with supported apps 
* commit 'e287cf33d4cd69aef2177d025a110cf8b9f0e267':
  docs: Update ADT-1 page with supported apps
 2014-07-17 16:44:19 +00:00
Justin Koh
0a93106964 am 65d7c332: Merge "Additional cleanup after stack deletion." into klp-modular-dev 
* commit '65d7c332d7b613f23a26066051cc7496e0efa994':
  Additional cleanup after stack deletion.
 2014-07-17 10:56:16 +00:00
Justin Koh
75f317403f am 77cdac05: Merge "Wait for all windows to draw before turning screen on" into klp-modular-dev 
* commit '77cdac05ba80925f6cdc4c349af0fa7567c36146':
  Wait for all windows to draw before turning screen on
 2014-07-17 10:55:56 +00:00
Filip Gruszczynski
95198b9166 am 39f0e7da: Merge "Using outset bottom from theme as bottom inset on circular screens." into klp-modular-dev 
* commit '39f0e7da00eae4e5a331a9413a396f3dddbeb625':
  Using outset bottom from theme as bottom inset on circular screens.
 2014-07-17 10:55:43 +00:00
Ricardo Cervera
25303a980c Merge "docs: Fixed RecyclerView example. Bug: 15973665" into klp-modular-docs 2014-07-17 02:29:54 +00:00
Craig Mautner
0a589b929e Wait for all windows to draw before turning screen on 
Was previously only waiting for windows on the primary display to
draw which meant that windows on ActivityViews had not yet drawn.
This fix checks redraws all outstanding Surfaces before unblanking
the screen.

Fixes bug 15092354.

Change-Id: Id550db003a5f56931eb68464085596e47d25481d
 2014-07-16 17:03:36 -07:00
Filip Gruszczynski
39f0e7da00 Merge "Using outset bottom from theme as bottom inset on circular screens." into klp-modular-dev 2014-07-16 23:37:00 +00:00
Filip Gruszczynski
dcb70c2e08 Using outset bottom from theme as bottom inset on circular screens. 
Change-Id: I46374b345e60a74b6afbbb6a278a0b8e81650681
 2014-07-16 17:09:06 -07:00
Joe Fernandez
e287cf33d4 docs: Update ADT-1 page with supported apps 
Change-Id: I7281767e3a51ce518f4e14f0751ba71859e16d24
 2014-07-16 16:22:51 -07:00
Justin Koh
65d7c332d7 Merge "Additional cleanup after stack deletion." into klp-modular-dev 2014-07-16 22:30:55 +00:00
Justin Koh
77cdac05ba Merge "Wait for all windows to draw before turning screen on" into klp-modular-dev 2014-07-16 22:30:55 +00:00
Craig Mautner
ee36c77acd Additional cleanup after stack deletion. 
- Remove activity from PendingActivityLaunch list when it is removed
from stack. This prevents the delayed launch causing
IllegalArgumentException in b/16045752.
- Move PendingActivityLaunch from ActivityManagerService to
ActivityStackSupervisor.
- Immediately call onTaskListEmptyLocked() in cases where no
activities are found in stack.

Fixes bug 16045752.

Change-Id: Ia69a449e7f5e08ab6e36157d0fd793c4d2fdaca4
 2014-07-16 15:03:11 -07:00
kmccormick
1f4e56869c am 289d3c25: am fc8a3b5f: Merge "Doc Update: new Smack sample." into klp-modular-docs 
* commit '289d3c253eafe09a2ba3614aeeb8ba80539175b7':
  Doc Update: new Smack sample.
 2014-07-16 21:36:07 +00:00
David Friedman
8b51d07ffa am a827c738: am 046702ba: A linebreak had somehow wrongly replaced a blank space. Blank space restored. 
* commit 'a827c7383273194c0dea1b5cc94e85285ee22afd':
  A linebreak had somehow wrongly replaced a blank space. Blank space restored.
 2014-07-16 21:36:03 +00:00
kmccormick
289d3c253e am fc8a3b5f: Merge "Doc Update: new Smack sample." into klp-modular-docs 
* commit 'fc8a3b5f06fe725ed561fb3535efd02b16c526ea':
  Doc Update: new Smack sample.
 2014-07-16 21:17:15 +00:00
David Friedman
a827c73832 am 046702ba: A linebreak had somehow wrongly replaced a blank space. Blank space restored. 
* commit '046702ba57c34893e058674dc36192796af20da7':
  A linebreak had somehow wrongly replaced a blank space. Blank space restored.
 2014-07-16 21:17:12 +00:00
David Friedman
046702ba57 A linebreak had somehow wrongly replaced a blank space. Blank space restored. 
Change-Id: Iab27ee6676b53a71538020219aa67c66d45cbfab
(cherry picked from commit fe545cdb4e9d49d8cf58626ef77709abecf8f26b)
 2014-07-16 19:57:44 +00:00
David Friedman
c6474d97cc am fe545cdb: A linebreak had somehow wrongly replaced a blank space. Blank space restored. 
* commit 'fe545cdb4e9d49d8cf58626ef77709abecf8f26b':
  A linebreak had somehow wrongly replaced a blank space. Blank space restored.
 2014-07-16 19:50:24 +00:00
David Friedman
fe545cdb4e A linebreak had somehow wrongly replaced a blank space. Blank space restored. 
Change-Id: Iab27ee6676b53a71538020219aa67c66d45cbfab
 2014-07-16 12:33:55 -07:00
Robert Ly
f3c3edfee8 am bafdb900: am 82088d62: Merge "docs: add EU legal notice" into klp-modular-docs 
* commit 'bafdb90070bf3f5120599efd322fdd20a31e84ef':
  docs: add EU legal notice
 2014-07-16 19:28:57 +00:00
Robert Ly
bafdb90070 am 82088d62: Merge "docs: add EU legal notice" into klp-modular-docs 
* commit '82088d62f81a1d842bdb2d285ed578c562b20edd':
  docs: add EU legal notice
 2014-07-16 19:23:46 +00:00
Quddus Chong
6743f1ea92 am 1a2a9730: am f0d8c6fc: Merge "docs: Fixed small typo. bug: 14617866" into klp-modular-docs 
* commit '1a2a9730e605e5a3ea46db1049bf950a669cb0d3':
  docs: Fixed small typo. bug: 14617866
 2014-07-16 18:17:18 +00:00
Quddus Chong
1a2a9730e6 am f0d8c6fc: Merge "docs: Fixed small typo. bug: 14617866" into klp-modular-docs 
* commit 'f0d8c6fcae7176fd99e9e10bbe9e494c18860cfd':
  docs: Fixed small typo. bug: 14617866
 2014-07-16 18:13:19 +00:00
Chris Smith
23a0b3d9d5 am 211c5844: am 7a047941: docs: Fix minor issues with Wear data events docs. 
* commit '211c58448e21ad210a497658fdf1dd26b0c96faf':
  docs: Fix minor issues with Wear data events docs.
 2014-07-16 18:13:14 +00:00
Chris Smith
211c58448e am 7a047941: docs: Fix minor issues with Wear data events docs. 
* commit '7a04794186dcb679501a7a9383caae8df01428d0':
  docs: Fix minor issues with Wear data events docs.
 2014-07-16 18:09:17 +00:00
Deepanshu Gupta
6c57fc3019 DO NOT MERGE - Fix LayoutLib. 
This fixes a bad merge and contains partial cherrypicks of the following
commits to make LayoutLib working again:
103d40960daa0420995aa12881bef33892a0a2ab
803d77d8904a8fd66f0370cca6ed7f8b7cf68907
6a08225cee197e5baf80dd06dae46988db284122

Bug: 15987446
Change-Id: I41563305206d30ecdbc7f609c4b90d53edb42689
 2014-07-16 10:23:28 -07:00
kmccormick
fc8a3b5f06 Merge "Doc Update: new Smack sample." into klp-modular-docs 2014-07-16 16:25:13 +00:00
Robert Ly
82088d62f8 Merge "docs: add EU legal notice" into klp-modular-docs 2014-07-16 16:25:13 +00:00
Robert Ly
d9736032e3 docs: add EU legal notice 
bug 16345613
Change-Id: I96215d7a55bc52bc69a312ba0bb0e1e83dd82d9e
 2014-07-16 12:15:11 -07:00
Quddus Chong
f0d8c6fcae Merge "docs: Fixed small typo. bug: 14617866" into klp-modular-docs 2014-07-16 16:25:13 +00:00
Quddus Chong
133125446d docs: Fixed small typo. 
bug: 14617866

Change-Id: I967be618d805b126a750bb60f8bc26f2dc5a95e9
 2014-07-16 10:28:55 -07:00
Ricardo Cervera
2f84fbd9f9 docs: Fix typo in Wear docs. Bug: 16327298 
Change-Id: I682b9bba9d01712b98d5de97d31ef2d88b5b6ea0
 2014-07-16 09:02:36 -07:00
Chris Smith
7a04794186 docs: Fix minor issues with Wear data events docs. 
Change-Id: Id6f6c57748e2e51b7a0de6fb6e7912a0c838d987
 2014-07-16 14:49:36 +00:00
Andrew Solovay
c8fcb3bcdb am 57553775: am 63477e67: Merge "cherrypick from klp-docs docs: Corrected doc for getLaunchIntentForPackage(). Change-Id: I2eab0956eaedac71289e19a3618a3553908f8c38" into klp-modular-docs 
* commit '575537759222e0277c3979e33342407aa7ca1a78':
  cherrypick from klp-docs docs: Corrected doc for getLaunchIntentForPackage(). Change-Id: I2eab0956eaedac71289e19a3618a3553908f8c38
 2014-07-16 13:29:08 +00:00
Robert Ly
e104012f1b am 8231174e: am bf42978e: Merge "NDK filesizes and hashes updated" into klp-modular-docs 
* commit '8231174ec5b4d720cde2d1d7abb40ee9bde32c7d':
  NDK filesizes and hashes updated
 2014-07-16 13:29:04 +00:00
Ricardo Cervera
9e4db5b76a am b5cd1976: am c79f3d69: Merge "cherrypick from klp-modular-dev docs: Fix issue with CardView preview docs Bug: 16277161 Change-Id: Iea8cbff81fbf3ac50c9009fbf21dc65c625e71ee" into klp-modular-docs 
* commit 'b5cd197646a18239e976649ffa99d39c6f568d2b':
  cherrypick from klp-modular-dev docs: Fix issue with CardView preview docs Bug: 16277161 Change-Id: Iea8cbff81fbf3ac50c9009fbf21dc65c625e71ee
 2014-07-16 13:29:00 +00:00
Robert Ly
4460bff8b3 am 1374f6ea: am 649e8f9b: Merge "docs: add edu video highlights" into klp-modular-docs 
* commit '1374f6ea86f982e7600b9b2714747bc654243591':
  docs: add edu video highlights
 2014-07-16 13:28:56 +00:00
Andrew Solovay
52f0b5740e am 0791c612: am 3f8d9c9e: Merge "docs: Replaced deprecated fill_parent with match_parent." into klp-modular-docs 
* commit '0791c612b9dff787fa5e081d6bb207116333b21a':
  docs: Replaced deprecated fill_parent with match_parent.
 2014-07-16 13:28:53 +00:00
Quddus Chong
13fc31df3c am b2b1c5fa: am 6a5dd936: docs: Fixed typo in L Preview API Overview. bug: 15696551 
* commit 'b2b1c5fa89a497f8e75cde7011795eae625a1722':
  docs: Fixed typo in L Preview API Overview. bug: 15696551
 2014-07-16 13:28:49 +00:00
Ricardo Cervera
3b0909c49b am 0acf9d2f: am de138276: docs: Fix typos in the L preview docs. Bug: 16240486 
* commit '0acf9d2f9a1c74308db4632530f5b57e6cde5f9d':
  docs: Fix typos in the L preview docs. Bug: 16240486
 2014-07-16 13:28:44 +00:00
David Friedman
ede1910aa4 am ddf853e0: am 7f6af88e: Fixed a randomly discovered typo and missing hyphen. Change not staged. 
* commit 'ddf853e0ce8a32a7d7e7f070b49f44a4edb2fff0':
  Fixed a randomly discovered typo and missing hyphen. Change not staged.
 2014-07-16 13:28:37 +00:00
Andrew Solovay
5755377592 am 63477e67: Merge "cherrypick from klp-docs docs: Corrected doc for getLaunchIntentForPackage(). Change-Id: I2eab0956eaedac71289e19a3618a3553908f8c38" into klp-modular-docs 
* commit '63477e67eba4e8f3d3c17c3774cd99d23db39456':
  cherrypick from klp-docs docs: Corrected doc for getLaunchIntentForPackage(). Change-Id: I2eab0956eaedac71289e19a3618a3553908f8c38
 2014-07-16 13:22:57 +00:00
Robert Ly
8231174ec5 am bf42978e: Merge "NDK filesizes and hashes updated" into klp-modular-docs 
* commit 'bf42978e14e352984eb5443687fccd5b15dc27a3':
  NDK filesizes and hashes updated
 2014-07-16 13:22:54 +00:00
Ricardo Cervera
b5cd197646 am c79f3d69: Merge "cherrypick from klp-modular-dev docs: Fix issue with CardView preview docs Bug: 16277161 Change-Id: Iea8cbff81fbf3ac50c9009fbf21dc65c625e71ee" into klp-modular-docs 
* commit 'c79f3d696a24ade6017b0e91d92898190c204dd2':
  cherrypick from klp-modular-dev docs: Fix issue with CardView preview docs Bug: 16277161 Change-Id: Iea8cbff81fbf3ac50c9009fbf21dc65c625e71ee
 2014-07-16 13:22:50 +00:00
Robert Ly
1374f6ea86 am 649e8f9b: Merge "docs: add edu video highlights" into klp-modular-docs 
* commit '649e8f9b2b9442fc29570f86a2f92fe5b7538c45':
  docs: add edu video highlights
 2014-07-16 13:22:47 +00:00
Andrew Solovay
0791c612b9 am 3f8d9c9e: Merge "docs: Replaced deprecated fill_parent with match_parent." into klp-modular-docs 
* commit '3f8d9c9e0a67a87009ee42904d3f08fe2f1371c6':
  docs: Replaced deprecated fill_parent with match_parent.
 2014-07-16 13:22:44 +00:00