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

125170 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Deepanshu Gupta
696eb4da44 am c39916f7: am 37f54f4c: am 357ebfc5: Fix default level flags for bidi. [DO NOT MERGE] 
* commit 'c39916f7dadb2f8be2e7523c5ceade9f04a94e1e':
  Fix default level flags for bidi. [DO NOT MERGE]
 2014-07-18 21:39:33 +00:00
Deepanshu Gupta
85c7b209c3 am 5efee91e: Merge "Fix style resolution for styles with \'.\' [DO NOT MERGE]" into jb-mr2-dev 
* commit '5efee91e12420e59214946c526f80961738a9c1d':
  Fix style resolution for styles with '.' [DO NOT MERGE]
 2014-07-18 21:39:25 +00:00
Deepanshu Gupta
b8e4e8e1f4 am d3ac01ff: Merge "Fix style resolution for styles with \'.\' [DO NOT MERGE]" into jb-mr1.1-dev 
* commit 'd3ac01ff7616f7135b8b5044816690c93fba8548':
  Fix style resolution for styles with '.' [DO NOT MERGE]
 2014-07-18 21:38:39 +00:00
Deepanshu Gupta
c3a7763b84 am 918ca12f: am 10395cbb: Fix default level flags for bidi. [DO NOT MERGE] 
* commit '918ca12ffc09a96194112edf3540d94c32918a07':
  Fix default level flags for bidi. [DO NOT MERGE]
 2014-07-18 21:36:29 +00:00
Deepanshu Gupta
c39916f7da am 37f54f4c: am 357ebfc5: Fix default level flags for bidi. [DO NOT MERGE] 
* commit '37f54f4c1e2d97b33bdd8abe5f196debecc5437d':
  Fix default level flags for bidi. [DO NOT MERGE]
 2014-07-18 21:35:21 +00:00
Deepanshu Gupta
c425c438a3 am 710a55b4: Fix default level flags for bidi. [DO NOT MERGE] 
* commit '710a55b419908068529a8e95c4eba88297f67e3f':
  Fix default level flags for bidi. [DO NOT MERGE]
 2014-07-18 21:32:52 +00:00
Deepanshu Gupta
918ca12ffc am 10395cbb: Fix default level flags for bidi. [DO NOT MERGE] 
* commit '10395cbb5cdec35a0ebee1d0b18b58c4803092a1':
  Fix default level flags for bidi. [DO NOT MERGE]
 2014-07-18 21:31:33 +00:00
Deepanshu Gupta
37f54f4c1e am 357ebfc5: Fix default level flags for bidi. [DO NOT MERGE] 
* commit '357ebfc5e43ecb35da9207d78a9a8a6c117a1002':
  Fix default level flags for bidi. [DO NOT MERGE]
 2014-07-18 21:31:26 +00:00
Guang Zhu
f59ce46880 am b477fc6c: Merge "add command to enable bt snoop log" into klp-modular-dev 
* commit 'b477fc6c2fcd04e6952a7eec856d30b64fd95e0c':
  add command to enable bt snoop log
 2014-07-18 03:31:43 +00:00
Justin Koh
a63272b4b5 Merge "Revert "Wait for all windows to draw before turning screen on"" into klp-modular-dev 2014-07-17 21:09:48 +00:00
Justin Koh
528b4b7572 Revert "Wait for all windows to draw before turning screen on" 
This reverts commit 0a589b929e18d05d1345d97283c3025058ddca18.

Change-Id: Ia73555cd7797b5d172f33db9f46ebc211af6fc1e
 2014-07-22 00:26:23 +00:00
Deepanshu Gupta
4627c98da4 Merge "Fix style resolution for styles with '.' [DO NOT MERGE]" into klp-dev 2014-07-17 21:09:48 +00:00
Deepanshu Gupta
5efee91e12 Merge "Fix style resolution for styles with '.' [DO NOT MERGE]" into jb-mr2-dev 2014-07-17 21:09:48 +00:00
Deepanshu Gupta
d3ac01ff76 Merge "Fix style resolution for styles with '.' [DO NOT MERGE]" into jb-mr1.1-dev 2014-07-17 21:04:20 +00:00
Ricardo Cervera
9c36b83519 am 7a425360: am 25303a98: Merge "docs: Fixed RecyclerView example. Bug: 15973665" into klp-modular-docs 
* commit '7a4253608397e647e2f04a1b14d0f02f3d695336':
  docs: Fixed RecyclerView example. Bug: 15973665
 2014-07-17 20:34:58 +00:00
Ricardo Cervera
7a42536083 am 25303a98: Merge "docs: Fixed RecyclerView example. Bug: 15973665" into klp-modular-docs 
* commit '25303a980c026aab3ba0a01ce2a51122eb9982c2':
  docs: Fixed RecyclerView example. Bug: 15973665
 2014-07-17 20:31:01 +00:00
Robert Ly
ee65b63d25 am 049cadd8: am f1b18ded: Merge "docs: Fix typo in Wear docs. Bug: 16327298" into klp-modular-docs 
* commit '049cadd8c965ad69b875cd5ed7768c1b162acb39':
  docs: Fix typo in Wear docs. Bug: 16327298
 2014-07-17 20:30:32 +00:00
Robert Ly
049cadd8c9 am f1b18ded: Merge "docs: Fix typo in Wear docs. Bug: 16327298" into klp-modular-docs 
* commit 'f1b18ded01adf94ee34dbd95a86616d8eadbdf06':
  docs: Fix typo in Wear docs. Bug: 16327298
 2014-07-17 20:27:03 +00:00
Prashant Malani
162d943350 am 9353e1a2: Merge "Make the booting flag update unconditional" into klp-modular-dev 
* commit '9353e1a2b2e8f02377c3f73565964ffb0927c776':
  Make the booting flag update unconditional
 2014-07-17 19:55:32 +00:00
Filip Gruszczynski
bbc499415c am a76164e1: Merge "Only use bottom outset for main display." into klp-modular-dev 
* commit 'a76164e1d0d283baf412c18999e680d93bd50f01':
  Only use bottom outset for main display.
 2014-07-17 19:55:27 +00:00
Guang Zhu
b477fc6c2f Merge "add command to enable bt snoop log" into klp-modular-dev 2014-07-17 19:26:18 +00:00
Guang Zhu
946f207d3d add command to enable bt snoop log 
Change-Id: I22a6482a90c2bb976a5ce44946e9f0fb8b59e6b2
 2014-07-17 20:24:56 -07:00
Scott Rowe
40b5d8a0e5 Merge "cherrypick from klp-docs docs: b/14524668 remove ANDROID_ID Change-Id: I83d4389bb8322c2dbca10042e666fc9b75ea8a12" into klp-modular-docs 2014-07-17 19:20:15 +00:00
Prashant Malani
9353e1a2b2 Merge "Make the booting flag update unconditional" into klp-modular-dev 2014-07-17 18:11:21 +00:00
Robert Ly
f1b18ded01 Merge "docs: Fix typo in Wear docs. Bug: 16327298" into klp-modular-docs 2014-07-17 18:11:21 +00:00
Filip Gruszczynski
a76164e1d0 Merge "Only use bottom outset for main display." into klp-modular-dev 2014-07-17 18:11:21 +00:00
Filip Gruszczynski
b57503c34d Only use bottom outset for main display. 
Change-Id: I42154d026811ee4b7ba9711c560c7a62fcdde7ee
 2014-07-17 11:23:13 -07:00
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