Merge heads

This commit is contained in:
youtaol
2013-07-10 14:19:41 +08:00
parent fd3940fcd0
commit 4debca0054
220 changed files with 359 additions and 293 deletions
+2 -2
View File
@@ -15,6 +15,6 @@ See the License for the specific language governing permissions and
limitations under the License.
-->
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:drawable="@drawable/my_location_pressed" android:state_pressed="true"/>
<item android:drawable="@drawable/my_location_normal"/>
<item android:drawable="@drawable/ic_my_location_pressed" android:state_pressed="true"/>
<item android:drawable="@drawable/ic_my_location"/>
</selector>