asset drop & naming
drop in new assets
get naming in sync with UX
Note: not all resources are included yet
item_background...xm will be enabled when all required resources come in
Change-Id: I321084abd25ef6c533f1f3da636a246e7ee00547
diff --git a/res/drawable/browser_bookmark_tab.xml b/res/drawable/browser_bookmark_tab.xml
deleted file mode 100644
index 49b66c7..0000000
--- a/res/drawable/browser_bookmark_tab.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2009 The Android Open Source Project
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- 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:state_selected="true" android:drawable="@drawable/ic_tab_bookmarks_selected"/>
- <item android:state_selected="false" android:drawable="@drawable/ic_tab_bookmarks_unselected"/>
-</selector>
-
diff --git a/res/drawable/browser_history_tab.xml b/res/drawable/browser_history_tab.xml
deleted file mode 100644
index 1fbd0ce..0000000
--- a/res/drawable/browser_history_tab.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2009 The Android Open Source Project
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- 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:state_selected="true" android:drawable="@drawable/ic_tab_history_selected"/>
- <item android:state_selected="false" android:drawable="@drawable/ic_tab_history_unselected"/>
-</selector>
-
diff --git a/res/drawable/browser_visited_tab.xml b/res/drawable/browser_visited_tab.xml
deleted file mode 100644
index b9d6eb7..0000000
--- a/res/drawable/browser_visited_tab.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2009 The Android Open Source Project
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- 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:state_selected="true" android:drawable="@drawable/ic_tab_most_visited_selected"/>
- <item android:state_selected="false" android:drawable="@drawable/ic_tab_most_visited_unselected"/>
-</selector>
-
diff --git a/res/drawable/browserbarbutton.xml b/res/drawable/browserbarbutton.xml
deleted file mode 100644
index d3eebbe..0000000
--- a/res/drawable/browserbarbutton.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2010 The Android Open Source Project
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- 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:state_pressed="true"
- android:drawable="@drawable/ic_pressed" />
- <item android:state_pressed="false" android:drawable="@drawable/clear" />
-</selector>
diff --git a/res/drawable/btn_checkbox_star.xml b/res/drawable/btn_checkbox_star.xml
index 9635dad..08a8699 100644
--- a/res/drawable/btn_checkbox_star.xml
+++ b/res/drawable/btn_checkbox_star.xml
@@ -16,7 +16,7 @@
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:state_checked="true"
- android:drawable="@drawable/ic_favorite_on_normal" />
+ android:drawable="@drawable/ic_bookmark_on_holo_dark" />
<item android:state_checked="false"
- android:drawable="@drawable/ic_favorite_off_normal" />
+ android:drawable="@drawable/ic_bookmark_off_holo_dark" />
</selector>
diff --git a/res/drawable/btn_imageview_star.xml b/res/drawable/btn_imageview_star.xml
index 4c3d145..c1bfb5d 100644
--- a/res/drawable/btn_imageview_star.xml
+++ b/res/drawable/btn_imageview_star.xml
@@ -16,7 +16,7 @@
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:state_activated="true"
- android:drawable="@drawable/ic_favorite_on_normal" />
+ android:drawable="@drawable/ic_bookmark_on_holo_dark" />
<item android:state_activated="false"
- android:drawable="@drawable/ic_favorite_off_normal" />
+ android:drawable="@drawable/ic_bookmark_off_holo_dark" />
</selector>
diff --git a/res/drawable/ic_menu_incognito.png b/res/drawable/ic_menu_incognito.png
deleted file mode 100644
index d5a7022..0000000
--- a/res/drawable/ic_menu_incognito.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable/item_background_holo_dark.xm b/res/drawable/item_background_holo_dark.xm
new file mode 100644
index 0000000..d5fa3c0
--- /dev/null
+++ b/res/drawable/item_background_holo_dark.xm
@@ -0,0 +1,49 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2011 The Android Open Source Project
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+
+<selector
+ xmlns:android="http://schemas.android.com/apk/res/android"
+ android:exitFadeDuration="@android:integer/config_mediumAnimTime">
+ <item
+ android:state_window_focused="false"
+ android:drawable="@color/transparent" />
+ <!--
+ Even though these two point to the same resource, have two states so the
+ drawable will invalidate itself when coming out of pressed state.
+ -->
+ <item
+ android:state_focused="true"
+ android:state_enabled="false"
+ android:state_pressed="true"
+ android:drawable="@drawable/list_selector_disabled_holo_dark" />
+ <item
+ android:state_focused="true"
+ android:state_enabled="false"
+ android:drawable="@drawable/list_selector_disabled_holo_dark" />
+ <item
+ android:state_focused="true"
+ android:state_pressed="true"
+ android:drawable="@drawable/list_selector_background_transition_holo_dark" />
+ <item
+ android:state_focused="false"
+ android:state_pressed="true"
+ android:drawable="@drawable/list_selector_background_transition_holo_dark" />
+ <item
+ android:state_focused="true"
+ android:drawable="@drawable/list_focused_holo" />
+ <item
+ android:drawable="@color/transparent" />
+</selector>
\ No newline at end of file
diff --git a/res/drawable/suggest_item_selector.xml b/res/drawable/suggest_item_selector.xml
index 1184e5b..301584f 100644
--- a/res/drawable/suggest_item_selector.xml
+++ b/res/drawable/suggest_item_selector.xml
@@ -17,6 +17,6 @@
<selector xmlns:android="http://schemas.android.com/apk/res/android"
android:exitFadeDuration="@android:integer/config_mediumAnimTime">
<item android:state_pressed="true"
- android:drawable="@drawable/suggest_item_press_holo" />
+ android:drawable="@drawable/row_activated_bookmark_widget_holo" />
<item android:state_pressed="false" android:drawable="@drawable/clear" />
</selector>
diff --git a/res/drawable/tab_background.xml b/res/drawable/tab_background.xml
deleted file mode 100644
index 6fc3ee3..0000000
--- a/res/drawable/tab_background.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2010 The Android Open Source Project
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- 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:state_activated="true"
- android:drawable="@drawable/tab_selected_bg" />
- <item
- android:state_activated="false"
- android:drawable="@drawable/tab_unselected_bg">
- </item>
-</selector>
