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

Commit b7500bd8 authored by Daniel Velazco's avatar Daniel Velazco
Browse files

Added setting to customize the color of the screensaver time

parent 27c69d5e
Loading
Loading
Loading
Loading
+12 −0
Original line number Diff line number Diff line
@@ -57,6 +57,18 @@
            </intent-filter>
        </activity>
        
        <activity 
        	android:name="ColorPicker" 
			android:label="@string/color_picker"
			android:taskAffinity=""
			android:excludeFromRecents="true"
			android:theme="@android:style/Theme.Dialog">
			<intent-filter>
            	<action android:name="com.android.alarmclock.ColorPicker" />
            	<category android:name="android.intent.category.DEFAULT" />
            </intent-filter>
		</activity>

        <activity android:name="SetAlarm" android:label="@string/set_alarm"
                android:configChanges="orientation|keyboardHidden|keyboard|navigation" />

+94 −0
Original line number Diff line number Diff line
<?xml version="1.0" encoding="utf-8"?>
<FrameLayout 
	xmlns:android="http://schemas.android.com/apk/res/android"
	android:id="@+id/colorPickerFrame" 
	android:layout_width="380dip" 
	android:layout_height="260dip" >
	
	
	<TextView 
		android:id="@+id/color_picker_alpha" 
		android:text="@string/color_picker_alpha"
		android:layout_width="wrap_content" 
		android:layout_height="wrap_content"
		android:layout_gravity="top|left"
		android:layout_marginTop="0dip" />
	
	<SeekBar 
		android:id="@+id/a_seekbar" 
		android:layout_width="150dip" 
		android:layout_height="30dip"
		android:layout_gravity="top|left"
		android:layout_marginTop="20dip"
		android:max="255" 
        android:progress="0" />
    
    <TextView 
		android:id="@+id/color_picker_red" 
		android:text="@string/color_picker_red"
		android:layout_width="wrap_content" 
		android:layout_height="wrap_content"
		android:layout_gravity="top|left"
		android:layout_marginTop="50dip" />
        
	<SeekBar 
		android:id="@+id/r_seekbar" 
		android:layout_width="150dip" 
		android:layout_height="30dip"
		android:layout_gravity="top|left"
		android:layout_marginTop="70dip"
		android:max="255" 
        android:progress="0" />
    
    <TextView 
		android:id="@+id/color_picker_green" 
		android:text="@string/color_picker_green"
		android:layout_width="wrap_content" 
		android:layout_height="wrap_content"
		android:layout_gravity="top|left"
		android:layout_marginTop="100dip" />
    
    <SeekBar 
		android:id="@+id/g_seekbar" 
		android:layout_width="150dip" 
		android:layout_height="30dip"
		android:layout_gravity="top|left"
		android:layout_marginTop="120dip"
		android:max="255" 
        android:progress="0" />  
        
	<TextView 
		android:id="@+id/color_picker_blue" 
		android:text="@string/color_picker_blue"
		android:layout_width="wrap_content" 
		android:layout_height="wrap_content"
		android:layout_gravity="top|left"
		android:layout_marginTop="150dip" />
    
    <SeekBar 
		android:id="@+id/b_seekbar" 
		android:layout_width="150dip" 
		android:layout_height="30dip"
		android:layout_gravity="top|left"
		android:layout_marginTop="170dip"
		android:max="255" 
        android:progress="0" />  
        
	<FrameLayout 
		android:id="@+id/colorsampleLayout"
		android:background="#000" 
		android:layout_width="200dip" 
		android:layout_height="100dip"
		android:layout_gravity="center_horizontal|right"
		android:layout_marginTop="50dip"
		android:layout_marginRight="10dip">
		
		<TextView 
			android:id="@+id/color_picker_sample"
			android:text="@string/color_picker_sample"
			android:textSize="60dip" 
			android:layout_width="wrap_content" 
			android:layout_height="wrap_content" android:layout_gravity="center"/>
			
	</FrameLayout>
