Alan Viverette
519494e207
Add support for using ColorStateList in GradientDrawable
...
BUG: 11373225
Change-Id: Ie62f1546e8694822aadafe9ef1e57ce458a363d6
2013-10-28 13:15:39 -07:00
Jean-Michel Trivi
e38b99504d
am 6a3bfe07: am 9c267f8d: am 5504537e: Merge "Missing LoudnessEnhancer constructor and UUID in public API" into klp-dev
...
* commit '6a3bfe0796f09114c834dab34b7f5b62a549e51c':
Missing LoudnessEnhancer constructor and UUID in public API
2013-10-24 16:49:59 -07:00
Jean-Michel Trivi
6a3bfe0796
am 9c267f8d: am 5504537e: Merge "Missing LoudnessEnhancer constructor and UUID in public API" into klp-dev
...
* commit '9c267f8d70892dc43f24a57ea406b89a36a4d124':
Missing LoudnessEnhancer constructor and UUID in public API
2013-10-24 16:46:47 -07:00
Jean-Michel Trivi
9c267f8d70
am 5504537e: Merge "Missing LoudnessEnhancer constructor and UUID in public API" into klp-dev
...
* commit '5504537e74571fc23a1ff029cf8645f07805a1f2':
Missing LoudnessEnhancer constructor and UUID in public API
2013-10-24 16:44:24 -07:00
Jean-Michel Trivi
5504537e74
Merge "Missing LoudnessEnhancer constructor and UUID in public API" into klp-dev
2013-10-24 23:42:13 +00:00
Adam Powell
75c74a4098
am c3661b16: am 1fcdee0d: am 92da1779: Merge "Fix bug in Scene\'s use of setTag" into klp-dev
...
* commit 'c3661b169876bf094f09f69f40349b598bf3a745':
Fix bug in Scene's use of setTag
2013-10-24 16:28:02 -07:00
Erin Dahlgren
a1685b1914
Merge branch 'master' of https://googleplex-android.googlesource.com/_direct/platform/frameworks/base
2013-10-24 16:28:02 -07:00
Erin Dahlgren
e9e31f895e
am b9705893: am 204b1e28: am fe470c37: Merge "Have the package manager write mimetype of preferred activities to xml." into klp-dev
...
* commit 'b970589321c1d398da9ae4e78c44e122a22a8365':
Have the package manager write mimetype of preferred activities to xml.
2013-10-24 16:27:56 -07:00
Nick Kralevich
250dc1a8ad
Merge "fix javadocs."
2013-10-24 23:27:55 +00:00
Adam Powell
c3661b1698
am 1fcdee0d: am 92da1779: Merge "Fix bug in Scene\'s use of setTag" into klp-dev
...
* commit '1fcdee0d4e907a2391362089cb10fb7053230a88':
Fix bug in Scene's use of setTag
2013-10-24 16:26:06 -07:00
Erin Dahlgren
b970589321
am 204b1e28: am fe470c37: Merge "Have the package manager write mimetype of preferred activities to xml." into klp-dev
...
* commit '204b1e2817f3abb7946d9254cca666d2da1e4f7c':
Have the package manager write mimetype of preferred activities to xml.
2013-10-24 16:25:59 -07:00
Adam Powell
1fcdee0d4e
am 92da1779: Merge "Fix bug in Scene\'s use of setTag" into klp-dev
...
* commit '92da1779a932aed9c6ce32c117d0334f8d6a7273':
Fix bug in Scene's use of setTag
2013-10-24 16:23:38 -07:00
Erin Dahlgren
204b1e2817
am fe470c37: Merge "Have the package manager write mimetype of preferred activities to xml." into klp-dev
...
* commit 'fe470c37deda6b1d51b0a208ae31e101e90c7e1b':
Have the package manager write mimetype of preferred activities to xml.
2013-10-24 16:23:34 -07:00
Nick Kralevich
eb337054ed
fix javadocs.
...
Change-Id: Ie008e28db0d3de22c933b4ef1ccbd3f082010a77
2013-10-24 16:22:12 -07:00
Adam Powell
92da1779a9
Merge "Fix bug in Scene's use of setTag" into klp-dev
2013-10-24 23:21:57 +00:00
Erin Dahlgren
fe470c37de
Merge "Have the package manager write mimetype of preferred activities to xml." into klp-dev
2013-10-24 23:21:16 +00:00
Adam Powell
f3c1577212
Fix bug in Scene's use of setTag
...
setTagInternal must be used for framework resource IDs.
Bug 11374402
Change-Id: If4d256dbf05055dac70796edd8d7b94bf65d947d
2013-10-24 16:01:34 -07:00
Jeff Sharkey
9748fe9ad1
am a5d24638: am 180e484e: am be416248: Merge "Remove persisted stacks when app removed/cleared." into klp-dev
...
* commit 'a5d24638f62b7bd5bdd7ec9d8ce14bccb21c3f47':
Remove persisted stacks when app removed/cleared.
2013-10-24 15:44:01 -07:00
Jeff Sharkey
a5d24638f6
am 180e484e: am be416248: Merge "Remove persisted stacks when app removed/cleared." into klp-dev
...
* commit '180e484ef0370ab7f796c8fa51baf6b4c1c2cbdc':
Remove persisted stacks when app removed/cleared.
2013-10-24 15:40:15 -07:00
Jeff Sharkey
180e484ef0
am be416248: Merge "Remove persisted stacks when app removed/cleared." into klp-dev
...
* commit 'be416248631c001b846297597b25be9bccc960eb':
Remove persisted stacks when app removed/cleared.
2013-10-24 15:37:45 -07:00
Jeff Sharkey
be41624863
Merge "Remove persisted stacks when app removed/cleared." into klp-dev
2013-10-24 22:32:58 +00:00
Erin Dahlgren
707a59dc9a
Have the package manager write mimetype of preferred activities to xml.
...
Issue: 11372979
Change-Id: I5ea4e94c978845426e2650946d0bba076d161c19
2013-10-24 15:13:39 -07:00
Craig Mautner
c031363cbd
am 6f90587e: am 052f7f0d: am 7c2a2ef2: Merge "Track window position with task position." into klp-dev
...
* commit '6f90587eecd8e3970c7a87cf72512ae21c0a039b':
Track window position with task position.
2013-10-24 14:36:53 -07:00
Craig Mautner
6f90587eec
am 052f7f0d: am 7c2a2ef2: Merge "Track window position with task position." into klp-dev
...
* commit '052f7f0d4e57aa4bbdffd82749ef528f62570517':
Track window position with task position.
2013-10-24 14:31:45 -07:00
Craig Mautner
052f7f0d4e
am 7c2a2ef2: Merge "Track window position with task position." into klp-dev
...
* commit '7c2a2ef2ee71d65ac43acf3dad95df1629dfc674':
Track window position with task position.
2013-10-24 14:28:41 -07:00
Craig Mautner
7c2a2ef2ee
Merge "Track window position with task position." into klp-dev
2013-10-24 21:26:11 +00:00
Christopher Tate
c93af316e8
am a8eb5071: am 525322ec: am f9f740da: Merge "Support different watchdog timeouts for different entities" into klp-dev
...
* commit 'a8eb5071d20b8b9aac924753c997f28c7e9dcbb0':
Support different watchdog timeouts for different entities
2013-10-24 14:00:45 -07:00
Christopher Tate
a8eb5071d2
am 525322ec: am f9f740da: Merge "Support different watchdog timeouts for different entities" into klp-dev
...
* commit '525322ecbab1502586d378e7065edc402abc63bf':
Support different watchdog timeouts for different entities
2013-10-24 13:58:07 -07:00
Christopher Tate
525322ecba
am f9f740da: Merge "Support different watchdog timeouts for different entities" into klp-dev
...
* commit 'f9f740dae19a63deb92c6bbe5ebeab8c852910a7':
Support different watchdog timeouts for different entities
2013-10-24 13:55:09 -07:00
Christopher Tate
f9f740dae1
Merge "Support different watchdog timeouts for different entities" into klp-dev
2013-10-24 20:52:23 +00:00
Aravind Akella
62c49dffde
am 11e0c0e6: am 1ba90786: am 28e26eb3: Merge "Fix for ClassCastException in SystemSensorManager." into klp-dev
...
* commit '11e0c0e63c70f8bdfb416661a56663a2da426f41':
Fix for ClassCastException in SystemSensorManager.
2013-10-24 12:48:54 -07:00
Craig Mautner
77df2ee9de
Track window position with task position.
...
Windows were previously ordered by TaskStack/ActivityStack order. This
change provides a data structure in DisplayContent that tracks task
movement. Previously Recents and Home activity windows were always
adjacent because they were on the same stack. With this change windows
from other activities can be placed between the two.
Fixes bug 11338594.
Change-Id: Ie34443ff22f330d015141d97db79370c54920d28
2013-10-24 12:47:07 -07:00
Aravind Akella
11e0c0e63c
am 1ba90786: am 28e26eb3: Merge "Fix for ClassCastException in SystemSensorManager." into klp-dev
...
* commit '1ba907867d299cb76317c510a2802189f51ce5f6':
Fix for ClassCastException in SystemSensorManager.
2013-10-24 12:43:12 -07:00
Amith Yamasani
34cafa4b9a
am 8e4457b0: am d58317b2: am 368daafc: Merge "Only simulate the first click if "Always use" button is available" into klp-dev
...
* commit '8e4457b05e854b9dd6f81a8d5b123e810e079749':
Only simulate the first click if "Always use" button is available
2013-10-24 12:40:14 -07:00
Jeff Sharkey
36dcadf070
am 909924de: am 8dd4c1d0: am 5ecfb557: Merge "Long-press on GET_CONTENT app shows its details." into klp-dev
...
* commit '909924de9fcf45b5d08e5d2b6b0301e7e0707d47':
Long-press on GET_CONTENT app shows its details.
2013-10-24 12:40:10 -07:00
Jeff Sharkey
8e0164c566
am 46106ca2: am 686fa2db: am c832ef0d: Merge "Show spinner while waiting for mutations." into klp-dev
...
* commit '46106ca28e8a679ce2f0609d03ae6ba4b95d7f30':
Show spinner while waiting for mutations.
2013-10-24 12:40:07 -07:00
Aravind Akella
1ba907867d
am 28e26eb3: Merge "Fix for ClassCastException in SystemSensorManager." into klp-dev
...
* commit '28e26eb38d38c5058006f90d5a22347e6186532e':
Fix for ClassCastException in SystemSensorManager.
2013-10-24 12:36:50 -07:00
Amith Yamasani
8e4457b05e
am d58317b2: am 368daafc: Merge "Only simulate the first click if "Always use" button is available" into klp-dev
...
* commit 'd58317b2824656727b24f0b4c99e091954d05125':
Only simulate the first click if "Always use" button is available
2013-10-24 12:35:37 -07:00
Jeff Sharkey
909924de9f
am 8dd4c1d0: am 5ecfb557: Merge "Long-press on GET_CONTENT app shows its details." into klp-dev
...
* commit '8dd4c1d062bfcfd46c48e568870856787852124c':
Long-press on GET_CONTENT app shows its details.
2013-10-24 12:35:26 -07:00
Jeff Sharkey
46106ca28e
am 686fa2db: am c832ef0d: Merge "Show spinner while waiting for mutations." into klp-dev
...
* commit '686fa2db5b8feeb9e378aeb8e5dbac2f79ef2153':
Show spinner while waiting for mutations.
2013-10-24 12:35:22 -07:00
Craig Mautner
641089b69b
am 1a529dda: am bcd68186: am d0d23f6a: Merge "Disable time consuming debugging code." into klp-dev
...
* commit '1a529ddaa71a3dfa50586a145ebfa502bea85e1d':
Disable time consuming debugging code.
2013-10-24 12:32:48 -07:00
Amith Yamasani
d58317b282
am 368daafc: Merge "Only simulate the first click if "Always use" button is available" into klp-dev
...
* commit '368daafc34de1a7831d485b6a06fbe0d6bcf1cd4':
Only simulate the first click if "Always use" button is available
2013-10-24 12:32:47 -07:00
Aravind Akella
28e26eb38d
Merge "Fix for ClassCastException in SystemSensorManager." into klp-dev
2013-10-24 19:32:01 +00:00
Amith Yamasani
368daafc34
Merge "Only simulate the first click if "Always use" button is available" into klp-dev
2013-10-24 19:21:12 +00:00
Jeff Sharkey
8dd4c1d062
am 5ecfb557: Merge "Long-press on GET_CONTENT app shows its details." into klp-dev
...
* commit '5ecfb557b1d38537b7a484505b550000980d17f1':
Long-press on GET_CONTENT app shows its details.
2013-10-24 12:15:40 -07:00
Craig Mautner
1a529ddaa7
am bcd68186: am d0d23f6a: Merge "Disable time consuming debugging code." into klp-dev
...
* commit 'bcd681862d819cf31d6de4abe36379e70d1077f5':
Disable time consuming debugging code.
2013-10-24 12:15:40 -07:00
Jeff Sharkey
686fa2db5b
am c832ef0d: Merge "Show spinner while waiting for mutations." into klp-dev
...
* commit 'c832ef0d434f9c3834ef312dcabef43b2787e5ff':
Show spinner while waiting for mutations.
2013-10-24 12:15:37 -07:00
Adam Lesinski
f8f2f8b03f
am 1a8b416b: am 9137b65c: am bb8aae5b: Merge "Improve Jank for translucent activities" into klp-dev
...
* commit '1a8b416b7b93f3602c3666bfc1f9cb67359f4c0e':
Improve Jank for translucent activities
2013-10-24 11:42:30 -07:00
Jeff Sharkey
5ecfb557b1
Merge "Long-press on GET_CONTENT app shows its details." into klp-dev
2013-10-24 18:23:17 +00:00
Jeff Sharkey
c832ef0d43
Merge "Show spinner while waiting for mutations." into klp-dev
2013-10-24 18:23:11 +00:00