Merge remote-tracking branch 'origin/lineage-18.1' into v1-r (f78dc18d) · Commits · e / os / android_packages_apps_Settings

AndroidManifest.xml

+11 −0

Original line number	Diff line number	Diff line
		@@ -317,6 +317,17 @@
		android:value="true" />
		</activity>

		<activity
		android:name=".wifi.WifiSetupActivity"
		android:theme="@style/GlifV3Theme.Light">
		<intent-filter android:priority="1">
		<action android:name="android.net.wifi.SETUP_WIFI_NETWORK" />
		<category android:name="android.intent.category.DEFAULT" />
		</intent-filter>
		<meta-data android:name="com.android.settings.PRIMARY_PROFILE_CONTROLLED"
		android:value="true" />
		</activity>

		<activity
		android:name="Settings$ConfigureWifiSettingsActivity"
		android:label="@string/wifi_configure_settings_preference_title"

res/drawable/ic_wifi_setup.xml

0 → 100644

+26 −0

Original line number	Diff line number	Diff line
		<?xml version="1.0" encoding="utf-8"?>
		<!--
		Copyright (C) 2021 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.
		-->
		<vector xmlns:android="http://schemas.android.com/apk/res/android"
		android:width="24dp"
		android:height="24dp"
		android:viewportWidth="24"
		android:viewportHeight="24">

		<path
		android:fillColor="?android:attr/colorPrimary"
		android:pathData="M12,3C7.79,3 3.7,4.41 0.38,7C4.41,12.06 7.89,16.37 12,21.5C16.08,16.42 20.24,11.24 23.65,7C20.32,4.41 16.22,3 12,3Z" />
		</vector>

res/layout/settings_main_prefs.xml

+16 −14

Original line number	Diff line number	Diff line
		@@ -38,35 +38,37 @@
		android:layout_height="wrap_content"
		android:layout_width="match_parent"
		android:layout_weight="0"
		android:visibility="gone">
		android:visibility="gone"
		style="@style/SudGlifButtonBar">

		<Button android:id="@+id/back_button"
		android:layout_width="150dip"
		android:layout_width="wrap_content"
		android:layout_height="wrap_content"
		android:layout_margin="5dip"
		android:layout_alignParentStart="true"
		android:text="@*android:string/back_button_label"/>
		android:text="@*android:string/back_button_label"
		style="@style/SudGlifButton.Secondary"/>

		<LinearLayout
		<RelativeLayout
		android:orientation="horizontal"
		android:layout_width="wrap_content"
		android:layout_height="wrap_content"
		android:layout_alignParentEnd="true">
		android:layout_height="wrap_content">

		<Button android:id="@+id/skip_button"
		android:layout_width="150dip"
		android:layout_width="wrap_content"
		android:layout_height="wrap_content"
		android:layout_margin="5dip"
		android:layout_alignParentStart="true"
		android:text="@*android:string/skip_button_label"
		android:visibility="gone"/>
		android:visibility="gone"
		style="@style/SudGlifButton.Secondary"/>

		<Button android:id="@+id/next_button"
		android:layout_width="150dip"
		android:layout_width="wrap_content"
		android:layout_height="wrap_content"
		android:layout_margin="5dip"
		android:text="@*android:string/next_button_label"/>
		android:layout_alignParentEnd="true"
		android:text="@*android:string/next_button_label"
		style="@style/SudGlifButton.Primary"/>

		</LinearLayout>
		</RelativeLayout>

		</RelativeLayout>

res/values/cm_strings.xml

+3 −0

Original line number	Diff line number	Diff line
		@@ -179,4 +179,7 @@
		<!-- FastCharge feature -->
		<string name="fast_charging_title">Fast charging</string>
		<string name="fast_charging_summary">Disable to reduce the heat produced by the device while charging or to extend the lifespan of the battery</string>

		<!-- Used in SetupWizard Wi-Fi network selection page [CHAR LIMIT=60] -->
		<string name="wifi_setup_wizard_title">Select Wi\u2011Fi network</string>
		</resources>

src/com/android/settings/SetupWizardUtils.java

+1 −1

Original line number	Diff line number	Diff line
		@@ -73,7 +73,7 @@ public class SetupWizardUtils {
		}
		}
		}
		return R.style.GlifTheme;
		return R.style.GlifV3Theme;
		}

		public static int getTransparentTheme(Intent intent) {