Skip to content

Commit

Permalink
Merge branch 't13_notification_panel_support' into t3_alarm_cancel_wi…
Browse files Browse the repository at this point in the history 
…th_password

Conflicts:
	p2psafety-android/p2psafety/res/values-ru/strings.xml
	p2psafety-android/p2psafety/res/values/strings.xml
  • Loading branch information
@UncleVasya
UncleVasya committed Jan 14, 2014
2 parents 2edce77 + ebdbc24 commit bb6cd79
Show file tree
Hide file tree
Showing 31 changed files with 1,244 additions and 413 deletions.
Binary file added p2psafety-android/libs/activation.jar
View file
Binary file not shown.
Binary file added p2psafety-android/libs/additionnal.jar
View file
Binary file not shown.
Binary file added p2psafety-android/libs/mail.jar
View file
Binary file not shown.
3 changes: 3 additions & 0 deletions p2psafety-android/p2psafety/AndroidManifest.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,9 @@
<uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION"/>
<uses-permission android:name="android.permission.ACCESS_FINE_LOCATION"/>
<uses-permission android:name="android.permission.INTERNET"/>
<uses-permission android:name="android.permission.GET_ACCOUNTS"/>
<uses-permission android:name="android.permission.USE_CREDENTIALS"/>
<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE"/>

<uses-feature android:name="android.hardware.telephony"/>

Expand Down
170 changes: 77 additions & 93 deletions p2psafety-android/p2psafety/res/layout/frag_message.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,129 +4,113 @@
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical"
>
>

<LinearLayout
android:layout_width="match_parent"
android:layout_height="0dp"
android:orientation="vertical"
android:layout_weight="1"
android:focusable="true"
android:focusableInTouchMode="true">
android:layout_width="match_parent"
android:layout_height="0dp"
android:layout_weight="1"
android:focusable="true"
android:focusableInTouchMode="true"
android:orientation="vertical">

<LinearLayout
android:orientation="vertical"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:animateLayoutChanges="true">
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:animateLayoutChanges="true"
android:orientation="vertical">

<FrameLayout
android:layout_width="match_parent"
android:layout_height="5dp"
android:visibility="gone"
android:id="@+id/frame_indent2"/>
android:id="@+id/frame_indent2"
android:layout_width="match_parent"
android:layout_height="5dp"
android:visibility="gone"/>

<ImageView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:id="@+id/img_protect"
android:src="@drawable/protect2"
android:focusable="true"
android:contentDescription="protect yourself"
android:adjustViewBounds="true"

/>
android:id="@+id/img_protect"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:adjustViewBounds="true"
android:contentDescription="@string/protect_description"
android:focusable="true"
android:src="@drawable/protect2"

/>
</LinearLayout>

<!-- android:scaleType="fitXY" -->

<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@color/SOSRed">
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@color/SOSRed">


<TextView
android:layout_width="0dp"
android:layout_height="match_parent"
android:textAppearance="?android:attr/textAppearanceLarge"
android:text="@string/enter_message"
android:id="@+id/textView"
android:gravity="center_vertical"
android:layout_weight="1"
android:layout_marginLeft="@dimen/activity_horizontal_margin"
android:paddingTop="@dimen/st_padding"
android:paddingBottom="@dimen/c_padding"
style="@style/TextButton"/>
android:id="@+id/textView"
style="@style/TextButton"
android:layout_width="0dp"
android:layout_height="match_parent"
android:layout_marginLeft="@dimen/activity_horizontal_margin"
android:layout_weight="1"
android:gravity="center_vertical"
android:paddingBottom="@dimen/c_padding"
android:paddingTop="@dimen/st_padding"
android:text="@string/enter_message"
android:textAppearance="?android:attr/textAppearanceLarge"/>

<CheckBox

android:layout_width="wrap_content"
android:layout_height="match_parent"
android:id="@+id/chk_geo"
android:layout_gravity="center"
android:padding="@dimen/st_padding"
android:layout_marginLeft="1dp"
android:layout_marginRight="1dp"

android:checked="false"
android:button="@drawable/chk_geo"/>

android:id="@+id/chk_geo"
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:layout_gravity="center"
android:layout_marginLeft="1dp"
android:layout_marginRight="1dp"
android:button="@drawable/chk_geo"
android:checked="false"
android:padding="@dimen/st_padding"/>

</LinearLayout>



<EditText
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:inputType="textMultiLine"
android:id="@+id/edt_msg"
android:phoneNumber="true"
android:layout_weight="1"
android:paddingLeft="@dimen/activity_horizontal_margin"
android:padding="@dimen/st_padding"
android:maxLength="69"
android:gravity="top"
android:singleLine="false"/>
<EditText
android:id="@+id/edt_msg"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_weight="1"
android:gravity="top"
android:inputType="textMultiLine"
android:maxLength="69"
android:padding="@dimen/st_padding"
android:paddingLeft="@dimen/activity_horizontal_margin"
android:phoneNumber="true"
android:singleLine="false"/>


