diff options
-rw-r--r-- | res/layout-large/customize_tab_widget_indicator.xml | 19 | ||||
-rw-r--r-- | res/values-large-port/styles.xml | 28 | ||||
-rw-r--r-- | res/values-large/styles.xml | 11 | ||||
-rw-r--r-- | res/values-xlarge/styles.xml | 23 | ||||
-rw-r--r-- | src/com/android/launcher2/CustomizeTrayTabHost.java | 15 |
5 files changed, 91 insertions, 5 deletions
diff --git a/res/layout-large/customize_tab_widget_indicator.xml b/res/layout-large/customize_tab_widget_indicator.xml new file mode 100644 index 000000000..39f0867e1 --- /dev/null +++ b/res/layout-large/customize_tab_widget_indicator.xml @@ -0,0 +1,19 @@ +<?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. +--> + +<TextView + xmlns:android="http://schemas.android.com/apk/res/android" + style="@style/CustomizeTabIndicator.Wide" /> diff --git a/res/values-large-port/styles.xml b/res/values-large-port/styles.xml new file mode 100644 index 000000000..ba23a89d3 --- /dev/null +++ b/res/values-large-port/styles.xml @@ -0,0 +1,28 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- +/* +* Copyright (C) 2008 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="CustomizeTabIndicator.Wide" parent="TabIndicator.Wide"> + <item name="android:paddingLeft">20dp</item> + <item name="android:paddingRight">20dp</item> + <item name="android:paddingTop">12dp</item> + <item name="android:paddingBottom">16dp</item> + <item name="android:textSize">16sp</item> + </style> +</resources> diff --git a/res/values-large/styles.xml b/res/values-large/styles.xml index 7208d979f..266a01e53 100644 --- a/res/values-large/styles.xml +++ b/res/values-large/styles.xml @@ -41,4 +41,15 @@ <item name="android:paddingTop">0dip</item> <item name="android:includeFontPadding">false</item> </style> + + <style name="TabIndicator.Wide"> + <item name="android:paddingLeft">40dp</item> + <item name="android:paddingRight">40dp</item> + <item name="android:paddingTop">15dp</item> + <item name="android:paddingBottom">20dp</item> + <item name="android:textSize">20sp</item> + </style> + + <style name="CustomizeTabIndicator.Wide" parent="TabIndicator.Wide"> + </style> </resources> diff --git a/res/values-xlarge/styles.xml b/res/values-xlarge/styles.xml new file mode 100644 index 000000000..fdf2f1970 --- /dev/null +++ b/res/values-xlarge/styles.xml @@ -0,0 +1,23 @@ +<?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="CustomizeTabIndicator.Wide" parent="TabIndicator.Wide"> + </style> +</resources> diff --git a/src/com/android/launcher2/CustomizeTrayTabHost.java b/src/com/android/launcher2/CustomizeTrayTabHost.java index b6c55f8b7..e1ba700ae 100644 --- a/src/com/android/launcher2/CustomizeTrayTabHost.java +++ b/src/com/android/launcher2/CustomizeTrayTabHost.java @@ -74,18 +74,23 @@ public class CustomizeTrayTabHost extends TabHost implements LauncherTransitiona TextView tabView; TabWidget tabWidget = (TabWidget) findViewById(com.android.internal.R.id.tabs); - tabView = (TextView) mInflater.inflate(R.layout.tab_widget_indicator, tabWidget, false); + tabView = (TextView) mInflater.inflate( + R.layout.customize_tab_widget_indicator, tabWidget, false); tabView.setText(mContext.getString(R.string.widgets_tab_label)); - addTab(newTabSpec(WIDGETS_TAG).setIndicator(tabView).setContent(contentFactory)); - tabView = (TextView) mInflater.inflate(R.layout.tab_widget_indicator, tabWidget, false); + addTab(newTabSpec(WIDGETS_TAG) + .setIndicator(tabView).setContent(contentFactory)); + tabView = (TextView) mInflater.inflate( + R.layout.customize_tab_widget_indicator, tabWidget, false); tabView.setText(mContext.getString(R.string.applications_tab_label)); addTab(newTabSpec(APPLICATIONS_TAG) .setIndicator(tabView).setContent(contentFactory)); - tabView = (TextView) mInflater.inflate(R.layout.tab_widget_indicator, tabWidget, false); + tabView = (TextView) mInflater.inflate( + R.layout.customize_tab_widget_indicator, tabWidget, false); tabView.setText(mContext.getString(R.string.wallpapers_tab_label)); addTab(newTabSpec(WALLPAPERS_TAG) .setIndicator(tabView).setContent(contentFactory)); - tabView = (TextView) mInflater.inflate(R.layout.tab_widget_indicator, tabWidget, false); + tabView = (TextView) mInflater.inflate( + R.layout.customize_tab_widget_indicator, tabWidget, false); tabView.setText(mContext.getString(R.string.shortcuts_tab_label)); addTab(newTabSpec(SHORTCUTS_TAG) .setIndicator(tabView).setContent(contentFactory)); |