diff options
author | Fabrice Di Meglio <fdimeglio@google.com> | 2014-08-13 16:22:38 -0700 |
---|---|---|
committer | Fabrice Di Meglio <fdimeglio@google.com> | 2014-08-15 11:36:31 -0700 |
commit | 61a1fec49fbfbe8bdd0137ddb06e5eacf4f8ec54 (patch) | |
tree | fe8378adba969bd44b0a1315037b6dd306b00a02 /res/layout | |
parent | 898671f14123695d74bd308450a462d11a341d1a (diff) | |
download | packages_apps_Settings-61a1fec49fbfbe8bdd0137ddb06e5eacf4f8ec54.zip packages_apps_Settings-61a1fec49fbfbe8bdd0137ddb06e5eacf4f8ec54.tar.gz packages_apps_Settings-61a1fec49fbfbe8bdd0137ddb06e5eacf4f8ec54.tar.bz2 |
Fix bug #16703191 APN settings shows back button even when you intent into it
- change a bit the way we recognize a SubSetting. Now we can pass the new
":settings:show_fragment_as_subsetting" Intent extra for forcing it.
- convert ApnSettings to a SettingsPreferenceFragment
Change-Id: I22167ad317530c0a58c4d522a72826f9d34ad2d3
Diffstat (limited to 'res/layout')
-rw-r--r-- | res/layout/apn_disallowed_preference_screen.xml | 39 | ||||
-rw-r--r-- | res/layout/apn_preference_layout.xml | 2 |
2 files changed, 2 insertions, 39 deletions
diff --git a/res/layout/apn_disallowed_preference_screen.xml b/res/layout/apn_disallowed_preference_screen.xml deleted file mode 100644 index 6ac8137..0000000 --- a/res/layout/apn_disallowed_preference_screen.xml +++ /dev/null @@ -1,39 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<!-- -/* - * Copyright (C) 2014 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:id="@+id/listContainer" - android:layout_width="match_parent" - android:layout_height="match_parent"> - - <ListView android:id="@android:id/list" - android:layout_width="match_parent" - android:layout_height="match_parent" - android:drawSelectorOnTop="false" - android:scrollbarStyle="insideOverlay" - android:background="@android:color/white" - android:cacheColorHint="@android:color/white" - android:fadingEdgeLength="16dip" /> - - <TextView android:id="@android:id/empty" - android:layout_width="match_parent" - android:layout_height="match_parent" - android:gravity="center" - android:text="@string/apn_settings_not_available" - android:textAppearance="?android:attr/textAppearanceMedium" /> -</FrameLayout>
\ No newline at end of file diff --git a/res/layout/apn_preference_layout.xml b/res/layout/apn_preference_layout.xml index 8938f29..f3ee453 100644 --- a/res/layout/apn_preference_layout.xml +++ b/res/layout/apn_preference_layout.xml @@ -18,6 +18,8 @@ xmlns:android="http://schemas.android.com/apk/res/android" android:layout_width="match_parent" android:layout_height="wrap_content" + android:paddingStart="?android:attr/listPreferredItemPaddingStart" + android:paddingEnd="?android:attr/listPreferredItemPaddingEnd" android:minHeight="?android:attr/listPreferredItemHeight" android:gravity="center_vertical"> |