<!-- Don't touch it. it's magic-->
<ListView
android:layout_width="match_parent"
android:layout_height="0dp"
android:background="@color/Transparent"
android:id="@+id/lsv_numbers"
android:layout_weight="0.01"/>
android:id="@+id/lsv_numbers"
android:layout_width="match_parent"
android:layout_height="0dp"
android:layout_weight="0.01"
android:background="@color/Transparent"/>

</LinearLayout>

<LinearLayout
android:layout_width="fill_parent"
android:layout_height="wrap_content">

<Button
android:layout_width="0dp"
android:layout_height="match_parent"
android:text="@string/btn_test"
android:id="@+id/btn_sos"
android:layout_weight="1"
android:layout_marginRight="2dp"
android:background="@drawable/btn_sel"
android:padding="@dimen/st_padding"
style="@style/TextButton"
android:singleLine="true"
/>
android:layout_width="fill_parent"
android:layout_height="wrap_content">

<Button
android:layout_width="0dp"
android:layout_height="match_parent"
android:text="@string/btn_save"
android:id="@+id/btn_save"
android:layout_weight="1"
android:layout_marginLeft="2dp"
android:background="@drawable/btn_sel"
android:padding="@dimen/st_padding"
android:singleLine="true"
style="@style/TextButton"/>
android:id="@+id/btn_save"
style="@style/TextButton"
android:layout_width="0dp"
android:layout_height="match_parent"
android:layout_weight="1"
android:background="@drawable/btn_sel"
android:padding="@dimen/st_padding"
android:singleLine="true"
android:text="@string/btn_save"/>
</LinearLayout>

</LinearLayout>
90 changes: 39 additions & 51 deletions p2psafety-android/p2psafety/res/layout/frag_sendmessage.xml
View file
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
<?xml version="1.0" encoding="utf-8"?>

<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:orientation="vertical"
android:layout_width="match_parent"
android:layout_height="match_parent">
android:layout_height="match_parent"
android:orientation="vertical">

<Button
style="@style/TextButton"
Expand All @@ -19,65 +19,53 @@
android:layout_marginTop="10dp" />

<FrameLayout
android:layout_width="fill_parent"
android:layout_height="0dp"
android:layout_weight="1"
>
android:layout_width="fill_parent"
android:layout_height="0dp"
android:layout_weight="1"
>

<ImageView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:id="@+id/button"
android:layout_gravity="center"
android:src="@drawable/sos_sel"
android:adjustViewBounds="true"
android:layout_marginLeft="20dp"
android:layout_marginRight="20dp"/>
android:id="@+id/button"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:layout_marginLeft="20dp"
android:layout_marginRight="20dp"
android:adjustViewBounds="true"
android:contentDescription="@string/protect_description"
android:src="@drawable/sos_sel"/>
</FrameLayout>


<TextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:textAppearance="?android:attr/textAppearanceLarge"
android:textColor="@color/SOSRed"
android:text="@string/hold"
android:id="@+id/textView"
android:layout_gravity="center"
android:gravity="center"
android:paddingBottom="25dp"
android:paddingLeft="15dp"
android:paddingTop="15dp"
android:paddingRight="15dp"
android:textStyle="bold"/>
android:id="@+id/textView"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:gravity="center"
android:paddingBottom="25dp"
android:paddingLeft="15dp"
android:paddingRight="15dp"
android:paddingTop="15dp"
android:text="@string/hold"
android:textAppearance="?android:attr/textAppearanceLarge"
android:textColor="@color/SOSRed"
android:textStyle="bold"/>

<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content">

<Button
android:layout_width="0dp"
android:layout_height="wrap_content"
android:text="@string/add_phone"
android:id="@+id/btn_phone"
android:layout_weight="1"
android:background="@drawable/btn_sel"
android:padding="@dimen/st_padding"
android:layout_marginRight="2dp"
android:singleLine="true"
style="@style/TextButton"/>
android:layout_width="match_parent"
android:layout_height="wrap_content">

<Button
android:layout_width="0dp"
android:layout_height="wrap_content"
android:text="@string/edit_message"
android:id="@+id/btn_edt"
android:layout_weight="1"
android:background="@drawable/btn_sel"
android:padding="@dimen/st_padding"
android:layout_marginLeft="2dp"
android:singleLine="true"
style="@style/TextButton"/>
android:id="@+id/btn_settings"
style="@style/TextButton"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"
android:background="@drawable/btn_sel"
android:padding="@dimen/st_padding"
android:singleLine="true"
android:text="@string/settings"/>

</LinearLayout>

Expand Down
13 changes: 13 additions & 0 deletions p2psafety-android/p2psafety/res/layout/frag_settings.xml
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
<?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="match_parent"
android:orientation="vertical">

<ListView
android:id="@+id/settings_list"
android:layout_width="match_parent"
android:layout_height="wrap_content"/>

</LinearLayout>
Loading

0 comments on commit bb6cd79

Please sign in to comment.