Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix NPE on line pointerSettingsCategory #21

Open
wants to merge 9 commits into
base: kk4.4
Choose a base branch
from
Open

fix NPE on line pointerSettingsCategory #21

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
4f91944
Settings: handle stylus options only on full language settings
kufikugel Dec 23, 2013
303b9fc
Use java.util.Objects instead of internal API
kruton Dec 13, 2013
604b382
Settings: follow kitkat's ui
kroz Dec 23, 2013
da07ff3
Settings: QuickRecord Tile (2/2)
Jubakuba Dec 23, 2013
06fa106
Merge "Extended device settings translated to Russian" into kk4.4
kufikugel Dec 24, 2013
7810549
Settings: Chamber of Secrets (2/2) [WIP]
Jubakuba Dec 14, 2013
42a1ccf
Commits Ib20d4c7231f147674ed3afd4c438bd83aedbac1d and I4bee793580fe32…
gwindlord Dec 25, 2013
5b644fa
fix NPE on line pointerSettingsCategory
codlab Dec 25, 2013
748ca6f
adding merge
codlab Jan 25, 2014
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
33 changes: 27 additions & 6 deletions AndroidManifest.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -360,17 +360,20 @@
</intent-filter>
</activity-alias>

<activity android:name="ApnSettings"
<activity android:name="Settings$ApnSettingsActivity"
android:label="@string/apn_settings"
android:configChanges="orientation|keyboardHidden|screenSize"
android:launchMode="singleTask"
android:parentActivityName="Settings$WirelessSettingsActivity">
android:parentActivityName="Settings$WirelessSettingsActivity"
android:clearTaskOnLaunch="true">
<intent-filter>
<action android:name="android.intent.action.MAIN" />
<action android:name="android.settings.APN_SETTINGS" />
<category android:name="android.intent.category.DEFAULT" />
<category android:name="android.intent.category.VOICE_LAUNCH" />
</intent-filter>
<meta-data android:name="com.android.settings.FRAGMENT_CLASS"
android:value="com.android.settings.ApnSettings" />
</activity>

<activity android:name="Settings$BluetoothSettingsActivity"
Expand Down Expand Up @@ -1215,8 +1218,9 @@
<activity android:name=".deviceinfo.MiscFilesHandler"
android:theme="@android:style/Theme.Holo.DialogWhenLarge"/>

<activity android:name="ApnEditor"
android:label="@string/apn_edit">
<activity android:name="Settings$ApnEditorActivity"
android:label="@string/apn_edit"
android:clearTaskOnLaunch="true">
<intent-filter>
<action android:name="android.intent.action.VIEW" />
<action android:name="android.intent.action.EDIT" />
Expand All @@ -1229,6 +1233,8 @@
<category android:name="android.intent.category.DEFAULT" />
<data android:mimeType="vnd.android.cursor.dir/telephony-carrier" />
</intent-filter>
<meta-data android:name="com.android.settings.FRAGMENT_CLASS"
android:value="com.android.settings.ApnEditor" />
</activity>

<activity android:name="MediaFormat" android:label="@string/media_format_title">
Expand Down Expand Up @@ -1700,6 +1706,8 @@
android:excludeFromRecents="true"
android:theme="@*android:style/Theme.Holo.Dialog.Alert" />

<activity android:name=".ApnEditor" />

<!-- "Blacklist settings" UI, used only on voice-capable phone devices. -->
<activity android:name="Settings$BlacklistSettingsActivity"
android:theme="@android:style/Theme.Holo.DialogWhenLarge"
Expand Down Expand Up @@ -1730,9 +1738,22 @@
android:value="com.android.settings.slim.QuietHours" />
</activity>

