Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Skip to content
Hide whitespace changes
Inline Side-by-side
res/layout/app_ops_details.xml deleted 100644 → 0
View file @ 6b564236
<?xml version="1.0" encoding="utf-8"?>
<!--
/*
** Copyright 2013, 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.
*/
-->
<ScrollView
xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:clipToPadding="false"
android:scrollbarStyle="@integer/preference_scrollbar_style">
<LinearLayout
android:id="@+id/all_details"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:paddingBottom="5dip"
android:orientation="vertical">
<!-- App snippet -->
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
android:paddingStart="?android:attr/listPreferredItemPaddingStart"
android:paddingEnd="?android:attr/listPreferredItemPaddingEnd"
android:orientation="vertical">
<!-- Application snippet label, version and icon -->
<include
layout="@layout/app_item"
android:id="@+id/app_snippet" />
</LinearLayout>
<!-- Operations list -->
<LinearLayout
android:id="@+id/operations_section"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical">
</LinearLayout>
</LinearLayout>
</ScrollView>
res/layout/app_ops_details_item.xml deleted 100644 → 0
View file @ 6b564236
<?xml version="1.0" encoding="utf-8"?>
<!--
/*
** Copyright 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.
*/
-->
<GridLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:minHeight="?android:attr/listPreferredItemHeight"
android:paddingStart="?android:attr/listPreferredItemPaddingStart"
android:paddingEnd="?android:attr/listPreferredItemPaddingEnd"
android:paddingTop="8dip"
android:paddingBottom="8dip"
android:columnCount="3">
<ImageView
android:id="@+id/op_icon"
android:layout_width="@android:dimen/app_icon_size"
android:layout_height="@android:dimen/app_icon_size"
android:layout_column="0"
android:layout_row="0"
android:layout_rowSpan="2"
android:layout_marginEnd="8dip"
android:scaleType="centerInside"
android:contentDescription="@null" />
<TextView
android:id="@+id/op_name"
android:layout_column="1"
android:layout_row="0"
android:layout_gravity="fill_horizontal"
android:layout_marginTop="2dip"
android:singleLine="true"
android:ellipsize="marquee"
android:textAppearance="?android:attr/textAppearanceMedium"
android:textAlignment="viewStart" />
<TextView
android:id="@+id/op_time"
android:layout_column="1"
android:layout_row="1"
android:layout_gravity="fill_horizontal|top"
android:textAppearance="?android:attr/textAppearanceSmall"
android:textAlignment="viewStart" />
<Switch android:id="@+id/switchWidget"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
android:layout_marginStart="8dip"
android:layout_column="2"
android:layout_row="0"
android:layout_rowSpan="2"
android:padding="8dip"
android:focusable="false"
android:clickable="true" />
</GridLayout>
res/layout/choose_lock_pattern_size_header.xml 0 → 100644
View file @ 896a6caa
<?xml version="1.0" encoding="utf-8"?>
<!-- Copyright (C) 2016 The CyanogenMod 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"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="center_vertical"
android:minHeight="56dp"
android:paddingStart="?android:attr/listPreferredItemPaddingStart"
android:paddingEnd="?android:attr/listPreferredItemPaddingEnd"
android:text="@string/lock_settings_picker_pattern_size_message"
style="@style/LockPatternSizeHeaderStyle" />
res/layout/confirm_lock_password_base.xml
View file @ 896a6caa
...@@ -30,15 +30,28 @@ ...@@ -30,15 +30,28 @@
android:layout_gravity="top|center_horizontal" android:layout_gravity="top|center_horizontal"
android:paddingTop="@dimen/confirm_credentials_top_padding"> android:paddingTop="@dimen/confirm_credentials_top_padding">
<TextView <LinearLayout
style="@android:style/TextAppearance.Material.Headline" android:layout_width="match_parent"
android:id="@+id/headerText" android:layout_height="wrap_content"
android:orientation="horizontal"
android:layout_marginStart="?attr/confirmDeviceCredentialsSideMargin" android:layout_marginStart="?attr/confirmDeviceCredentialsSideMargin"
android:layout_marginEnd="?attr/confirmDeviceCredentialsSideMargin" android:layout_marginEnd="?attr/confirmDeviceCredentialsSideMargin"
android:layout_marginTop="?attr/confirmDeviceCredentialsTopMargin" android:layout_marginTop="?attr/confirmDeviceCredentialsTopMargin">
android:layout_width="wrap_content"
android:layout_height="wrap_content" <ImageView
android:textColor="?android:attr/colorAccent"/> android:id="@+id/confirm_lock_trust"
android:src="@drawable/ic_trust"
android:layout_marginEnd="16dp"
android:layout_width="48dp"
android:layout_height="48dp" />
<TextView
style="@android:style/TextAppearance.Material.Headline"
android:id="@+id/headerText"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textColor="?android:attr/colorAccent"/>
</LinearLayout>
<TextView <TextView
style="@android:style/TextAppearance.Material.Body1" style="@android:style/TextAppearance.Material.Body1"
......
res/layout/confirm_lock_password_internal.xml
View file @ 896a6caa
...@@ -27,13 +27,26 @@ ...@@ -27,13 +27,26 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent"> android:layout_height="match_parent">
<TextView <LinearLayout
android:id="@+id/detailsText"
style="@style/SuwDescription.Glif"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:orientation="horizontal"
android:layout_marginStart="?attr/suwMarginSides" android:layout_marginStart="?attr/suwMarginSides"
android:layout_marginEnd="?attr/suwMarginSides" /> android:layout_marginEnd="?attr/suwMarginSides">
<ImageView
android:id="@+id/confirm_lock_trust"
android:src="@drawable/ic_trust"
android:layout_marginEnd="16dp"
android:layout_width="48dp"
android:layout_height="48dp" />
<TextView
android:id="@+id/detailsText"
style="@style/SuwDescription.Glif"
android:layout_width="match_parent"
android:layout_height="wrap_content" />
</LinearLayout>
<Space <Space
android:layout_width="match_parent" android:layout_width="match_parent"
......
res/layout/crypt_keeper_pattern_entry.xml
View file @ 896a6caa
...@@ -36,6 +36,18 @@ ...@@ -36,6 +36,18 @@
</LinearLayout> </LinearLayout>
<LinearLayout
android:id="@+id/pattern_sizes"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginStart="@dimen/crypt_keeper_pattern_margin"
android:layout_marginEnd="@dimen/crypt_keeper_pattern_margin"
android:orientation="horizontal">
<include layout="@layout/crypt_keeper_pattern_sizes" />
</LinearLayout>
<include layout="@layout/crypt_keeper_emergency_button" /> <include layout="@layout/crypt_keeper_emergency_button" />
</LinearLayout> </LinearLayout>
res/layout/crypt_keeper_pattern_sizes.xml 0 → 100644
View file @ 896a6caa
<?xml version="1.0" encoding="utf-8"?>
<!--
Copyright (C) 2015 The CyanogenMod 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.
-->
<merge xmlns:android="http://schemas.android.com/apk/res/android">
<Button
android:id="@+id/lock_pattern_size_3"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_gravity="center_horizontal"
android:textSize="14sp"
android:fontFamily="sans-serif"
android:text="@string/lock_pattern_size_3"
android:textColor="@android:color/white"
android:layout_weight="1"
style="?android:attr/borderlessButtonStyle"/>
<Button
android:id="@+id/lock_pattern_size_4"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_gravity="center_horizontal"
android:textSize="14sp"
android:fontFamily="sans-serif"
android:text="@string/lock_pattern_size_4"
android:textColor="@android:color/white"
android:layout_weight="1"
style="?android:attr/borderlessButtonStyle"/>
<Button
android:id="@+id/lock_pattern_size_5"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_gravity="center_horizontal"
android:textSize="14sp"
android:fontFamily="sans-serif"
android:text="@string/lock_pattern_size_5"
android:textColor="@android:color/white"
android:layout_weight="1"
style="?android:attr/borderlessButtonStyle"/>
<Button
android:id="@+id/lock_pattern_size_6"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_gravity="center_horizontal"
android:textSize="14sp"
android:fontFamily="sans-serif"
android:text="@string/lock_pattern_size_6"
android:textColor="@android:color/white"
android:layout_weight="1"
style="?android:attr/borderlessButtonStyle"/>
</merge >
res/layout/custom_sim_switch.xml 0 → 100644
View file @ 896a6caa
<?xml version="1.0" encoding="utf-8"?>
<!--
/* Copyright (c) 2014, The Linux Foundation. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are
* met:
* * Redistributions of source code must retain the above copyright
* notice, this list of conditions and the following disclaimer.
* * Redistributions in binary form must reproduce the above
* copyright notice, this list of conditions and the following
* disclaimer in the documentation and/or other materials provided
* with the distribution.
* * Neither the name of The Linux Foundation nor the names of its
* contributors may be used to endorse or promote products derived
* from this software without specific prior written permission.
*
* THIS SOFTWARE IS PROVIDED "AS IS" AND ANY EXPRESS OR IMPLIED
* WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT
* ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS
* BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
* CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
* SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
* BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
* WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
* OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
* IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*
*/
-->
<Switch xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@+id/sub_switch_widget"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:clickable="true"
android:focusable="false"
android:padding="8dip" />
res/layout/dashboard_tile.xml
View file @ 896a6caa
...@@ -14,13 +14,12 @@ ...@@ -14,13 +14,12 @@
limitations under the License. limitations under the License.
--> -->
<LinearLayout <RelativeLayout
xmlns:android="http://schemas.android.com/apk/res/android" xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@+id/dashboard_tile" android:id="@+id/dashboard_tile"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:background="?android:attr/selectableItemBackground" android:background="?android:attr/selectableItemBackground"
android:gravity="center_vertical"
android:minHeight="@dimen/dashboard_tile_minimum_height" android:minHeight="@dimen/dashboard_tile_minimum_height"
android:clickable="true" android:clickable="true"
android:focusable="true"> android:focusable="true">
...@@ -30,13 +29,18 @@ ...@@ -30,13 +29,18 @@
android:layout_width="@dimen/dashboard_tile_image_size" android:layout_width="@dimen/dashboard_tile_image_size"
android:layout_height="@dimen/dashboard_tile_image_size" android:layout_height="@dimen/dashboard_tile_image_size"
android:scaleType="centerInside" android:scaleType="centerInside"
android:layout_alignParentStart="true"
android:layout_centerVertical="true"
android:layout_marginStart="@dimen/dashboard_tile_image_margin" android:layout_marginStart="@dimen/dashboard_tile_image_margin"
android:layout_marginEnd="@dimen/dashboard_tile_image_margin" /> android:layout_marginEnd="@dimen/dashboard_tile_image_margin" />
<LinearLayout <LinearLayout
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:orientation="vertical"> android:orientation="vertical"
android:layout_centerVertical="true"
android:layout_toRightOf="@android:id/icon"
android:layout_toLeftOf="@+id/chevron_right">
<TextView android:id="@android:id/title" <TextView android:id="@android:id/title"
android:layout_width="wrap_content" android:layout_width="wrap_content"
...@@ -52,9 +56,19 @@ ...@@ -52,9 +56,19 @@
android:textAppearance="@style/TextAppearance.Small" android:textAppearance="@style/TextAppearance.Small"
android:textColor="?android:attr/textColorSecondary" android:textColor="?android:attr/textColorSecondary"
android:maxLines="1" android:maxLines="1"
android:ellipsize="end" android:ellipsize="end" />
android:paddingEnd="@dimen/dashboard_tile_image_margin" />
</LinearLayout> </LinearLayout>
</LinearLayout> <ImageView
android:id="@+id/chevron_right"
android:layout_width="@dimen/dashboard_tile_chevron_size"
android:layout_height="@dimen/dashboard_tile_chevron_size"
android:layout_alignParentEnd="true"
android:layout_centerVertical="true"
android:layout_marginStart="@dimen/dashboard_tile_chevron_margin"
android:layout_marginEnd="@dimen/dashboard_tile_chevron_margin"
android:src="@drawable/ic_chevron_right"
android:scaleType="centerInside"/>
</RelativeLayout>
res/layout/dialog_hardware_info.xml
View file @ 896a6caa
...@@ -53,5 +53,33 @@ ...@@ -53,5 +53,33 @@
android:paddingBottom="24dp" android:paddingBottom="24dp"
android:textAppearance="@android:style/TextAppearance.Material.Body2" /> android:textAppearance="@android:style/TextAppearance.Material.Body2" />
<TextView
android:id="@+id/hardware_plat_label"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:textAppearance="@android:style/TextAppearance.Material.Body1"
android:textColor="?android:attr/textColorSecondary"
android:text="@string/platform_revision" />
<TextView
android:id="@+id/hardware_plat_value"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:paddingBottom="24dp"
android:textAppearance="@android:style/TextAppearance.Material.Body2" />
<TextView
android:id="@+id/hardware_ram_label"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:textAppearance="@android:style/TextAppearance.Material.Body1"
android:textColor="?android:attr/textColorSecondary"
android:text="@string/total_ram" />
<TextView
android:id="@+id/hardware_ram_value"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:paddingBottom="24dp"
android:textAppearance="@android:style/TextAppearance.Material.Body2" />
</LinearLayout> </LinearLayout>
</ScrollView> </ScrollView>
\ No newline at end of file
res/layout/fingerprint_enroll_find_sensor_base.xml
View file @ 896a6caa
...@@ -41,6 +41,7 @@ ...@@ -41,6 +41,7 @@
<TextView <TextView
style="@style/SuwDescription.Glif" style="@style/SuwDescription.Glif"
android:id="@+id/find_sensor_message"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginTop="@dimen/suw_description_glif_margin_top" android:layout_marginTop="@dimen/suw_description_glif_margin_top"
......
res/layout/fingerprint_enroll_find_sensor_graphic.xml
View file @ 896a6caa
...@@ -17,17 +17,27 @@ ...@@ -17,17 +17,27 @@
<FrameLayout <FrameLayout
xmlns:android="http://schemas.android.com/apk/res/android" xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="@dimen/fingerprint_find_sensor_graphic_size" android:layout_width="fill_parent"
android:layout_height="@dimen/fingerprint_find_sensor_graphic_size"> android:layout_height="wrap_content"
android:paddingTop="@dimen/fingerprint_find_sensor_padding_top">
<ImageView <ImageView
android:id="@+id/fingerprint_sensor_location" android:id="@+id/fingerprint_sensor_location"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="wrap_content"
android:contentDescription="@string/security_settings_fingerprint_enroll_find_sensor_content_description" android:contentDescription="@string/security_settings_fingerprint_enroll_find_sensor_content_description"
android:src="@drawable/fingerprint_sensor_location" android:src="@drawable/fingerprint_sensor_location"
android:scaleType="centerInside"/> android:scaleType="centerInside"/>
<ImageView
android:id="@+id/fingerprint_sensor_location_front_overlay"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:contentDescription="@string/security_settings_fingerprint_enroll_find_sensor_content_description"
android:src="@drawable/fingerprint_sensor_location_front_overlay"
android:scaleType="centerInside"
android:visibility="gone"/>
<com.android.settings.fingerprint.FingerprintLocationAnimationView <com.android.settings.fingerprint.FingerprintLocationAnimationView
android:id="@+id/fingerprint_sensor_location_animation" android:id="@+id/fingerprint_sensor_location_animation"
android:layout_width="match_parent" android:layout_width="match_parent"
......
res/layout/preference_appops.xml 0 → 100644
View file @ 896a6caa
<?xml version="1.0" encoding="utf-8"?>
<!-- Copyright (C) 2015 The Android Open Source Project
Copyright (C) 2017 The LineageOS 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.
-->
<!-- Based off packages/apps/Settings/res/layout/preference_material_settings.xml
but with different paddings -->
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:minHeight="?android:attr/listPreferredItemHeightSmall"
android:gravity="center_vertical"
android:paddingStart="16dp"
android:paddingEnd="16dp"
android:background="?android:attr/activatedBackgroundIndicator"
android:clipToPadding="false">
<LinearLayout
android:id="@id/icon_frame"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:minWidth="56dp"
android:gravity="start|center_vertical"
android:orientation="horizontal"
android:paddingTop="4dp"
android:paddingBottom="4dp">
<com.android.internal.widget.PreferenceImageView
android:id="@android:id/icon"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:maxWidth="48dp"
android:maxHeight="48dp" />
</LinearLayout>
<RelativeLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_weight="1"
android:paddingTop="16dp"
android:paddingBottom="16dp">
<TextView android:id="@android:id/title"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:singleLine="true"
android:textAppearance="?android:attr/textAppearanceListItem"
android:ellipsize="marquee" />
<TextView android:id="@android:id/summary"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_below="@android:id/title"
android:layout_alignStart="@android:id/title"
android:textAppearance="?android:attr/textAppearanceListItemSecondary"
android:textColor="?android:attr/textColorSecondary"
android:maxLines="10" />
</RelativeLayout>
<!-- Preference should place its actual preference widget here. -->
<LinearLayout android:id="@android:id/widget_frame"
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:gravity="end|center_vertical"
android:paddingStart="16dp"
android:orientation="vertical" />
</LinearLayout>
res/layout/preference_increasing_ring.xml 0 → 100644
View file @ 896a6caa
<?xml version="1.0" encoding="utf-8"?>
<!-- Copyright (C) 2014 The CyanogenMod 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="wrap_content"
android:minHeight="?android:attr/listPreferredItemHeightSmall"
android:gravity="center_vertical"
android:paddingStart="?android:attr/listPreferredItemPaddingStart"
android:paddingEnd="?android:attr/listPreferredItemPaddingEnd"
android:background="?android:attr/selectableItemBackground"
android:clipToPadding="false">
<LinearLayout
android:id="@+id/icon_container"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:minWidth="44dp"
android:gravity="start|center_vertical"
android:orientation="horizontal"
android:paddingEnd="12dp"
android:paddingTop="4dp"
android:paddingBottom="4dp">
<com.android.internal.widget.PreferenceImageView
android:id="@android:id/icon"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:maxWidth="48dp"
android:maxHeight="48dp"/>
</LinearLayout>
<RelativeLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_weight="1"
android:paddingTop="12dp"
android:paddingBottom="12dp">
<TextView android:id="@android:id/title"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:singleLine="true"
android:textAppearance="?android:attr/textAppearanceMedium"
android:ellipsize="marquee"
android:fadingEdge="horizontal" />
<TextView android:id="@+id/start_volume_label"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_below="@android:id/title"
android:layout_alignStart="@android:id/title"
android:paddingStart="18dp"
android:text="@string/increasing_ring_min_volume_title"
android:textAppearance="?android:attr/textAppearanceSmall"
android:textColor="?android:attr/textColorSecondary"
android:singleLine="true" />
<SeekBar android:id="@+id/start_volume"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_below="@id/start_volume_label"
android:layout_alignParentEnd="true"
android:max="1000" />
<TextView android:id="@+id/ramp_up_time_label"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_below="@id/start_volume"
android:layout_alignStart="@android:id/title"
android:paddingStart="18dp"
android:text="@string/increasing_ring_ramp_up_time_title"
android:textAppearance="?android:attr/textAppearanceSmall"
android:textColor="?android:attr/textColorSecondary"
android:singleLine="true" />
<TextView android:id="@+id/ramp_up_time_value"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_below="@id/start_volume"
android:layout_toEndOf="@id/ramp_up_time_label"
android:layout_alignBaseline="@id/ramp_up_time_label"
android:layout_alignParentEnd="true"
android:gravity="end"
android:textAppearance="?android:attr/textAppearanceSmall"
android:textColor="?android:attr/textColorSecondary"
android:singleLine="true" />
<SeekBar android:id="@+id/ramp_up_time"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_below="@id/ramp_up_time_label"
android:layout_alignParentEnd="true"
android:max="11" />
<TextView android:id="@android:id/summary"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_below="@id/ramp_up_time"
android:layout_alignStart="@android:id/title"
android:textAppearance="?android:attr/textAppearanceSmall"
android:textColor="?android:attr/textColorSecondary"
android:maxLines="4" />
</RelativeLayout>
</LinearLayout>
res/layout/search_panel.xml
View file @ 896a6caa
...@@ -85,8 +85,8 @@ ...@@ -85,8 +85,8 @@
android:layout_height="?android:attr/actionBarSize"/> android:layout_height="?android:attr/actionBarSize"/>
<ImageView <ImageView
android:layout_height="160dp" android:layout_height="wrap_content"
android:layout_width="160dp" android:layout_width="wrap_content"
android:layout_gravity="center_horizontal" android:layout_gravity="center_horizontal"
android:src="@drawable/empty_search_results"/> android:src="@drawable/empty_search_results"/>
......
res/layout/suggestion_condition_container.xml
View file @ 896a6caa
...@@ -35,7 +35,7 @@ ...@@ -35,7 +35,7 @@
android:id="@+id/data" android:id="@+id/data"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:background="@color/material_grey_300" android:background="?android:attr/colorBackground"
android:scrollbars="none"/> android:scrollbars="none"/>
</android.support.v7.widget.CardView> </android.support.v7.widget.CardView>
......
res/layout/suggestion_tile.xml
View file @ 896a6caa
...@@ -23,7 +23,7 @@ ...@@ -23,7 +23,7 @@
<LinearLayout <LinearLayout
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:background="@android:color/white" android:background="?android:attr/colorBackground"
android:gravity="center_vertical" android:gravity="center_vertical"
android:orientation="horizontal" android:orientation="horizontal"
android:minHeight="@dimen/dashboard_tile_minimum_height"> android:minHeight="@dimen/dashboard_tile_minimum_height">
......
res/layout/suggestion_tile_remote_container.xml
View file @ 896a6caa
...@@ -18,7 +18,7 @@ ...@@ -18,7 +18,7 @@
xmlns:android="http://schemas.android.com/apk/res/android" xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:background="@android:color/white" android:background="@*android:color/secondary_device_default_settings_light"
android:clickable="true" android:clickable="true"
android:focusable="true" android:focusable="true"
android:minHeight="@dimen/dashboard_tile_minimum_height" /> android:minHeight="@dimen/dashboard_tile_minimum_height" />
res/layout/vpn_dialog.xml
View file @ 896a6caa
...@@ -49,6 +49,7 @@ ...@@ -49,6 +49,7 @@
<CheckBox style="@style/vpn_value" android:id="@+id/mppe" <CheckBox style="@style/vpn_value" android:id="@+id/mppe"
android:text="@string/vpn_mppe" android:text="@string/vpn_mppe"
android:textColor="?android:attr/textColorSecondary"
android:singleLine="false" android:singleLine="false"
android:visibility="gone"/> android:visibility="gone"/>
...@@ -115,6 +116,7 @@ ...@@ -115,6 +116,7 @@
<CheckBox style="@style/vpn_value" android:id="@+id/show_options" <CheckBox style="@style/vpn_value" android:id="@+id/show_options"
android:singleLine="false" android:singleLine="false"
android:textColor="?android:attr/textColorSecondary"
android:text="@string/vpn_show_options"/> android:text="@string/vpn_show_options"/>
</LinearLayout> </LinearLayout>
...@@ -161,9 +163,11 @@ ...@@ -161,9 +163,11 @@
<CheckBox style="@style/vpn_value" android:id="@+id/save_login" <CheckBox style="@style/vpn_value" android:id="@+id/save_login"
android:singleLine="false" android:singleLine="false"
android:textColor="?android:attr/textColorSecondary"
android:text="@string/vpn_save_login"/> android:text="@string/vpn_save_login"/>
<CheckBox style="@style/vpn_value" android:id="@+id/always_on_vpn" <CheckBox style="@style/vpn_value" android:id="@+id/always_on_vpn"
android:singleLine="false" android:singleLine="false"
android:textColor="?android:attr/textColorSecondary"
android:text="@string/vpn_menu_lockdown"/> android:text="@string/vpn_menu_lockdown"/>
<TextView style="@style/vpn_warning" android:id="@+id/always_on_invalid_reason" <TextView style="@style/vpn_warning" android:id="@+id/always_on_invalid_reason"
android:singleLine="false" android:singleLine="false"
......
res/layout/widget_text_views.xml
View file @ 896a6caa
...@@ -17,14 +17,13 @@ ...@@ -17,14 +17,13 @@
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:orientation="horizontal" android:orientation="vertical"
android:duplicateParentState="true"> android:duplicateParentState="true">
<TextView <TextView
android:id="@+id/widget_text1" android:id="@+id/widget_text1"
android:layout_width="wrap_content" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_weight="1"
android:layout_gravity="fill_horizontal|top" android:layout_gravity="fill_horizontal|top"
android:textAppearance="@android:style/TextAppearance.Material.Body1" android:textAppearance="@android:style/TextAppearance.Material.Body1"
android:textColor="?android:attr/textColorSecondary" android:textColor="?android:attr/textColorSecondary"
...@@ -35,14 +34,12 @@ ...@@ -35,14 +34,12 @@
<TextView <TextView
android:id="@+id/widget_text2" android:id="@+id/widget_text2"
android:layout_width="wrap_content" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_weight="1"
android:layout_marginStart="8dip"
android:layout_gravity="fill_horizontal|top" android:layout_gravity="fill_horizontal|top"
android:textAppearance="@android:style/TextAppearance.Material.Body1" android:textAppearance="@android:style/TextAppearance.Material.Body1"
android:textColor="?android:attr/textColorSecondary" android:textColor="?android:attr/textColorSecondary"
android:textAlignment="viewEnd" android:textAlignment="viewStart"
android:singleLine="true" android:singleLine="true"
android:ellipsize="marquee" android:ellipsize="marquee"
android:duplicateParentState="true" /> android:duplicateParentState="true" />
......