This removes the grey Wi-Fi icon from the empty-view in the Wi-Fi list of Setup Wizard. Also updated the style so it looks like the description text in other setup screens. Also fixed the view recycling by not calling getRootAdapter in onActivityCreated, since that will cause the Preference framework to not cache the AccessPoint preference. Bug: 17575719 Bug: 16518752 Change-Id: I06cbc88db1c04b29a9ce8221596265effc39b90b
352 lines
15 KiB
XML
352 lines
15 KiB
XML
<?xml version="1.0" encoding="utf-8"?>
|
|
<!-- Copyright (C) 2006 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="info_label">
|
|
<item name="android:layout_height">wrap_content</item>
|
|
<item name="android:layout_width">wrap_content</item>
|
|
<item name="android:textAppearance">@style/TextAppearance.info_label</item>
|
|
<item name="android:paddingEnd">4dip</item>
|
|
</style>
|
|
|
|
<style name="info_value">
|
|
<item name="android:layout_height">wrap_content</item>
|
|
<item name="android:layout_width">wrap_content</item>
|
|
<item name="android:textAppearance">@style/TextAppearance.info_value</item>
|
|
</style>
|
|
|
|
<style name="info_small">
|
|
<item name="android:layout_height">wrap_content</item>
|
|
<item name="android:layout_width">wrap_content</item>
|
|
<item name="android:textAppearance">@style/TextAppearance.info_small</item>
|
|
</style>
|
|
|
|
<style name="info_layout">
|
|
<item name="android:orientation">vertical</item>
|
|
<item name="android:paddingStart">10dip</item>
|
|
<item name="android:paddingTop">10dip</item>
|
|
<item name="android:paddingEnd">10dip</item>
|
|
<item name="android:paddingBottom">10dip</item>
|
|
<item name="android:layout_width">match_parent</item>
|
|
<item name="android:layout_height">match_parent</item>
|
|
</style>
|
|
|
|
<style name="entry_layout">
|
|
<item name="android:orientation">horizontal</item>
|
|
<item name="android:layout_width">wrap_content</item>
|
|
<item name="android:layout_height">wrap_content</item>
|
|
</style>
|
|
|
|
<style name="form_value">
|
|
<item name="android:layout_height">wrap_content</item>
|
|
<item name="android:layout_width">match_parent</item>
|
|
</style>
|
|
|
|
|
|
<style name="TextAppearance" parent="android:TextAppearance.Material">
|
|
</style>
|
|
|
|
<style name="TextAppearance.info_label">
|
|
<item name="android:textSize">14sp</item>
|
|
<item name="android:textStyle">bold</item>
|
|
</style>
|
|
|
|
<style name="TextAppearance.info_small">
|
|
<item name="android:textSize">12sp</item>
|
|
<item name="android:textStyle">normal</item>
|
|
</style>
|
|
|
|
<style name="TextAppearance.info_value">
|
|
<item name="android:textSize">14sp</item>
|
|
<item name="android:textStyle">normal</item>
|
|
</style>
|
|
|
|
<style name="TextAppearance.PasswordEntry" parent="android:TextAppearance.Material">
|
|
<item name="android:gravity">center</item>
|
|
<item name="android:singleLine">true</item>
|
|
<item name="android:textStyle">bold</item>
|
|
<item name="android:textColor">?android:attr/textColorPrimary</item>
|
|
</style>
|
|
|
|
<style name="TextAppearance.CryptKeeper_PasswordEntry" parent="android:TextAppearance.Material">
|
|
<item name="android:textSize">36sp</item>
|
|
<item name="android:gravity">center_horizontal</item>
|
|
<item name="android:background">@null</item>
|
|
<item name="android:textCursorDrawable">@null</item>
|
|
<item name="android:singleLine">true</item>
|
|
<item name="android:imeOptions">flagForceAscii|actionDone</item>
|
|
</style>
|
|
|
|
<style name="TallTitleBarTheme" parent="android:Theme.NoTitleBar">
|
|
<item name="android:windowContentOverlay">@null</item>
|
|
</style>
|
|
|
|
<style name="PreferenceHeaderPanelSinglePane">
|
|
<item name="android:layout_marginStart">0dp</item>
|
|
<item name="android:layout_marginEnd">0dp</item>
|
|
<item name="android:background">@null</item>
|
|
</style>
|
|
|
|
<style name="PreferencePanelSinglePane" parent="@*android:style/PreferencePanel">
|
|
<item name="android:layout_marginStart">0dp</item>
|
|
<item name="android:layout_marginEnd">0dp</item>
|
|
<item name="android:paddingStart">0dp</item>
|
|
<item name="android:paddingEnd">0dp</item>
|
|
<item name="android:background">@null</item>
|
|
<item name="android:scrollbarStyle">outsideOverlay</item>
|
|
</style>
|
|
|
|
<style name="PreferenceHeaderListSinglePane" parent="@*android:style/PreferenceHeaderList">
|
|
<item name="android:paddingStart">@dimen/settings_side_margin</item>
|
|
<item name="android:paddingEnd">@dimen/settings_side_margin</item>
|
|
<item name="android:paddingTop">0dp</item>
|
|
<item name="android:paddingBottom">0dp</item>
|
|
<item name="android:layout_marginStart">0dp</item>
|
|
<item name="android:layout_marginEnd">0dp</item>
|
|
<item name="android:layout_marginTop">0dp</item>
|
|
<item name="android:layout_marginBottom">0dp</item>
|
|
<item name="android:scrollbarStyle">outsideOverlay</item>
|
|
</style>
|
|
|
|
<style name="PreferenceFragmentListSinglePane" parent="@*android:style/PreferenceFragmentList">
|
|
<item name="android:paddingStart">@dimen/settings_side_margin</item>
|
|
<item name="android:paddingEnd">@dimen/settings_side_margin</item>
|
|
<item name="android:layout_marginStart">0dp</item>
|
|
<item name="android:layout_marginEnd">0dp</item>
|
|
<item name="android:scrollbarStyle">outsideOverlay</item>
|
|
</style>
|
|
|
|
<style name="SettingsPreferenceHeaderPanel" parent="@*android:style/PreferenceHeaderPanel">
|
|
</style>
|
|
|
|
<style name="SettingsPreferenceHeaderList" parent="@*android:style/PreferenceHeaderList">
|
|
</style>
|
|
|
|
<style name="PreferenceFragmentStyle" parent="@*android:style/PreferenceFragment">
|
|
<item name="android:layout">@layout/preference_list_fragment</item>
|
|
</style>
|
|
|
|
<style name="VertDivider">
|
|
<item name="android:layout_width">@dimen/vert_divider_width</item>
|
|
<item name="android:layout_height">fill_parent</item>
|
|
<item name="android:background">@color/divider_color</item>
|
|
<item name="android:focusable">false</item>
|
|
<item name="android:clickable">false</item>
|
|
</style>
|
|
|
|
<!-- We'd like to have this as 16dip hight including paddingTop/paddingBottom to
|
|
be consistent with ProgressBar -->
|
|
<style name="TopDivider">
|
|
<item name="android:layout_width">match_parent</item>
|
|
<item name="android:layout_height">@dimen/divider_height</item>
|
|
<item name="android:background">?attr/setup_divider_color</item>
|
|
<item name="android:focusable">false</item>
|
|
<item name="android:clickable">false</item>
|
|
<item name="android:layout_marginTop">@dimen/divider_margin_top</item>
|
|
<item name="android:layout_marginBottom">@dimen/divider_margin_bottom</item>
|
|
</style>
|
|
|
|
<style name="SetupTitle">
|
|
<item name="android:layout_marginBottom">@dimen/setup_title_margin_bottom</item>
|
|
<item name="android:layout_marginEnd">@dimen/setup_wizard_margin_sides</item>
|
|
<item name="android:layout_marginStart">@dimen/setup_wizard_margin_sides</item>
|
|
<item name="android:clickable">false</item>
|
|
<item name="android:fontFamily">sans-serif</item>
|
|
<item name="android:lineSpacingExtra">@dimen/setup_title_line_spacing_extra</item>
|
|
<item name="android:longClickable">false</item>
|
|
<item name="android:textColor">@android:color/white</item>
|
|
<item name="android:textSize">@dimen/setup_title_size</item>
|
|
<item name="android:paddingBottom">@dimen/setup_title_padding_bottom</item>
|
|
<item name="android:paddingTop">@dimen/setup_title_padding_top</item>
|
|
</style>
|
|
|
|
<!-- Alternate title style used for some tablet layouts -->
|
|
<style name="SetupCardTitle">
|
|
<item name="android:paddingBottom">@dimen/setup_wizard_card_title_padding_bottom</item>
|
|
<item name="android:paddingEnd">@dimen/setup_wizard_card_title_padding_end</item>
|
|
<item name="android:paddingStart">@dimen/setup_wizard_card_title_padding_start</item>
|
|
<item name="android:paddingTop">@dimen/setup_wizard_card_title_padding_top</item>
|
|
<item name="android:textAppearance">@style/TextAppearance.SetupWizardCardTitle</item>
|
|
</style>
|
|
|
|
<style name="TextAppearance.SetupWizardCardTitle" parent="@android:style/TextAppearance.Material.Display1">
|
|
<item name="android:textColor">@android:color/white</item>
|
|
</style>
|
|
|
|
<style name="TextAppearance.SetupWizardDescription" parent="@android:style/TextAppearance.Material.Subhead">
|
|
</style>
|
|
|
|
<style name="SetupAddWifiNetwork">
|
|
<item name="android:fontFamily">sans-serif-medium</item>
|
|
<item name="android:gravity">start|center_vertical</item>
|
|
<item name="android:paddingStart">@dimen/setup_list_no_icon_padding</item>
|
|
<item name="android:textAllCaps">true</item>
|
|
<item name="android:textAppearance">@android:style/TextAppearance.Small</item>
|
|
<item name="android:textColor">?android:attr/colorAccent</item>
|
|
</style>
|
|
|
|
<style name="bt_item">
|
|
<item name="android:layout_width">match_parent</item>
|
|
<item name="android:layout_height">wrap_content</item>
|
|
<item name="android:layout_marginTop">8dip</item>
|
|
<item name="android:layout_marginStart">16dip</item>
|
|
<item name="android:layout_marginEnd">16dip</item>
|
|
<item name="android:orientation">vertical</item>
|
|
<item name="android:gravity">start</item>
|
|
</style>
|
|
|
|
<style name="bt_item_label">
|
|
<item name="android:layout_width">wrap_content</item>
|
|
<item name="android:layout_height">wrap_content</item>
|
|
<item name="android:textSize">14sp</item>
|
|
<item name="android:textAlignment">viewStart</item>
|
|
</style>
|
|
|
|
<style name="bt_item_edit_content">
|
|
<item name="android:layout_width">match_parent</item>
|
|
<item name="android:layout_height">wrap_content</item>
|
|
<item name="android:textSize">18sp</item>
|
|
</style>
|
|
|
|
<style name="wifi_item">
|
|
<item name="android:layout_marginTop">8dip</item>
|
|
<item name="android:layout_marginStart">8dip</item>
|
|
<item name="android:layout_marginEnd">8dip</item>
|
|
<item name="android:paddingStart">8dip</item>
|
|
<item name="android:paddingEnd">8dip</item>
|
|
<item name="android:orientation">vertical</item>
|
|
<item name="android:gravity">start</item>
|
|
</style>
|
|
|
|
<style name="wifi_item_label">
|
|
<item name="android:paddingStart">8dip</item>
|
|
<item name="android:textSize">14sp</item>
|
|
<item name="android:textAlignment">viewStart</item>
|
|
<item name="android:textAppearance">@android:style/TextAppearance.Material.Body1</item>
|
|
<item name="android:textColor">?android:attr/textColorSecondary</item>
|
|
</style>
|
|
|
|
<style name="wifi_item_content">
|
|
<item name="android:textAlignment">viewStart</item>
|
|
<item name="android:textAppearance">@android:style/TextAppearance.Material.Subhead</item>
|
|
<item name="android:textColor">?android:attr/textColorPrimary</item>
|
|
</style>
|
|
|
|
<style name="wifi_item_edit_content">
|
|
<item name="android:paddingStart">4dip</item>
|
|
<item name="android:layout_marginStart">4dip</item>
|
|
<item name="android:textSize">18sp</item>
|
|
</style>
|
|
|
|
<style name="wifi_section">
|
|
<item name="android:orientation">vertical</item>
|
|
</style>
|
|
|
|
<style name="setup_wizard_button">
|
|
<item name="android:layout_width">wrap_content</item>
|
|
<item name="android:layout_height">wrap_content</item>
|
|
</style>
|
|
|
|
<style name="Transparent">
|
|
<item name="android:windowBackground">@android:color/transparent</item>
|
|
<item name="android:windowNoTitle">true</item>
|
|
<item name="android:windowIsFloating">true</item>
|
|
</style>
|
|
|
|
<style name="CryptKeeperBlankTheme" parent="@android:style/Theme.Material.NoActionBar">
|
|
<item name="android:background">#ff000000</item>
|
|
</style>
|
|
|
|
<style name="SecurityPreferenceButtonContainer" parent="@android:style/Widget.Material.Light.SegmentedButton">
|
|
<item name="android:layout_width">match_parent</item>
|
|
<item name="android:layout_height">wrap_content</item>
|
|
<item name="android:weightSum">2</item>
|
|
<item name="android:dividerPadding">8dip</item>
|
|
</style>
|
|
|
|
<style name="SecurityPreferenceButton" parent="@android:style/Widget.Material.Light.Button.Borderless">
|
|
<item name="android:layout_width">0dip</item>
|
|
<item name="android:layout_weight">1</item>
|
|
<item name="android:layout_height">wrap_content</item>
|
|
<item name="android:ellipsize">marquee</item>
|
|
<item name="android:singleLine">true</item>
|
|
</style>
|
|
|
|
<style name="vpn_label">
|
|
<item name="android:layout_width">match_parent</item>
|
|
<item name="android:layout_height">wrap_content</item>
|
|
<item name="android:textAppearance">?android:attr/textAppearanceSmall</item>
|
|
</style>
|
|
|
|
<style name="vpn_value">
|
|
<item name="android:layout_width">match_parent</item>
|
|
<item name="android:layout_height">wrap_content</item>
|
|
<item name="android:textAppearance">?android:attr/textAppearanceMedium</item>
|
|
<item name="android:singleLine">true</item>
|
|
</style>
|
|
|
|
<style name="TextAppearance.PagerTabs" parent="@android:style/TextAppearance.Material.Small">
|
|
<item name="android:textAllCaps">true</item>
|
|
<item name="android:textStyle">bold</item>
|
|
</style>
|
|
|
|
<style name="KeyguardAppWidgetItem">
|
|
<item name="android:textSize">18sp</item>
|
|
</style>
|
|
|
|
<!-- Scrollbar style OUTSIDE_OVERLAY -->
|
|
<integer name="preference_scrollbar_style">33554432</integer>
|
|
|
|
<style name="ApnPreference">
|
|
<item name="android:layout">@layout/apn_preference_layout</item>
|
|
</style>
|
|
|
|
<style name="AppListSwitchPreference" parent="@*android:style/Preference.Material.DialogPreference">
|
|
<item name="android:widgetLayout">@*android:layout/preference_widget_switch</item>
|
|
</style>
|
|
|
|
<style name="TextAppearance.Medium" parent="@android:style/TextAppearance.Material.Medium">
|
|
</style>
|
|
|
|
<style name="TextAppearance.Small" parent="@android:style/TextAppearance.Material.Small">
|
|
</style>
|
|
|
|
<style name="TextAppearance.Switch" parent="TextAppearance.Medium">
|
|
</style>
|
|
|
|
<style name="TextAppearance.CategoryTitle" parent="@android:style/TextAppearance.Material.Small">
|
|
<item name="android:textColor">@color/theme_accent</item>
|
|
<item name="android:textStyle">bold</item>
|
|
</style>
|
|
|
|
<style name="TextAppearance.TileTitle" parent="@android:style/TextAppearance.Material.Medium">
|
|
</style>
|
|
|
|
<style name="TextAppearance.TileSubTitle" parent="@android:style/TextAppearance.Material.Small">
|
|
</style>
|
|
|
|
<style name="TextAppearance.RecentsTitle" parent="TextAppearance.CategoryTitle">
|
|
</style>
|
|
|
|
<style name="TextAppearance.ResultTitle" parent="TextAppearance.CategoryTitle">
|
|
</style>
|
|
|
|
<style name="Widget.TimePicker" parent="@*android:style/Widget.Material.Light.TimePicker">
|
|
<item name="@android:numbersBackgroundColor">@android:color/white</item>
|
|
</style>
|
|
</resources>
|