<!-- Pseudo-activity used to provide an intent-filter entry point to quick tiles settings -->
<activity android:name="Settings$QuickSettingsTilesSettingsActivity"
android:label="@string/tile_picker_title"
android:taskAffinity=""
android:excludeFromRecents="true">
<intent-filter>
<action android:name="android.intent.action.MAIN" />
<category android:name="android.intent.category.DEFAULT" />
</intent-filter>
<meta-data android:name="com.android.settings.FRAGMENT_CLASS"
android:value="com.android.settings.slim.quicksettings.QuickSettingsTiles" />
</activity>

<!-- Pseudo-activity used to provide an intent-filter entry point to battery icon settings -->
<activity android:name="Settings$BatteryIconStyleSettingsActivity"
android:label="@string/quiet_hours_title"
android:label="@string/battery_icon_title"
android:taskAffinity=""
android:excludeFromRecents="true">
<intent-filter>
Expand All @@ -1745,7 +1766,7 @@

<!-- Pseudo-activity used to provide an intent-filter entry point to rotation settings -->
<activity android:name="Settings$DisplayRotationSettingsActivity"
android:label="@string/quiet_hours_title"
android:label="@string/display_rotation_title"
android:taskAffinity=""
android:excludeFromRecents="true">
<intent-filter>
Expand Down
Binary file modified res/drawable-hdpi/appwidget_settings_ind_mid_c_holo.9.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified res/drawable-hdpi/appwidget_settings_ind_mid_l_holo.9.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified res/drawable-hdpi/appwidget_settings_ind_mid_r_holo.9.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified res/drawable-hdpi/appwidget_settings_ind_on_c_holo.9.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified res/drawable-hdpi/appwidget_settings_ind_on_l_holo.9.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified res/drawable-hdpi/appwidget_settings_ind_on_r_holo.9.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified res/drawable-mdpi/appwidget_settings_ind_mid_c_holo.9.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified res/drawable-mdpi/appwidget_settings_ind_mid_l_holo.9.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified res/drawable-mdpi/appwidget_settings_ind_mid_r_holo.9.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified res/drawable-mdpi/appwidget_settings_ind_on_c_holo.9.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified res/drawable-mdpi/appwidget_settings_ind_on_l_holo.9.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified res/drawable-mdpi/appwidget_settings_ind_on_r_holo.9.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified res/drawable-nodpi/preview.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified res/drawable-xhdpi/appwidget_settings_ind_mid_c_holo.9.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified res/drawable-xhdpi/appwidget_settings_ind_mid_l_holo.9.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified res/drawable-xhdpi/appwidget_settings_ind_mid_r_holo.9.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified res/drawable-xhdpi/appwidget_settings_ind_on_c_holo.9.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified res/drawable-xhdpi/appwidget_settings_ind_on_l_holo.9.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified res/drawable-xhdpi/appwidget_settings_ind_on_r_holo.9.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified res/drawable-xxhdpi/appwidget_settings_ind_on_c_holo.9.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified res/drawable-xxhdpi/appwidget_settings_ind_on_l_holo.9.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified res/drawable-xxhdpi/appwidget_settings_ind_on_r_holo.9.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
4 changes: 2 additions & 2 deletions res/drawable/data_usage_bar.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,14 +23,14 @@
<item android:id="@android:id/secondaryProgress">
<clip>
<shape>
<solid android:color="#c050ade5" />
<solid android:color="#c0ffffff" />
</shape>
</clip>
</item>
<item android:id="@android:id/progress">
<clip>
<shape>
<solid android:color="#c050ade5" />
<solid android:color="#c0ffffff" />
</shape>
</clip>
</item>
Expand Down
290 changes: 290 additions & 0 deletions res/layout/custom_tile_dialog.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,290 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout
xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:padding="8dp"
android:orientation="vertical">

<TextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
style="?android:attr/textAppearanceSmall"
android:text="@string/custom_tile_dialog_text" />

<ScrollView
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_weight="0.5"
android:orientation="vertical">

<LinearLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical">

