diff options
Diffstat (limited to 'res/layout')
| -rw-r--r--[-rwxr-xr-x] | res/layout/manage_applications_apps.xml (renamed from res/layout/manage_applications.xml) | 10 | ||||
| -rw-r--r-- | res/layout/manage_applications_content.xml | 41 | ||||
| -rw-r--r-- | res/layout/manage_applications_running.xml | 47 | ||||
| -rw-r--r-- | res/layout/manage_apps_spinner_content.xml | 51 |
4 files changed, 90 insertions, 59 deletions
diff --git a/res/layout/manage_applications.xml b/res/layout/manage_applications_apps.xml index da56c99..51ab412 100755..100644 --- a/res/layout/manage_applications.xml +++ b/res/layout/manage_applications_apps.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="utf-8"?> -<!-- Copyright (C) 2008 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. @@ -83,12 +83,6 @@ </view> </LinearLayout> - <view class="com.android.settings.applications.RunningProcessesView" - android:id="@+id/running_processes" - android:layout_width="match_parent" - android:layout_height="match_parent" - android:visibility="gone" /> - <LinearLayout android:id="@+id/loading_container" android:orientation="vertical" android:layout_width="match_parent" @@ -110,4 +104,4 @@ </LinearLayout> -</FrameLayout>
\ No newline at end of file +</FrameLayout> diff --git a/res/layout/manage_applications_content.xml b/res/layout/manage_applications_content.xml new file mode 100644 index 0000000..f72aa03 --- /dev/null +++ b/res/layout/manage_applications_content.xml @@ -0,0 +1,41 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- +/* +** +** Copyright 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. +** 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. +*/ +--> + + +<LinearLayout + xmlns:android="http://schemas.android.com/apk/res/android" + android:layout_width="match_parent" + android:layout_height="match_parent" + android:orientation="vertical"> + + <android.support.v4.view.ViewPager + android:id="@+id/pager" + android:layout_width="match_parent" + android:layout_height="match_parent" + android:layout_weight="1"> + <android.support.v4.view.PagerTabStrip + android:id="@+id/tabs" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:layout_gravity="top"> + </android.support.v4.view.PagerTabStrip> + </android.support.v4.view.ViewPager> + +</LinearLayout> diff --git a/res/layout/manage_applications_running.xml b/res/layout/manage_applications_running.xml new file mode 100644 index 0000000..634de1c --- /dev/null +++ b/res/layout/manage_applications_running.xml @@ -0,0 +1,47 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- 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. + 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. +--> + +<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android" + android:layout_width="match_parent" + android:layout_height="match_parent" > + <view class="com.android.settings.applications.RunningProcessesView" + android:id="@+id/running_processes" + android:layout_width="match_parent" + android:layout_height="match_parent" + android:visibility="gone" /> + + <LinearLayout android:id="@+id/loading_container" + 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"> + + <ProgressBar style="?android:attr/progressBarStyleLarge" + android:layout_width="wrap_content" + android:layout_height="wrap_content" /> + <TextView android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:textAppearance="?android:attr/textAppearanceSmall" + android:text="@string/settings_safetylegal_activity_loading" + android:paddingTop="4dip" + android:singleLine="true" /> + + </LinearLayout> + +</FrameLayout> diff --git a/res/layout/manage_apps_spinner_content.xml b/res/layout/manage_apps_spinner_content.xml deleted file mode 100644 index cbf0a40..0000000 --- a/res/layout/manage_apps_spinner_content.xml +++ /dev/null @@ -1,51 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<!-- -/* -** -** Copyright 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. -** 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. -*/ ---> - - -<LinearLayout - xmlns:android="http://schemas.android.com/apk/res/android" - android:layout_width="match_parent" - android:layout_height="match_parent" - android:orientation="vertical"> - - <Spinner - android:id="@+id/spinner" - android:layout_width="wrap_content" - android:layout_height="48sp" - android:minWidth="180dp" - android:layout_marginLeft="@*android:dimen/preference_fragment_padding_side" - android:layout_marginRight="@*android:dimen/preference_fragment_padding_side" - /> - - <ImageView - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:layout_marginLeft="@*android:dimen/preference_fragment_padding_side" - android:layout_marginRight="@*android:dimen/preference_fragment_padding_side" - android:scaleType="fitXY" - android:src="?android:attr/listDivider" /> - - <FrameLayout - android:id="@+id/spinner_content" - android:layout_width="match_parent" - android:layout_height="0dip" - android:layout_weight="1" /> - -</LinearLayout> |