Merge remote-tracking branch 'github/cm-10.2' into HEAD (d7e2a30c) · Commits · e / os / android_packages_apps_Settings

AndroidManifest.xml

+10 −0

Original line number	Diff line number	Diff line
		@@ -753,6 +753,16 @@
		</intent-filter>
		</activity>

		<activity android:name="SettingsCMLicenseActivity"
		android:label="@string/settings_cmlicense_activity_title"
		android:theme="@android:style/Theme.Holo.Panel"
		android:configChanges="orientation\|screenSize">
		<intent-filter>
		<action android:name="android.settings.CMLICENSE" />
		<category android:name="android.intent.category.DEFAULT" />
		</intent-filter>
		</activity>

		<activity android:name="SettingsSafetyLegalActivity"
		android:label="@string/settings_safetylegal_activity_title"
		android:theme="@*android:style/Theme.Holo.Dialog.Alert">

res/layout-finger/order_power_widget_button_list_item.xml

deleted100644 → 0

+0 −72

Original line number	Diff line number	Diff line
		<?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.
		*/
		-->
		<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
		android:layout_width="match_parent"
		android:layout_height="64dip"
		android:gravity="bottom"
		android:orientation="vertical"
		android:baselineAligned="false">

		<ImageView
		android:layout_width="match_parent"
		android:layout_height="wrap_content"
		android:background="@android:drawable/divider_horizontal_dark" />

		<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
		android:layout_width="match_parent"
		android:layout_height="64dip"
		android:gravity="center_vertical"
		android:ignoreGravity="@+id/icon">

		<!-- left icon, used for the grabber -->
		<ImageView android:id="@+id/grabber"
		android:src="@drawable/ic_grabber"
		android:layout_alignParentLeft="true"
		android:layout_alignParentTop="true"
		android:layout_alignParentBottom="true"
		android:layout_width="wrap_content"
		android:layout_height="wrap_content"/>

		<!-- icon representing the galaxy s widget button -->
		<ImageView android:id="@+id/icon"
		android:layout_alignParentRight="true"
		android:layout_alignParentTop = "true"
		android:layout_alignParentBottom = "true"
		android:layout_width="wrap_content"
		android:layout_height="wrap_content"
		android:layout_marginRight="10dip" />

		<!-- The height is set to half the height of the parent, which is 64 dip -->
		<TextView android:id="@+id/name"
		android:textAppearance="?android:attr/textAppearanceMedium"
		android:layout_width="wrap_content"
		android:paddingLeft="9dip"
		android:paddingRight="9dip"
		android:layout_height="wrap_content"
		android:layout_alignParentTop = "true"
		android:layout_alignParentBottom = "true"
		android:layout_toRightOf="@id/grabber"
		android:layout_toLeftOf="@id/icon"
		android:ellipsize="marquee"
		android:gravity="center_vertical"
		android:singleLine="true" />

		</RelativeLayout>

		</LinearLayout>

res/layout-finger/wifi_network_priority.xml

+2 −2

Original line number	Diff line number	Diff line
		<?xml version="1.0" encoding="utf-8"?>
		<!-- Copyright (C) 2013 The Android Open Source Project
		<!--
		Copyright (C) 2013 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.
		@@ -13,7 +14,6 @@
		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="match_parent"

res/layout-finger/wifi_network_priority_list_item.xml

+60 −29

Original line number	Diff line number	Diff line
		<?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.
		*/
		Copyright (C) 2013 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="64dip"
		android:orientation="vertical">
		android:gravity="bottom"
		android:orientation="vertical"
		android:baselineAligned="false">

		<ImageView
		android:layout_width="match_parent"
		android:layout_height="wrap_content"
		android:background="@android:drawable/divider_horizontal_dark" />

		<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
		android:layout_width="match_parent"
		android:layout_height="64dip"
		android:gravity="center_vertical"
		android:ignoreGravity="@+id/icon">

		<!-- Icon used for the grabber -->
		<ImageView android:id="@+id/grabber"
		android:src="@drawable/ic_grabber"
		android:layout_alignParentStart="true"
		android:layout_alignParentTop="true"
		android:layout_alignParentBottom="true"
		android:layout_width="wrap_content"
		android:layout_height="wrap_content"/>

		<!-- Icon representing the security of the AP -->
		<ImageView android:id="@+id/icon"
		android:layout_alignParentEnd="true"
		android:layout_alignParentTop="true"
		android:layout_alignParentBottom="true"
		android:layout_width="wrap_content"
		android:layout_height="wrap_content"
		android:layout_marginEnd="10dip" />

		<!-- The height is set to half the height of the parent, which is 64 dip -->
		<TextView android:id="@+id/name"
		android:textAppearance="?android:attr/textAppearanceMedium"
		android:layout_width="wrap_content"
		android:paddingLeft="9dip"
		android:paddingRight="9dip"
		android:paddingStart="9dip"
		android:paddingEnd="9dip"
		android:layout_height="wrap_content"
		android:layout_alignParentTop="true"
		android:layout_alignParentBottom="true"
		android:layout_toEndOf="@id/grabber"
		android:layout_toStartOf="@id/icon"
		android:ellipsize="marquee"
		android:gravity="center_vertical"
		android:singleLine="true" />

		</RelativeLayout>

		</LinearLayout>

res/values-af/cm_arrays.xml

+5 −0

Original line number	Diff line number	Diff line
		@@ -77,4 +77,9 @@
		<item>15s \| 1m \| 5m</item>
		<item>30s \| 2m \| 5m</item>
		</string-array>
		<string-array name="multi_sim_entries">
		<item> Inskrywing 1 </item>
		<item> Inskrywing 2 </item>
		<item> Inskrywing 3 </item>
		</string-array>
		</resources>