<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:minHeight="?android:attr/listPreferredItemHeight"
android:gravity="center_vertical"
android:orientation="horizontal">

<ImageButton
android:id="@+id/icon"
android:padding="5dp"
android:layout_width="@android:dimen/app_icon_size"
style="?android:attr/borderlessButtonStyle"
android:layout_height="@android:dimen/app_icon_size"
android:scaleType="centerInside" />

<View
android:layout_width="2dp"
android:layout_height="match_parent"
android:layout_marginTop="5dp"
android:layout_marginBottom="5dp"
android:layout_marginEnd="5dp"
android:layout_marginStart="5dp"
android:background="@android:drawable/divider_horizontal_dark" />

<Button
android:id="@+id/action"
android:layout_width="match_parent"
style="?android:attr/borderlessButtonStyle"
android:layout_weight="1"
android:gravity="start|center_vertical"
android:paddingStart="5dp"
android:layout_height="wrap_content" />

<View
android:layout_width="2dp"
android:layout_height="match_parent"
android:layout_marginTop="5dp"
android:layout_marginBottom="5dp"
android:layout_marginEnd="5dp"
android:layout_marginStart="5dp"
android:background="@android:drawable/divider_horizontal_dark" />

<ImageButton
android:id="@+id/reset"
android:padding="5dp"
android:src="@drawable/ic_settings_backup"
android:layout_width="@android:dimen/app_icon_size"
style="?android:attr/borderlessButtonStyle"
android:layout_height="@android:dimen/app_icon_size" />

</LinearLayout>

<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:minHeight="?android:attr/listPreferredItemHeight"
android:gravity="center_vertical"
android:orientation="horizontal">

<ImageButton
android:id="@+id/icon_two"
android:padding="5dp"
android:layout_width="@android:dimen/app_icon_size"
style="?android:attr/borderlessButtonStyle"
android:layout_height="@android:dimen/app_icon_size"
android:scaleType="centerInside" />

<View
android:layout_width="2dp"
android:layout_height="match_parent"
android:layout_marginTop="5dp"
android:layout_marginBottom="5dp"
android:layout_marginEnd="5dp"
android:layout_marginStart="5dp"
android:background="@android:drawable/divider_horizontal_dark" />

<Button
android:id="@+id/action_two"
android:layout_width="match_parent"
style="?android:attr/borderlessButtonStyle"
android:layout_weight="1"
android:gravity="start|center_vertical"
android:paddingStart="5dp"
android:layout_height="wrap_content" />

<View
android:layout_width="2dp"
android:layout_height="match_parent"
android:layout_marginTop="5dp"
android:layout_marginBottom="5dp"
android:layout_marginEnd="5dp"
android:layout_marginStart="5dp"
android:background="@android:drawable/divider_horizontal_dark" />

<ImageButton
android:id="@+id/reset_two"
android:padding="5dp"
android:src="@drawable/ic_settings_backup"
android:layout_width="@android:dimen/app_icon_size"
style="?android:attr/borderlessButtonStyle"
android:layout_height="@android:dimen/app_icon_size" />

</LinearLayout>

<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:minHeight="?android:attr/listPreferredItemHeight"
android:gravity="center_vertical"
android:orientation="horizontal">

<ImageButton
android:id="@+id/icon_three"
android:padding="5dp"
android:layout_width="@android:dimen/app_icon_size"
style="?android:attr/borderlessButtonStyle"
android:layout_height="@android:dimen/app_icon_size"
android:scaleType="centerInside" />

<View
android:layout_width="2dp"
android:layout_height="match_parent"
android:layout_marginTop="5dp"
android:layout_marginBottom="5dp"
android:layout_marginEnd="5dp"
android:layout_marginStart="5dp"
android:background="@android:drawable/divider_horizontal_dark" />

<Button
android:id="@+id/action_three"
android:layout_width="match_parent"
style="?android:attr/borderlessButtonStyle"
android:layout_weight="1"
android:gravity="start|center_vertical"
android:paddingStart="5dp"
android:layout_height="wrap_content" />