</FrameLayout>
+94 −0
Original line number Diff line number Diff line
<?xml version="1.0" encoding="utf-8"?>
<FrameLayout 
	xmlns:android="http://schemas.android.com/apk/res/android"
	android:id="@+id/colorPickerFrame" 
	android:layout_width="270dip" 
	android:layout_height="320dip" >
	
	
	<TextView 
		android:id="@+id/color_picker_alpha" 
		android:text="@string/color_picker_alpha"
		android:layout_width="wrap_content" 
		android:layout_height="wrap_content"
		android:layout_gravity="top|center"
		android:layout_marginTop="0dip" />
	
	<SeekBar 
		android:id="@+id/a_seekbar" 
		android:layout_width="180dip" 
		android:layout_height="30dip"
		android:layout_gravity="top|center"
		android:layout_marginTop="20dip"
		android:max="255" 
        android:progress="0" />
    
    <TextView 
		android:id="@+id/color_picker_red" 
		android:text="@string/color_picker_red"
		android:layout_width="wrap_content" 
		android:layout_height="wrap_content"
		android:layout_gravity="top|center"
		android:layout_marginTop="50dip" />
        
	<SeekBar 
		android:id="@+id/r_seekbar" 
		android:layout_width="180dip" 
		android:layout_height="30dip"
		android:layout_gravity="top|center"
		android:layout_marginTop="70dip"
		android:max="255" 
        android:progress="0" />
    
    <TextView 
		android:id="@+id/color_picker_green" 
		android:text="@string/color_picker_green"
		android:layout_width="wrap_content" 
		android:layout_height="wrap_content"
		android:layout_gravity="top|center"
		android:layout_marginTop="100dip" />
    
    <SeekBar 
		android:id="@+id/g_seekbar" 
		android:layout_width="180dip" 
		android:layout_height="30dip"
		android:layout_gravity="top|center"
		android:layout_marginTop="120dip"
		android:max="255" 
        android:progress="0" />  
        
	<TextView 
		android:id="@+id/color_picker_blue" 
		android:text="@string/color_picker_blue"
		android:layout_width="wrap_content" 
		android:layout_height="wrap_content"
		android:layout_gravity="top|center"
		android:layout_marginTop="150dip" />
    
    <SeekBar 
		android:id="@+id/b_seekbar" 
		android:layout_width="180dip" 
		android:layout_height="30dip"
		android:layout_gravity="top|center"
		android:layout_marginTop="170dip"
		android:max="255" 
        android:progress="0" />  
        
	<FrameLayout 
		android:id="@+id/colorsampleLayout"
		android:background="#000" 
		android:layout_width="200dip" 
		android:layout_height="100dip"
		android:layout_gravity="bottom|center"
		android:layout_marginBottom="15dip">

		<TextView 
			android:id="@+id/color_picker_sample"
			android:text="@string/color_picker_sample"
			android:textSize="80dip" 
			android:layout_width="wrap_content" 
			android:layout_height="wrap_content"
			android:layout_gravity="center" />
			
	</FrameLayout>
</FrameLayout>
+18 −0
Original line number Diff line number Diff line
@@ -302,6 +302,24 @@
      <item>60</item>
    </string-array>
    
    <!-- Setting title for screensaver time color picker general title-->
    <string name="color_picker">Time Color</string>
    
    <!-- Setting title for screensaver time color picker -->
    <string name="color_picker_title">Time Color (Screensaver)</string>
    
    <!-- Setting title for screensaver time color picker -->
    <string name="color_picker_summary">Change the color of the time used in screensaver mode</string>
    
    <!-- Sample time used in color picker -->
    <string name="color_picker_sample">11:45</string>
    
    <!-- Labels for colors in color picker -->
    <string name="color_picker_alpha">Transparency (Dimmed only)</string>
    <string name="color_picker_red">Red</string>
    <string name="color_picker_green">Green</string>
    <string name="color_picker_blue">Blue</string>
    
</resources>

+10 −0
Original line number Diff line number Diff line
@@ -63,4 +63,14 @@
        android:defaultValue="5" 
        android:dialogTitle="@string/screensaver_timeout_title"/>
        
	<PreferenceScreen
			android:key="color_picker"
			android:title="@string/color_picker_title"
			android:summary="@string/color_picker_summary">
			<intent
				android:action="com.android.alarmclock.ColorPicker"
				android:targetPackage="com.android.alarmclock"
				android.targetClass="com.android.alarmclock.ColorPicker"/>
		</PreferenceScreen>
		
</PreferenceScreen>
Loading