PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Apps tabs align to title on 2-pane settings." into jb-dev

Browse Source
This commit is contained in:
Amith Yamasani
2012-05-09 13:30:48 -07:00
committed by Android (Google) Code Review
parent fc363380c2 f0b05de3e0
commit 48c72676b3
7 changed files with 25 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
res/layout-h720dp/tab_widget.xml → res/layout-sw720dp/tab_widget.xml
View File

@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- Copyright (C) 2011 The Android Open Source Project
<!-- Copyright (C) 2012 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.
@@ -17,13 +17,16 @@
<HorizontalScrollView xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:scrollbars="none">
android:scrollbars="none"
android:fillViewport="true">
<TabWidget
android:id="@android:id/tabs"
android:layout_width="wrap_content"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="horizontal"
android:paddingLeft="@*android:dimen/preference_fragment_padding_side"
android:paddingRight="@*android:dimen/preference_fragment_padding_side"
style="?android:attr/tabWidgetStyle" />
</HorizontalScrollView>

29
res/layout-w720dp/tab_widget.xml
View File

@@ -1,29 +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.
-->
<HorizontalScrollView xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:scrollbars="none">
<TabWidget
android:id="@android:id/tabs"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:orientation="horizontal"
style="?android:attr/tabWidgetStyle" />
</HorizontalScrollView>

6
res/layout/manage_applications.xml
View File

@@ -49,7 +49,9 @@
android:paddingTop="30dp"
android:paddingLeft="4dp"
android:paddingRight="4dp"
android:paddingBottom="1dp">
android:paddingBottom="1dp"
android:layout_marginLeft="@*android:dimen/preference_fragment_padding_side"
android:layout_marginRight="@*android:dimen/preference_fragment_padding_side">
<TextView android:id="@+id/usedStorageText"
android:layout_width="0px"
android:layout_height="wrap_content"
@@ -91,6 +93,8 @@
android:orientation="vertical"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_marginLeft="@*android:dimen/preference_fragment_padding_side"
android:layout_marginRight="@*android:dimen/preference_fragment_padding_side"
android:visibility="gone"
android:gravity="center">

5
res/layout/manage_apps_tab_content.xml
View File

@@ -27,9 +27,10 @@
<LinearLayout
android:orientation="vertical"
android:layout_width="match_parent"
android:layout_height="match_parent">
android:layout_height="match_parent"
>
<include layout="@layout/tab_widget" />
<include layout="@layout/tab_widget"/>
<FrameLayout
android:id="@android:id/tabcontent"

7
res/layout/running_processes_view.xml
View File

@@ -26,7 +26,10 @@
<ListView android:id="@android:id/list"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:paddingLeft="@*android:dimen/preference_fragment_padding_side"
android:paddingRight="@*android:dimen/preference_fragment_padding_side"
android:drawSelectorOnTop="false"
android:scrollbarStyle="outsideOverlay"
android:fastScrollEnabled="true" />
<TextView android:id="@android:id/empty"
android:layout_width="match_parent"
@@ -46,7 +49,9 @@
android:paddingTop="30dp"
android:paddingLeft="4dp"
android:paddingRight="4dp"
android:paddingBottom="1dp">
android:paddingBottom="1dp"
android:layout_marginLeft="@*android:dimen/preference_fragment_padding_side"
android:layout_marginRight="@*android:dimen/preference_fragment_padding_side">
<TextView android:id="@+id/foregroundText"
android:layout_width="0px"
android:layout_height="wrap_content"

2
src/com/android/settings/Utils.java
View File

@@ -407,7 +407,7 @@ public class Utils {
final int paddingBottom = res.getDimensionPixelSize(
com.android.internal.R.dimen.preference_fragment_padding_bottom);
final int effectivePaddingSide = ignoreSidePadding ? 0 : paddingBottom;
final int effectivePaddingSide = ignoreSidePadding ? 0 : paddingSide;
list.setPadding(effectivePaddingSide, 0, effectivePaddingSide, paddingBottom);
}
}

3
src/com/android/settings/applications/ManageApplications.java
View File

@@ -737,6 +737,9 @@ public class ManageApplications extends Fragment implements
} else if (menuId == SHOW_BACKGROUND_PROCESSES) {
mShowBackground = true;
mRunningProcessesView.mAdapter.setShowBackground(true);
} else {
// Handle the home button
return false;
}
updateOptionsMenu();
return true;