<View
android:layout_width="2dp"
android:layout_height="match_parent"
android:layout_marginTop="5dp"
android:layout_marginBottom="5dp"
android:layout_marginEnd="5dp"
android:layout_marginStart="5dp"
android:background="@android:drawable/divider_horizontal_dark" />

<ImageButton
android:id="@+id/reset_three"
android:padding="5dp"
android:src="@drawable/ic_settings_backup"
android:layout_width="@android:dimen/app_icon_size"
style="?android:attr/borderlessButtonStyle"
android:layout_height="@android:dimen/app_icon_size" />

</LinearLayout>

<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:minHeight="?android:attr/listPreferredItemHeight"
android:gravity="center_vertical"
android:orientation="horizontal">

<ImageButton
android:id="@+id/icon_four"
android:padding="5dp"
android:layout_width="@android:dimen/app_icon_size"
style="?android:attr/borderlessButtonStyle"
android:layout_height="@android:dimen/app_icon_size"
android:scaleType="centerInside" />

<View
android:layout_width="2dp"
android:layout_height="match_parent"
android:layout_marginTop="5dp"
android:layout_marginBottom="5dp"
android:layout_marginEnd="5dp"
android:layout_marginStart="5dp"
android:background="@android:drawable/divider_horizontal_dark" />

<Button
android:id="@+id/action_four"
android:layout_width="match_parent"
style="?android:attr/borderlessButtonStyle"
android:layout_weight="1"
android:gravity="start|center_vertical"
android:paddingStart="5dp"
android:layout_height="wrap_content" />

<View
android:layout_width="2dp"
android:layout_height="match_parent"
android:layout_marginTop="5dp"
android:layout_marginBottom="5dp"
android:layout_marginEnd="5dp"
android:layout_marginStart="5dp"
android:background="@android:drawable/divider_horizontal_dark" />

<ImageButton
android:id="@+id/reset_four"
android:padding="5dp"
android:src="@drawable/ic_settings_backup"
android:layout_width="@android:dimen/app_icon_size"
style="?android:attr/borderlessButtonStyle"
android:layout_height="@android:dimen/app_icon_size" />

</LinearLayout>

<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:minHeight="?android:attr/listPreferredItemHeight"
android:gravity="center_vertical"
android:orientation="horizontal">

<ImageButton
android:id="@+id/icon_five"
android:padding="5dp"
android:layout_width="@android:dimen/app_icon_size"
style="?android:attr/borderlessButtonStyle"
android:layout_height="@android:dimen/app_icon_size"
android:scaleType="centerInside" />

<View
android:layout_width="2dp"
android:layout_height="match_parent"
android:layout_marginTop="5dp"
android:layout_marginBottom="5dp"
android:layout_marginEnd="5dp"
android:layout_marginStart="5dp"
android:background="@android:drawable/divider_horizontal_dark" />

<Button
android:id="@+id/action_five"
android:layout_width="match_parent"
style="?android:attr/borderlessButtonStyle"
android:layout_weight="1"
android:gravity="start|center_vertical"
android:paddingStart="5dp"
android:layout_height="wrap_content" />

<View
android:layout_width="2dp"
android:layout_height="match_parent"
android:layout_marginTop="5dp"
android:layout_marginBottom="5dp"
android:layout_marginEnd="5dp"
android:layout_marginStart="5dp"
android:background="@android:drawable/divider_horizontal_dark" />

<ImageButton
android:id="@+id/reset_five"
android:padding="5dp"
android:src="@drawable/ic_settings_backup"
android:layout_width="@android:dimen/app_icon_size"
style="?android:attr/borderlessButtonStyle"
android:layout_height="@android:dimen/app_icon_size" />

</LinearLayout>

</LinearLayout>

</ScrollView>

</LinearLayout>
Loading