Romain Guy
5216c3b05f
Merge more 9patches
...
Change-Id: If8b16af84f0ee42afc406922d15897e51d833e68
2013-06-14 16:31:37 -07:00
Daniel Sandler
756a53f4e4
am 5be52fb5: am a0c9b9d2: Merge "Temporarily restore some support for icon==0 notifications." into jb-mr2-dev
...
* commit '5be52fb5ae462b83b0619b95e7991e52bc2031b2':
Temporarily restore some support for icon==0 notifications.
2013-06-14 13:36:56 -07:00
Daniel Sandler
5be52fb5ae
am a0c9b9d2: Merge "Temporarily restore some support for icon==0 notifications." into jb-mr2-dev
...
* commit 'a0c9b9d2a7a0566615b6b044ac8a6b434c80d5be':
Temporarily restore some support for icon==0 notifications.
2013-06-14 13:34:55 -07:00
Daniel Sandler
a0c9b9d2a7
Merge "Temporarily restore some support for icon==0 notifications." into jb-mr2-dev
2013-06-14 20:29:24 +00:00
John Spurlock
74a7dd7a26
Merge "Remove unused status_bar_icon.xml"
2013-06-14 19:55:18 +00:00
John Spurlock
e91322c2a5
Remove unused status_bar_icon.xml
...
Change-Id: I9d665203712d4865f5aa788600c89fbc876b14dd
2013-06-14 15:40:51 -04:00
Scott Main
18ec6af4fa
am 478471b5: am 3b0205b7: am 0b3fe078: am a17201a8: am 7190a059: fix transition from download to install instructions
...
* commit '478471b579c221d371b3227abd02cb24eff995e1':
fix transition from download to install instructions
2013-06-14 11:08:34 -07:00
Scott Main
478471b579
am 3b0205b7: am 0b3fe078: am a17201a8: am 7190a059: fix transition from download to install instructions
...
* commit '3b0205b7601a6fa3d7abf6dbc5a60223981103cc':
fix transition from download to install instructions
2013-06-14 11:07:21 -07:00
Scott Main
3b0205b760
am 0b3fe078: am a17201a8: am 7190a059: fix transition from download to install instructions
...
* commit '0b3fe0785c0c6ff0ce834c06b6828f884a658730':
fix transition from download to install instructions
2013-06-14 11:02:41 -07:00
Scott Main
0b3fe0785c
am a17201a8: am 7190a059: fix transition from download to install instructions
...
* commit 'a17201a81691ac337426923d1bdcf9e0a26b841e':
fix transition from download to install instructions
2013-06-14 10:56:28 -07:00
Scott Main
a17201a816
am 7190a059: fix transition from download to install instructions
...
* commit '7190a05951efa4f5cf94bb22da48dce85c52bd06':
fix transition from download to install instructions
2013-06-14 10:53:45 -07:00
Scott Main
7190a05951
fix transition from download to install instructions
...
Change-Id: Ibb06779891ffab2c213b7c3401293e6fb7a6c4c9
2013-06-14 10:51:29 -07:00
John Spurlock
b2b433689a
Merge "Remove concept of system bar from window manager."
2013-06-14 17:50:51 +00:00
Scott Main
5f73a7df6d
am 0be889dd: am 6e594289: am d2ad6dc5: am 6af13a74: am ec025db4: change studio version number to use \'x\' for final decimal. also go to install guide after download begins
...
* commit '0be889dd0e5605fa0abc04ebdd732a297de6ab27':
change studio version number to use 'x' for final decimal. also go to install guide after download begins
2013-06-14 10:28:00 -07:00
Scott Main
0be889dd0e
am 6e594289: am d2ad6dc5: am 6af13a74: am ec025db4: change studio version number to use \'x\' for final decimal. also go to install guide after download begins
...
* commit '6e5942894a40ed2a199f25bf4e8a215c95d2c79b':
change studio version number to use 'x' for final decimal. also go to install guide after download begins
2013-06-14 10:25:38 -07:00
John Spurlock
80f00c1f23
Remove concept of system bar from window manager.
...
It was already hardcoded to false, this change removes the dead code.
Change-Id: I5e543344e60f69cb9882a70ba29f7c09404ad9fc
2013-06-14 13:20:17 -04:00
Scott Main
6e5942894a
am d2ad6dc5: am 6af13a74: am ec025db4: change studio version number to use \'x\' for final decimal. also go to install guide after download begins
...
* commit 'd2ad6dc5304e5c3a4f0dc1bd04f7ab713ed66c6d':
change studio version number to use 'x' for final decimal. also go to install guide after download begins
2013-06-14 10:16:02 -07:00
Scott Main
d2ad6dc530
am 6af13a74: am ec025db4: change studio version number to use \'x\' for final decimal. also go to install guide after download begins
...
* commit '6af13a74d3dcf56187edf153e0341221faf9f1ad':
change studio version number to use 'x' for final decimal. also go to install guide after download begins
2013-06-14 10:12:30 -07:00
Scott Main
6af13a74d3
am ec025db4: change studio version number to use \'x\' for final decimal. also go to install guide after download begins
...
* commit 'ec025db4a74914640c42412c63413f2d5d46e45d':
change studio version number to use 'x' for final decimal. also go to install guide after download begins
2013-06-14 10:09:12 -07:00
Marco Nelissen
22682a5a38
Merge "Make MediaPlayer.invoke() public-and-hidden again"
2013-06-14 16:49:18 +00:00
Marco Nelissen
2d2cd32cc7
Make MediaPlayer.invoke() public-and-hidden again
...
It's used in a bunch of other places in other repos that I don't
want to touch.
Change-Id: I6f2ec6f8066286de9b52499fc71f3f08953c3cb4
2013-06-14 09:47:27 -07:00
Dirk Dougherty
10159423d5
am b5de95d1: am f1d2c5ae: Merge "Doc change: diffs for API 18" into jb-mr2-dev
...
* commit 'b5de95d1f8e17836098229f675bf5d53a8327757':
Doc change: diffs for API 18
2013-06-14 09:31:51 -07:00
Dirk Dougherty
b5de95d1f8
am f1d2c5ae: Merge "Doc change: diffs for API 18" into jb-mr2-dev
...
* commit 'f1d2c5aeb23739bde3708f4e4d4bdb99f059f1ed':
Doc change: diffs for API 18
2013-06-14 09:29:50 -07:00
Dirk Dougherty
f1d2c5aeb2
Merge "Doc change: diffs for API 18" into jb-mr2-dev
2013-06-14 16:23:12 +00:00
Marco Nelissen
47a6eb9ed5
Merge "Forgot something"
2013-06-14 16:19:29 +00:00
Marco Nelissen
85c28e8183
Forgot something
...
Change-Id: Ia579213303e79b282a7ba472b39576d4b160a739
2013-06-14 09:18:35 -07:00
Marco Nelissen
25ccf538c7
Merge "Fix build"
2013-06-14 16:15:47 +00:00
Marco Nelissen
c2f9024b13
Fix build
...
We don't need a separate test for invoke() because there are other
tests that exercise it.
Change-Id: I8c8f3593e7e9eed3c53997453f0f66ba8374e79e
2013-06-14 09:14:28 -07:00
Scott Main
d2e2cc99d0
am 695be87d: am 92053f8b: revise docs for new sensor types. fix markup error causing tons of code font
...
* commit '695be87d6e87fada03b548d05f82e004d0cdb240':
revise docs for new sensor types. fix markup error causing tons of code font
2013-06-14 09:11:41 -07:00
Scott Main
695be87d6e
am 92053f8b: revise docs for new sensor types. fix markup error causing tons of code font
...
* commit '92053f8b28ce0d035d292fa73622200990682511':
revise docs for new sensor types. fix markup error causing tons of code font
2013-06-14 08:45:20 -07:00
Marco Nelissen
99dae981dc
Merge "Remove unused MediaPlayer methods"
2013-06-14 15:00:43 +00:00
Adam Powell
77b7c33a7a
Merge "Don't save ScrollView/HorizontalScrollView saved state for old apps"
2013-06-14 01:28:25 +00:00
Chris Craik
d1f9aaa5d7
Merge "Fix various draw ops that may incorrectly not scissor"
2013-06-14 01:06:30 +00:00
Adam Powell
90f339a5a3
Don't save ScrollView/HorizontalScrollView saved state for old apps
...
Older apps may have given IDs to ScrollViews and views of a different
class in layouts that vary by configuration. Now that ScrollViews save
state this causes ClassCastExceptions when trying to restore instance
state.
Only save new instance state for ScrollView/HorizontalScrollView for
apps targeting post-API 18.
Change-Id: Icaa095cd20bef35dddc225a17c5a8e30b3faea02
2013-06-13 17:44:04 -07:00
Scott Main
92053f8b28
revise docs for new sensor types. fix markup error causing tons of code font
...
Change-Id: I7635bbc44e03b50faeddf5c5fe50f7f47e2cde35
2013-06-13 16:37:51 -07:00
Dirk Dougherty
4c43ec639b
Doc change: diffs for API 18
...
Change-Id: I92d9880959e18bb0cffa68a05a042de6d5790aa4
2013-06-13 16:33:04 -07:00
Geremy Condra
e08d54b92e
Merge "Add NetworkManagement methods for netd uid binds"
2013-06-13 23:30:49 +00:00
Chris Craik
39a908c1df
Fix various draw ops that may incorrectly not scissor
...
bug:8965976
Also consolidates quickReject scissor-ing and scissor-less paths.
Renamed plain 'quickReject' method, as it has sideEffects beyond what
the java and skia canvases do.
Change-Id: I4bdf874d3c8f469d283eae1e71c5e7ea53d47016
2013-06-13 16:16:13 -07:00
Alan Viverette
256a5f8cda
Merge "Postpone creating new drawables for DrawableContainerState."
2013-06-13 23:03:03 +00:00
Romain Guy
4969fecf07
Merge "Fix possible NPE when a ViewRoot doesn't have a view"
2013-06-13 22:27:26 +00:00
Romain Guy
70d4c5a0fe
Fix possible NPE when a ViewRoot doesn't have a view
...
Change-Id: I8f76a657fa44fc5c7e0bec3e609eaf49e269910f
2013-06-13 15:26:50 -07:00
Marco Nelissen
3e72eb5245
Remove unused MediaPlayer methods
...
Change-Id: Id63fdde7d0e4f096d3bb9eb4da5e0f37eb9dea21
2013-06-13 15:25:25 -07:00
Alan Viverette
f390f770ee
Postpone creating new drawables for DrawableContainerState.
...
When creating a DrawableContainerState from a constant state, calls to
ConstantState.newDrawable() are postponed and made as they are needed.
Bug: 9280861
Change-Id: I03c93a43ee00aca3ff618d66d7f507f1722538d1
2013-06-13 15:11:16 -07:00
Romain Guy
735760e3c2
Merge "Add new Query class for debugging"
2013-06-13 22:10:22 +00:00
Scott Main
ec025db4a7
change studio version number to use 'x' for final decimal.
...
also go to install guide after download begins
Change-Id: I9ec266b20585c00cf5a643fede2df64eb2066ebc
2013-06-13 15:00:43 -07:00
Romain Guy
7f4307668b
Add new Query class for debugging
...
This class can be used to perform occlusion queries. An occlusion query
can be used to test whether an object is entirely hidden or not.
Change-Id: Ida456df81dbe008a64d3ff4cb7879340785c6abf
2013-06-13 14:58:32 -07:00
Scott Main
539d270516
am 11caa0b6: am f52532de: am cb2a8505: am 695896a4: am 46c8931f: Merge "add ninepatch search tag" into jb-mr1.1-ub-dev
...
* commit '11caa0b6d9202e27e24daf6cef030ec9599f7af4':
add ninepatch search tag
2013-06-13 14:58:16 -07:00
Scott Main
11caa0b6d9
am f52532de: am cb2a8505: am 695896a4: am 46c8931f: Merge "add ninepatch search tag" into jb-mr1.1-ub-dev
...
* commit 'f52532de2a3da2f41ddc28e25d2883d45f189018':
add ninepatch search tag
2013-06-13 14:56:03 -07:00
Scott Main
f52532de2a
am cb2a8505: am 695896a4: am 46c8931f: Merge "add ninepatch search tag" into jb-mr1.1-ub-dev
...
* commit 'cb2a85058e24ecd35349b5470e402bcb52df2d6b':
add ninepatch search tag
2013-06-13 14:54:48 -07:00
Scott Main
cb2a85058e
am 695896a4: am 46c8931f: Merge "add ninepatch search tag" into jb-mr1.1-ub-dev
...
* commit '695896a46578e7ad4e540151e799a9f0b8828ad1':
add ninepatch search tag
2013-06-13 14:51:47 -07:00