Merge "Removing all traces of Market button and TabIndicator" into ub-now-queens
Sunny Goyal
Android (Google) Code Review
|
Before Width: | Height: | Size: 16 KiB |
|
Before Width: | Height: | Size: 147 B |
|
Before Width: | Height: | Size: 148 B |
|
Before Width: | Height: | Size: 231 B |
|
Before Width: | Height: | Size: 147 B |
|
Before Width: | Height: | Size: 146 B |
|
Before Width: | Height: | Size: 153 B |
|
Before Width: | Height: | Size: 244 B |
|
Before Width: | Height: | Size: 145 B |
|
Before Width: | Height: | Size: 9.5 KiB |
|
Before Width: | Height: | Size: 148 B |
|
Before Width: | Height: | Size: 151 B |
|
Before Width: | Height: | Size: 199 B |
|
Before Width: | Height: | Size: 150 B |
|
Before Width: | Height: | Size: 150 B |
|
Before Width: | Height: | Size: 157 B |
|
Before Width: | Height: | Size: 202 B |
|
Before Width: | Height: | Size: 155 B |
|
Before Width: | Height: | Size: 26 KiB |
|
Before Width: | Height: | Size: 147 B |
|
Before Width: | Height: | Size: 153 B |
|
Before Width: | Height: | Size: 210 B |
|
Before Width: | Height: | Size: 147 B |
|
Before Width: | Height: | Size: 148 B |
|
Before Width: | Height: | Size: 166 B |
|
Before Width: | Height: | Size: 228 B |
|
Before Width: | Height: | Size: 149 B |
|
Before Width: | Height: | Size: 35 KiB |
|
Before Width: | Height: | Size: 1.0 KiB |
|
Before Width: | Height: | Size: 1.0 KiB |
|
Before Width: | Height: | Size: 1.0 KiB |
|
Before Width: | Height: | Size: 1.0 KiB |
|
Before Width: | Height: | Size: 1.0 KiB |
|
Before Width: | Height: | Size: 1.0 KiB |
@@ -1,33 +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">
|
||||
<!-- Non focused states -->
|
||||
<item android:state_focused="false" android:state_selected="true" android:state_pressed="false" android:drawable="@drawable/tab_selected_holo" />
|
||||
|
||||
<!-- Focused states -->
|
||||
<item android:state_focused="true" android:state_selected="false" android:state_pressed="false" android:drawable="@drawable/tab_unselected_focused_holo" />
|
||||
<item android:state_focused="true" android:state_selected="true" android:state_pressed="false" android:drawable="@drawable/tab_selected_focused_holo" />
|
||||
|
||||
<!-- Pressed -->
|
||||
<!-- Non focused states -->
|
||||
<item android:state_focused="false" android:state_selected="false" android:state_pressed="true" android:drawable="@drawable/tab_unselected_pressed_holo" />
|
||||
<item android:state_focused="false" android:state_selected="true" android:state_pressed="true" android:drawable="@drawable/tab_selected_pressed_holo" />
|
||||
|
||||
<!-- Focused states -->
|
||||
<item android:state_focused="true" android:state_selected="false" android:state_pressed="true" android:drawable="@drawable/tab_unselected_pressed_focused_holo" />
|
||||
<item android:state_focused="true" android:state_selected="true" android:state_pressed="true" android:drawable="@drawable/tab_selected_pressed_focused_holo" />
|
||||
</selector>
|
||||
@@ -1,36 +0,0 @@
|
||||
<?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.
|
||||
-->
|
||||
<TextView
|
||||
xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
style="@style/MarketButton"
|
||||
android:onClick="onClickAppMarketButton"
|
||||
android:gravity="center"
|
||||
android:paddingLeft="32dp"
|
||||
android:paddingRight="32dp"
|
||||
android:drawablePadding="10dp"
|
||||
android:background="@drawable/tab_widget_indicator_selector"
|
||||
android:text="@string/market"
|
||||
android:contentDescription="@string/market"
|
||||
android:textColor="@color/workspace_all_apps_and_delete_zone_text_color"
|
||||
android:textStyle="bold"
|
||||
android:textSize="14sp"
|
||||
android:textAllCaps="true"
|
||||
android:shadowColor="@color/workspace_all_apps_and_delete_zone_text_shadow_color"
|
||||
android:shadowDx="0.0"
|
||||
android:shadowDy="0.0"
|
||||
android:shadowRadius="2.0"
|
||||
android:focusable="true"
|
||||
android:clickable="true" />
|
||||
@@ -1,30 +0,0 @@
|
||||
<?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.
|
||||
-->
|
||||
<TextView
|
||||
xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
style="@style/MarketButton"
|
||||
android:onClick="onClickAppMarketButton"
|
||||
android:gravity="center"
|
||||
android:paddingLeft="16dp"
|
||||
android:paddingRight="16dp"
|
||||
android:background="@drawable/tab_widget_indicator_selector"
|
||||
android:contentDescription="@string/market"
|
||||
android:shadowColor="@color/workspace_all_apps_and_delete_zone_text_shadow_color"
|
||||
android:shadowDx="0.0"
|
||||
android:shadowDy="0.0"
|
||||
android:shadowRadius="2.0"
|
||||
android:focusable="true"
|
||||
android:clickable="true" />
|
||||
@@ -1,19 +0,0 @@
|
||||
<?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.
|
||||
-->
|
||||
|
||||
<com.android.launcher3.AccessibleTabView
|
||||
xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
style="@style/TabIndicator.AppsCustomize" />
|
||||
@@ -40,9 +40,5 @@
|
||||
<item name="android:shadowRadius">4.0</item>
|
||||
</style>
|
||||
|
||||
<!-- AppsCustomize -->
|
||||
<style name="TabIndicator.AppsCustomize">
|
||||
<item name="android:maxWidth">200dp</item>
|
||||
</style>
|
||||
</resources>
|
||||
|
||||
|
||||
@@ -1,25 +0,0 @@
|
||||
<?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.
|
||||
*/
|
||||
-->
|
||||
|
||||
<resources>
|
||||
<!-- AppsCustomize -->
|
||||
<style name="TabIndicator.AppsCustomize">
|
||||
<item name="android:maxWidth">130dp</item>
|
||||
</style>
|
||||
</resources>
|
||||
@@ -24,9 +24,4 @@
|
||||
<item name="android:paddingTop">@dimen/toolbar_button_vertical_padding</item>
|
||||
<item name="android:paddingBottom">@dimen/toolbar_button_vertical_padding</item>
|
||||
</style>
|
||||
|
||||
<!-- AppsCustomize -->
|
||||
<style name="TabIndicator.AppsCustomize">
|
||||
<item name="android:maxWidth">150dp</item>
|
||||
</style>
|
||||
</resources>
|
||||
|
||||
@@ -1,24 +0,0 @@
|
||||
<?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.
|
||||
*/
|
||||
-->
|
||||
|
||||
<resources>
|
||||
<style name="TabIndicator.AppsCustomize">
|
||||
<item name="android:maxWidth">180dp</item>
|
||||
</style>
|
||||
</resources>
|
||||
@@ -19,13 +19,6 @@
|
||||
|
||||
<resources>
|
||||
<!-- Workspace -->
|
||||
<style name="TabIndicator.AppsCustomize">
|
||||
<item name="android:paddingLeft">32dp</item>
|
||||
<item name="android:paddingRight">32dp</item>
|
||||
<item name="android:textSize">14sp</item>
|
||||
<item name="android:maxWidth">240dp</item>
|
||||
</style>
|
||||
|
||||
<style name="SearchButton">
|
||||
</style>
|
||||
<style name="DropTargetButtonContainer">
|
||||
|
||||
@@ -29,8 +29,6 @@
|
||||
|
||||
<color name="appwidget_error_color">#FCCC</color>
|
||||
|
||||
<color name="workspace_all_apps_and_delete_zone_text_color">#CCFFFFFF</color>
|
||||
<color name="workspace_all_apps_and_delete_zone_text_shadow_color">#A0000000</color>
|
||||
<color name="workspace_icon_text_color">#FFF</color>
|
||||
|
||||
<color name="quantum_panel_text_color">#FF666666</color>
|
||||
|
||||
@@ -54,9 +54,6 @@
|
||||
<!-- AppsCustomize pane -->
|
||||
<!-- Message to tell the user to press and hold on a widget to add it [CHAR_LIMIT=50] -->
|
||||
<string name="long_press_widget_to_add">Touch & hold to pick up a widget.</string>
|
||||
<!-- Market button text. The market button text is removed in Launcher.java
|
||||
in the Phone UI. [CHAR LIMIT=32] -->
|
||||
<string name="market">Shop</string>
|
||||
<!-- The format string for the dimensions of a widget in the drawer -->
|
||||
<!-- There is a special version of this format string for Farsi -->
|
||||
<string name="widget_dims_format">%1$d \u00d7 %2$d</string>
|
||||
|
||||
@@ -78,35 +78,6 @@
|
||||
<item name="android:shadowRadius">4.0</item>
|
||||
</style>
|
||||
|
||||
<style name="TabIndicator">
|
||||
<item name="android:layout_width">wrap_content</item>
|
||||
<item name="android:layout_height">match_parent</item>
|
||||
<item name="android:gravity">center</item>
|
||||
<item name="android:paddingLeft">20dp</item>
|
||||
<item name="android:paddingRight">20dp</item>
|
||||
<item name="android:background">@drawable/tab_widget_indicator_selector</item>
|
||||
<item name="android:textColor">?android:attr/textColorPrimary</item>
|
||||
<item name="android:textSize">12sp</item>
|
||||
<item name="android:textStyle">bold</item>
|
||||
<item name="android:textAllCaps">true</item>
|
||||
<item name="android:singleLine">true</item>
|
||||
<item name="android:ellipsize">end</item>
|
||||
</style>
|
||||
<style name="TabIndicator.AppsCustomize">
|
||||
<!-- Overridden in values-land -->
|
||||
</style>
|
||||
|
||||
<style name="MarketButton">
|
||||
<item name="android:paddingLeft">5dp</item>
|
||||
<item name="android:paddingRight">5dp</item>
|
||||
<item name="android:textColor">@color/workspace_all_apps_and_delete_zone_text_color</item>
|
||||
<item name="android:textSize">18sp</item>
|
||||
<item name="android:shadowColor">@color/workspace_all_apps_and_delete_zone_text_shadow_color</item>
|
||||
<item name="android:shadowDx">0.0</item>
|
||||
<item name="android:shadowDy">0.0</item>
|
||||
<item name="android:shadowRadius">2.0</item>
|
||||
</style>
|
||||
|
||||
<style name="PreloadIcon">
|
||||
<item name="background">@drawable/virtual_preload</item>
|
||||
<item name="indicatorSize">4dp</item>
|
||||
|
||||