summaryrefslogtreecommitdiffstats
path: root/core/res
diff options
context:
space:
mode:
Diffstat (limited to 'core/res')
-rw-r--r--core/res/AndroidManifest.xml2
-rw-r--r--core/res/res/layout/preference_material.xml42
-rw-r--r--core/res/res/values/config.xml1
-rw-r--r--core/res/res/values/public.xml9
-rw-r--r--core/res/res/values/styles_material.xml6
5 files changed, 35 insertions, 25 deletions
diff --git a/core/res/AndroidManifest.xml b/core/res/AndroidManifest.xml
index 672ad84..7c5233c 100644
--- a/core/res/AndroidManifest.xml
+++ b/core/res/AndroidManifest.xml
@@ -2208,7 +2208,7 @@
<permission android:name="android.permission.MODIFY_PARENTAL_CONTROLS"
android:label="@string/permlab_modifyParentalControls"
android:description="@string/permdesc_modifyParentalControls"
- android:protectionLevel="signature" />
+ android:protectionLevel="signature|system" />
<!-- Must be required by device administration receiver, to ensure that only the
system can interact with it. -->
diff --git a/core/res/res/layout/preference_material.xml b/core/res/res/layout/preference_material.xml
index 3919f5f..778e70a 100644
--- a/core/res/res/layout/preference_material.xml
+++ b/core/res/res/layout/preference_material.xml
@@ -20,58 +20,62 @@
<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:minHeight="?attr/listPreferredItemHeightSmall"
android:gravity="center_vertical"
android:paddingStart="?attr/listPreferredItemPaddingStart"
android:paddingEnd="?attr/listPreferredItemPaddingEnd"
- android:background="?android:attr/activatedBackgroundIndicator">
+ android:background="?attr/activatedBackgroundIndicator">
<LinearLayout
- android:id="@+android:id/icon_frame"
+ android:id="@+id/icon_frame"
android:layout_width="wrap_content"
android:layout_height="match_parent"
- android:minWidth="58dip"
+ android:layout_marginStart="-4dp"
+ android:minWidth="60dp"
android:gravity="start|center_vertical"
- android:orientation="horizontal">
+ android:orientation="horizontal"
+ android:paddingEnd="12dp"
+ android:paddingTop="4dp"
+ android:paddingBottom="4dp">
<ImageView
- android:id="@+android:id/icon"
+ android:id="@+id/icon"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:scaleType="centerInside"
- android:layout_marginEnd="8dip" />
+ android:maxWidth="48dp"
+ android:maxHeight="48dp" />
</LinearLayout>
<RelativeLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_weight="1"
- android:paddingTop="16dip"
- android:paddingBottom="16dip">
+ android:paddingTop="16dp"
+ android:paddingBottom="16dp">
- <TextView android:id="@+android:id/title"
+ <TextView android:id="@+id/title"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:singleLine="true"
- android:textAppearance="?android:attr/textAppearanceListItem"
+ android:textAppearance="?attr/textAppearanceListItem"
android:ellipsize="marquee" />
- <TextView android:id="@+android:id/summary"
+ <TextView android:id="@+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:layout_below="@id/title"
+ android:layout_alignStart="@id/title"
+ android:textAppearance="?attr/textAppearanceListItemSecondary"
+ android:textColor="?attr/textColorSecondary"
android:maxLines="10" />
</RelativeLayout>
<!-- Preference should place its actual preference widget here. -->
- <LinearLayout android:id="@+android:id/widget_frame"
+ <LinearLayout android:id="@+id/widget_frame"
android:layout_width="wrap_content"
android:layout_height="match_parent"
- android:minWidth="58dip"
android:gravity="end|center_vertical"
+ android:paddingStart="16dp"
android:orientation="vertical" />
</LinearLayout>
diff --git a/core/res/res/values/config.xml b/core/res/res/values/config.xml
index 4f0757c..af213ba 100644
--- a/core/res/res/values/config.xml
+++ b/core/res/res/values/config.xml
@@ -26,6 +26,7 @@
<item><xliff:g id="id">ime</xliff:g></item>
<item><xliff:g id="id">sync_failing</xliff:g></item>
<item><xliff:g id="id">sync_active</xliff:g></item>
+ <item><xliff:g id="id">cast</xliff:g></item>
<item><xliff:g id="id">location</xliff:g></item>
<item><xliff:g id="id">bluetooth</xliff:g></item>
<item><xliff:g id="id">nfc</xliff:g></item>
diff --git a/core/res/res/values/public.xml b/core/res/res/values/public.xml
index 82125fe..35658cf 100644
--- a/core/res/res/values/public.xml
+++ b/core/res/res/values/public.xml
@@ -2535,12 +2535,17 @@
<public type="style" name="TextAppearance.StatusBar.Material.EventContent.Time" />
<public type="style" name="TextAppearance.StatusBar.Material.EventContent.Emphasis" />
- <public type="style" name="Widget.Material.Spinner.Form" />
- <public type="style" name="Widget.Material.Light.Spinner.Form" />
+ <public type="style" name="Widget.Material.Spinner.Underlined" />
+ <public type="style" name="Widget.Material.Light.Spinner.Underlined" />
<public type="style" name="TextAppearance.Material.Widget.Toolbar.Title" />
<public type="style" name="TextAppearance.Material.Widget.Toolbar.Subtitle" />
+ <public type="style" name="Theme.Material.Dialog.Alert" />
+ <public type="style" name="Theme.Material.Dialog.Presentation" />
+ <public type="style" name="Theme.Material.Light.Dialog.Alert" />
+ <public type="style" name="Theme.Material.Light.Dialog.Presentation" />
+
<public-padding type="string" name="l_resource_pad" end="0x01040030" />
<public type="string" name="config_webSettingsDefaultTextEncoding" />
diff --git a/core/res/res/values/styles_material.xml b/core/res/res/values/styles_material.xml
index fb70d6b..3ee5552 100644
--- a/core/res/res/values/styles_material.xml
+++ b/core/res/res/values/styles_material.xml
@@ -308,7 +308,7 @@ please see styles_device_defaults.xml.
<style name="TextAppearance.Material.Widget.TextView.PopupMenu" parent="TextAppearance.Material.Menu" />
<style name="TextAppearance.Material.Widget.TextView.SpinnerItem" />
- <style name="TextAppearance.Material.Widget.DropDownItem">
+ <style name="TextAppearance.Material.Widget.DropDownItem" parent="TextAppearance.Material.Menu">
<item name="textColor">?attr/textColorPrimaryDisableOnly</item>
</style>
@@ -759,7 +759,7 @@ please see styles_device_defaults.xml.
<item name="overlapAnchor">true</item>
</style>
- <style name="Widget.Material.Spinner.Form">
+ <style name="Widget.Material.Spinner.Underlined">
<item name="background">@drawable/spinner_textfield_background_material</item>
</style>
@@ -1022,7 +1022,7 @@ please see styles_device_defaults.xml.
<style name="Widget.Material.Light.Spinner" parent="Widget.Material.Spinner" />
<style name="Widget.Material.Light.Spinner.DropDown" parent="Widget.Material.Spinner.DropDown"/>
<style name="Widget.Material.Light.Spinner.DropDown.ActionBar" parent="Widget.Material.Spinner.DropDown.ActionBar"/>
- <style name="Widget.Material.Light.Spinner.Form" parent="Widget.Material.Spinner.Form" />
+ <style name="Widget.Material.Light.Spinner.Underlined" parent="Widget.Material.Spinner.Underlined" />
<style name="Widget.Material.Light.TabWidget" parent="Widget.Material.TabWidget"/>
<style name="Widget.Material.Light.WebTextView" parent="Widget.Material.WebTextView"/>
<style name="Widget.Material.Light.WebView" parent="Widget.Material.WebView"/>
generated by cgit v1.1 at 2025-08-25 09:20:41 +0000