Commit 9d24a592 authored by Aline Bonnet's avatar Aline Bonnet
Browse files

clean up the resources



This commit removes all files or entries not used in the resources.

Change-Id: I2f9eb86520e3e7dc50d148fe9e926f157fa8cd41
Reviewed-by: default avatarHadrien De Sousa <hadrien.desousa@savoirfairelinux.com>
parent 483bebfe
......@@ -50,41 +50,6 @@ public class ConferenceDFragment extends DialogFragment implements LoaderManager
@Override
public Dialog onCreateDialog(Bundle savedInstanceState) {
View rootView = LayoutInflater.from(getActivity()).inflate(R.layout.dialog_conference, null);
/*
ArrayList<Conference> calls = getArguments().getParcelableArrayList("calls");
final Conference call_selected = getArguments().getParcelable("call_selected");
mAdapter = new SimpleCallListAdapter(getActivity(), calls);
ListView list = (ListView) rootView.findViewById(R.id.concurrent_calls);
list.setAdapter(mAdapter);
list.setOnItemClickListener(new OnItemClickListener() {
@Override
public void onItemClick(AdapterView<?> arg0, View arg1, int pos, long arg3) {
Intent in = new Intent();
in.putExtra("transfer", call_selected);
in.putExtra("target", mAdapter.getItem(pos));
getTargetFragment().onActivityResult(getTargetRequestCode(), 0, in);
dismiss();
}
});
list.setEmptyView(rootView.findViewById(R.id.empty_view));
final AlertDialog a = new AlertDialog.Builder(getActivity()).setView(rootView).setTitle("Transfer " + call_selected.getParticipants().get(0).getContact())
.setNegativeButton(android.R.string.no, new DialogInterface.OnClickListener() {
public void onClick(DialogInterface dialog, int whichButton) {
dismiss();
}
}).create();
return a;*/
return null;
}
......
......@@ -86,72 +86,6 @@ public class TransferDFragment extends DialogFragment implements LoaderManager.L
@Override
public Dialog onCreateDialog(Bundle savedInstanceState) {
View rootView = LayoutInflater.from(getActivity()).inflate(R.layout.dialog_transfer, null);
/*
ArrayList<Conference> calls = getArguments().getParcelableArrayList("calls");
final SipCall call_selected = getArguments().getParcelable("call_selected");
mAdapter = new SimpleCallListAdapter(getActivity(), calls);
ListView list = (ListView) rootView.findViewById(R.id.concurrent_calls);
list.setAdapter(mAdapter);
list.setOnItemClickListener(new OnItemClickListener() {
@Override
public void onItemClick(AdapterView<?> arg0, View arg1, int pos, long arg3) {
Intent in = new Intent();
in.putExtra("target", mAdapter.getItem(pos));
in.putExtra("transfer", call_selected);
getTargetFragment().onActivityResult(getTargetRequestCode(), RESULT_TRANSFER_CONF, in);
dismiss();
}
});
list.setEmptyView(rootView.findViewById(R.id.empty_view));
mEditText = (AutoCompleteTextView) rootView.findViewById(R.id.external_number);
mEditText.setAdapter(autoCompleteAdapter);
final AlertDialog a = new AlertDialog.Builder(getActivity()).setView(rootView)
.setTitle("Transfer " + call_selected.getContact().getDisplayName())
.setPositiveButton(android.R.string.ok, new DialogInterface.OnClickListener() {
@Override
public void onClick(DialogInterface dialog, int whichButton) {
}
}).setNegativeButton(android.R.string.no, new DialogInterface.OnClickListener() {
@Override
public void onClick(DialogInterface dialog, int whichButton) {
getTargetFragment().onActivityResult(getTargetRequestCode(), Activity.RESULT_CANCELED, new Intent());
dismiss();
}
}).create();
a.setOnShowListener(new OnShowListener() {
@Override
public void onShow(DialogInterface dialog) {
Button b = a.getButton(AlertDialog.BUTTON_POSITIVE);
b.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View view) {
if(mEditText.getText().length() == 0){
Toast.makeText(getActivity(), "Enter a number to transfer this call", Toast.LENGTH_SHORT).show();
} else {
Intent in = new Intent();
in.putExtra("to_number", mEditText.getText().toString());
in.putExtra("transfer", call_selected);
getTargetFragment().onActivityResult(getTargetRequestCode(), RESULT_TRANSFER_NUMBER, in);
dismiss();
}
}
});
}
});
return a;*/
return null;
}
......
<?xml version="1.0" encoding="utf-8"?>
<set xmlns:android="http://schemas.android.com/apk/res/android">
<alpha
android:fromAlpha="0.0"
android:toAlpha="1.0"
android:interpolator="@android:anim/accelerate_interpolator"
android:duration="@android:integer/config_shortAnimTime"
android:repeatCount="0" />
</set>
\ No newline at end of file
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="24dp"
android:height="24dp"
android:viewportWidth="24.0"
android:viewportHeight="24.0">
<path
android:pathData="M18,8h-1L17,6c0,-2.76 -2.24,-5 -5,-5S7,3.24 7,6v2L6,8c-1.1,0 -2,0.9 -2,2v10c0,1.1 0.9,2 2,2h12c1.1,0 2,-0.9 2,-2L20,10c0,-1.1 -0.9,-2 -2,-2zM12,17c-1.1,0 -2,-0.9 -2,-2s0.9,-2 2,-2 2,0.9 2,2 -0.9,2 -2,2zM15.1,8L8.9,8L8.9,6c0,-1.71 1.39,-3.1 3.1,-3.1 1.71,0 3.1,1.39 3.1,3.1v2z"
android:fillColor="#FFFFFF"/>
</vector>
<?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:state_pressed="true"><shape xmlns:android="http://schemas.android.com/apk/res/android">
<solid android:color="@color/darker_gray" />
<padding android:bottom="@dimen/padding_large" android:left="@dimen/padding_large" android:right="@dimen/padding_large" android:top="@dimen/padding_large" />
</shape></item>
<item android:state_focused="true"><shape xmlns:android="http://schemas.android.com/apk/res/android">
<solid android:color="@color/light" />
<padding android:bottom="@dimen/padding_large" android:left="@dimen/padding_large" android:right="@dimen/padding_large" android:top="@dimen/padding_large" />
</shape></item>
<item><shape xmlns:android="http://schemas.android.com/apk/res/android">
<solid android:color="@color/light" />
<padding android:bottom="@dimen/padding_large" android:left="@dimen/padding_large" android:right="@dimen/padding_large" android:top="@dimen/padding_large" />
</shape></item>
</selector>
\ No newline at end of file
......@@ -7,7 +7,6 @@
tools:context=".client.AccountEditionActivity">
<LinearLayout
android:id="@+id/header_container"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@color/color_primary_light"
......
<?xml version="1.0" encoding="utf-8"?>
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools" android:layout_width="match_parent"
android:layout_height="match_parent"
tools:context="cx.ring.client.NewConversationActivity">
<fragment
android:layout_width="match_parent"
android:layout_height="match_parent"
android:name="cx.ring.fragments.ContactListFragment"
android:id="@+id/fragment"
android:layout_alignParentTop="true"
android:layout_alignParentLeft="true"
android:layout_alignParentStart="true"
tools:layout="@layout/frag_contact_list" />
</RelativeLayout>
......@@ -56,7 +56,6 @@ along with this program. If not, see <https://www.gnu.org/licenses/>.
android:layout_height="wrap_content">
<LinearLayout
android:id="@+id/fields_container"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical">
......
<?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="wrap_content">
<EditText
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:inputType="textPassword"
android:ems="10"
android:id="@+id/pwd_txt"
android:layout_gravity="center_horizontal"
android:hint="@string/account_restore_decryption_password"
android:layout_marginLeft="20dp"
android:layout_marginRight="20dp"
android:layout_marginTop="8dp" />
</LinearLayout>
\ No newline at end of file
<?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" >
<TextView
android:id="@+id/create_conf"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="Create conference with:" />
<ListView
android:id="@+id/concurrent_calls"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:clickable="true"
android:focusable="true"
android:focusableInTouchMode="true" />
<TextView
android:id="@+id/empty_view"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="No other calls pending"
android:gravity="center" />
</LinearLayout>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@+id/edit_name"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:orientation="vertical" >
<TextView
android:id="@+id/transfer_to"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/transfer_to_another_call" />
<ListView
android:id="@+id/concurrent_calls"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:clickable="true"
android:focusable="true"
android:focusableInTouchMode="true" />
<TextView
android:id="@+id/empty_view"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="@string/transfer_no_other_call"
android:gravity="center" />
<TextView
android:id="@+id/lbl_your_name"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/transfer_type_number" />
<AutoCompleteTextView
android:id="@+id/external_number"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:imeOptions="actionDone"
android:inputType="text" />
</LinearLayout>
\ No newline at end of file
<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
android:id="@+id/login_form"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@color/color_primary_light"
tools:context=".client.AccountWizard">
<LinearLayout
android:id="@+id/ring_fields"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
......@@ -36,7 +34,6 @@
android:textColor="@color/text_color_primary_dark"/>
<TextView
android:id="@+id/ring_acc_descr_txt"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="center"
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment