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

Commit a0a23cce authored by Wysie's avatar Wysie
Browse files

Release 1.53. Merged ChainsDD's preferences with my code. Cleaned up code.

parent 766e6bff

AndroidManifest.xml

+7 −3
Original line number Diff line number Diff line
@@ -328,7 +328,6 @@ 
                <data android:mimeType="image/*" />

                <category android:name="android.intent.category.DEFAULT" />

            </intent-filter>       

            />

        </activity>        



        <!-- Activity used to select the groups that should be synced -->
@@ -376,7 +375,12 @@ 
            android:theme="@style/BackgroundOnly" />

            

	<!-- Wysie_Soh: Custom Intents -->

	<activity android:name="DialerSettingsUI" android:label="@string/dialersettingsui" />

	<activity android:name="ContactsPreferences">

            <intent-filter>

                <action android:name="android.intent.action.VIEW" />

                <category android:name="android.intent.category.DEFAULT" />

            </intent-filter>

        </activity>



    </application>

</manifest>

AndroidManifest.xml~

+7 −3
Original line number Diff line number Diff line
@@ -328,7 +328,6 @@ 
                <data android:mimeType="image/*" />

                <category android:name="android.intent.category.DEFAULT" />

            </intent-filter>       

            />

        </activity>        



        <!-- Activity used to select the groups that should be synced -->
@@ -376,7 +375,12 @@ 
            android:theme="@style/BackgroundOnly" />

            

	<!-- Wysie_Soh: Custom Intents -->

	<activity android:name="DialerSettingsUI" android:label="@string/dialersettingsui" />

	<activity android:name="ContactsPreferences">

            <intent-filter>

                <action android:name="android.intent.action.VIEW" />

                <category android:name="android.intent.category.DEFAULT" />

            </intent-filter>

        </activity>



    </application>

</manifest>

res/layout-finger/contacts_list_item.xml

+26 −2
Original line number Diff line number Diff line
@@ -20,10 +20,9 @@ 
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"

    android:layout_width="fill_parent"

    android:layout_height="?android:attr/listPreferredItemHeight"

    android:paddingLeft="14dip"

    android:paddingLeft="7dip"

    android:paddingRight="5dip"

>



    <ImageView android:id="@+id/presence"

        android:layout_width="32dip"

        android:layout_height="32dip"
@@ -78,4 +77,29 @@ 
        android:textAppearance="?android:attr/textAppearanceLarge"

    />

    

    <!-- ToDo: Not working :(

    <com.android.contacts.ui.widget.DontPressWithParentImageView

    	android:id="@+id/call_icon"

        android:layout_width="wrap_content"

        android:layout_height="fill_parent"

        android:paddingLeft="14dip"

        android:paddingRight="14dip"

        android:layout_alignParentRight="true"



        android:gravity="center_vertical"

        android:src="@android:drawable/sym_action_call"

        android:background="@drawable/call_background"

    />



    <View android:id="@+id/divider"

        android:layout_width="1px"

        android:layout_height="fill_parent"

        android:layout_marginTop="5dip"

        android:layout_marginBottom="5dip"

        android:layout_toLeftOf="@id/call_icon"

        android:layout_marginLeft="11dip"

        android:background="@drawable/divider_vertical_dark"

    />

    -->



</RelativeLayout>

res/layout-finger/dialer_settings.xml

deleted100644 → 0
+0 −46
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"

    android:orientation="vertical"

    android:padding="10dip"

    android:layout_width="fill_parent"

    android:layout_height="wrap_content">



    <TextView

    	android:id="@+id/prefstitle"

        android:layout_width="fill_parent"

        android:layout_height="wrap_content"

        android:layout_marginTop="10dip"

        android:text="@string/prefs_left_button_title"

    />



    <Spinner 

        android:id="@+id/actionspinner"

        android:layout_width="fill_parent"

        android:layout_height="wrap_content"

        android:drawSelectorOnTop="true"

        android:prompt="@string/prefs_left_button_prompt"

    />

    

    <TextView

        android:layout_width="fill_parent"

        android:layout_height="wrap_content"

        android:layout_marginTop="10dip"

        android:text="@string/prefs_voicemailapp"

    />    

    

    <Spinner 

        android:id="@+id/voicemailapps"

        android:layout_width="fill_parent"

        android:layout_height="wrap_content"

        android:drawSelectorOnTop="true"

        android:prompt="@string/prefs_voicemailapp_prompt"

    />

    

    <CheckBox

    	android:id="@+id/sensor_checkbox"

    	android:text="@string/prefs_sensor"

    	android:layout_width="wrap_content"

    	android:layout_height="wrap_content" />



</LinearLayout>

res/layout-finger/dialer_settings.xml~

deleted100644 → 0
+0 −45
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"

    android:orientation="vertical"

    android:padding="10dip"

    android:layout_width="fill_parent"

    android:layout_height="wrap_content">



    <TextView

        android:layout_width="fill_parent"

        android:layout_height="wrap_content"

        android:layout_marginTop="10dip"

        android:text="@string/prefs_left_button_title"

    />



    <Spinner 

        android:id="@+id/actionspinner"

        android:layout_width="fill_parent"

        android:layout_height="wrap_content"

        android:drawSelectorOnTop="true"

        android:prompt="@string/prefs_left_button_prompt"

    />

    

    <TextView

        android:layout_width="fill_parent"

        android:layout_height="wrap_content"

        android:layout_marginTop="10dip"

        android:text="@string/prefs_voicemailapp"

    />    

    

    <Spinner 

        android:id="@+id/voicemailapps"

        android:layout_width="fill_parent"

        android:layout_height="wrap_content"

        android:drawSelectorOnTop="true"

        android:prompt="@string/prefs_voicemailapp_prompt"

    />

    

    <CheckBox

    	android:id="@+id/sensor_checkbox"

    	android:text="@string/prefs_sensor"

    	android:layout_width="wrap_content"

    	android:layout_height="wrap_content" />



</LinearLayout>