Skip to content

Commit 8fa920f

Browse files
authored
Merge pull request #1118 from khimaros/master
app preference for custom power trigger
2 parents 7bb5a2c + d576fc4 commit 8fa920f

File tree

6 files changed

+36
-3
lines changed

6 files changed

+36
-3
lines changed

app/src/main/AndroidManifest.xml

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -92,6 +92,15 @@
9292
<action android:name="android.intent.action.ACTION_SHUTDOWN" />
9393
</intent-filter>
9494
</receiver>
95+
<receiver
96+
android:name="PowerReceiver"
97+
android:enabled="false"
98+
android:exported="false">
99+
<intent-filter>
100+
<action android:name="android.intent.action.SCREEN_ON" />
101+
<action android:name="android.intent.action.SCREEN_OFF" />
102+
</intent-filter>
103+
</receiver>
95104
<receiver
96105
android:name=".ActionReceiver"
97106
android:enabled="true"
@@ -113,4 +122,4 @@
113122
android:permission="android.permission.BIND_JOB_SERVICE" />
114123
</application>
115124

116-
</manifest>
125+
</manifest>
Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
package ru.meefik.linuxdeploy;
2+
3+
import android.content.BroadcastReceiver;
4+
import android.content.Context;
5+
import android.content.Intent;
6+
7+
public class PowerReceiver extends BroadcastReceiver {
8+
9+
@Override
10+
public void onReceive(final Context context, Intent intent) {
11+
EnvUtils.execService(context, "start", "core/power");
12+
}
13+
}

app/src/main/java/ru/meefik/linuxdeploy/PropertiesStore.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ class PropertiesStore extends ParamUtils {
1313
public static final String name = "properties_conf";
1414
private static final String[] params = {"method", "distrib", "arch", "suite", "source_path",
1515
"target_type", "target_path", "disk_size", "fs_type", "user_name", "user_password",
16-
"privileged_users", "locale", "dns", "net_trigger", "init", "init_path", "init_level",
16+
"privileged_users", "locale", "dns", "net_trigger", "power_trigger", "init", "init_path", "init_level",
1717
"init_user", "init_async", "ssh_port", "ssh_args", "pulse_host", "pulse_port", "graphics",
1818
"vnc_display", "vnc_depth", "vnc_dpi", "vnc_width", "vnc_height", "vnc_args",
1919
"x11_display", "x11_host", "x11_sdl", "x11_sdl_delay", "fb_display", "fb_dev",

app/src/main/res/values/preferences.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,7 @@
5151
<string name="locale" translatable="false">C</string>
5252
<string name="dns" translatable="false"></string>
5353
<string name="net_trigger" translatable="false"></string>
54+
<string name="power_trigger" translatable="false"></string>
5455
<string name="is_init" translatable="false">false</string>
5556
<string name="init" translatable="false">run-parts</string>
5657
<string name="init_path" translatable="false">/etc/rc.local</string>

app/src/main/res/values/strings.xml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -212,6 +212,9 @@
212212
<!-- NET_TRIGGER -->
213213
<string name="title_net_trigger_preference">Network trigger</string>
214214
<string name="dialog_title_net_trigger_preference">Path to trigger script</string>
215+
<!-- POWER_TRIGGER -->
216+
<string name="title_power_trigger_preference">Power trigger</string>
217+
<string name="dialog_title_power_trigger_preference">Path to trigger script</string>
215218

216219
<!-- INIT -->
217220
<string name="init_preferences">INIT</string>

app/src/main/res/xml/properties.xml

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -123,6 +123,13 @@
123123
android:summary="@string/net_trigger"
124124
android:title="@string/title_net_trigger_preference" />
125125

126+
<EditTextPreference
127+
android:defaultValue="@string/power_trigger"
128+
android:dialogTitle="@string/dialog_title_power_trigger_preference"
129+
android:key="power_trigger"
130+
android:summary="@string/power_trigger"
131+
android:title="@string/title_power_trigger_preference" />
132+
126133
</PreferenceCategory>
127134

128135
<PreferenceCategory android:title="@string/init_preferences">
@@ -235,4 +242,4 @@
235242

236243
</PreferenceCategory>
237244

238-
</PreferenceScreen>
245+
</PreferenceScreen>

0 commit comments

Comments
 (0)