Commit a4d53c42 authored by Grigory Fedorov's avatar Grigory Fedorov

Unused drawables and layouts removed, some drawables renamed.

parent 37536484
......@@ -107,7 +107,7 @@ public class AccountManager implements OnLoadListener, OnWipeListener {
enabledAccounts = new HashSet<>();
savedStatuses = new ArrayList<>();
authorizationErrorProvider = new BaseAccountNotificationProvider<>(R.drawable.ic_stat_error);
passwordRequestProvider = new BaseAccountNotificationProvider<>(R.drawable.ic_stat_ic_add_circle);
passwordRequestProvider = new BaseAccountNotificationProvider<>(R.drawable.ic_stat_add_circle);
colors = application.getResources().getIntArray(R.array.account_color_names).length;
......
......@@ -150,7 +150,7 @@ public class MessageArchiveManager implements OnPacketListener,
modificationRequests = new NestedMap<Boolean>();
chatStorages = new NestedNestedMaps<String, ChatStorage>();
availableArchiveRequestProvider = new BaseAccountNotificationProvider<AvailableArchiveRequest>(
R.drawable.ic_stat_ic_help_black);
R.drawable.ic_stat_help);
}
public static MessageArchiveManager getInstance() {
......
......@@ -67,7 +67,7 @@ public class MUCManager implements OnLoadListener, OnPacketListener {
private MUCManager() {
inviteProvider = new EntityNotificationProvider<RoomInvite>(
R.drawable.ic_stat_ic_add_circle);
R.drawable.ic_stat_add_circle);
authorizationErrorProvider = new EntityNotificationProvider<RoomAuthorizationError>(
R.drawable.ic_stat_error);
}
......
......@@ -116,8 +116,8 @@ public class OTRManager implements OtrEngineHost, OtrEngineListener,
private final ExecutorService keyPairGenerator;
private OTRManager() {
smRequestProvider = new EntityNotificationProvider<>(R.drawable.ic_stat_ic_help_black);
smProgressProvider = new EntityNotificationProvider<>(R.drawable.ic_stat_ic_play_circle_fill);
smRequestProvider = new EntityNotificationProvider<>(R.drawable.ic_stat_help);
smProgressProvider = new EntityNotificationProvider<>(R.drawable.ic_stat_play_circle_fill);
smProgressProvider.setCanClearNotifications(false);
fingerprints = new NestedNestedMaps<>();
actives = new NestedMap<>();
......
......@@ -79,7 +79,7 @@ public class PresenceManager implements OnArchiveModificationsReceivedListener,
private PresenceManager() {
subscriptionRequestProvider = new EntityNotificationProvider<SubscriptionRequest>(
R.drawable.ic_stat_ic_add_circle);
R.drawable.ic_stat_add_circle);
requestedSubscriptions = new HashMap<String, HashSet<String>>();
presenceContainers = new NestedMap<ResourceContainer>();
readyAccounts = new ArrayList<String>();
......
<?xml version="1.0" encoding="utf-8"?>
<!-- Copyright (C) 2006 The Android Open Source Project
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
-->
<!-- Layout for a Preference in a PreferenceActivity. The
Preference is able to place a specific widget for its particular
type in the "widget_frame" layout. -->
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="center_vertical"
android:minHeight="?android:attr/listPreferredItemHeight"
android:paddingRight="?android:attr/scrollbarSize">
<RelativeLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginLeft="15dip"
android:layout_marginRight="6dip"
android:layout_marginTop="6dip"
android:layout_marginBottom="6dip"
android:layout_weight="1">
<TextView android:id="@android:id/title"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:singleLine="true"
android:textAppearance="?android:attr/textAppearanceLarge"
/>
<ProgressBar android:id="@android:id/progress"
style="?android:attr/progressBarStyleHorizontal"
android:minHeight="10dip"
android:maxHeight="10dip"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_below="@android:id/title"
android:layout_alignLeft="@android:id/title"
android:paddingTop="5dip"
android:indeterminate="true"
android:progress="0"
android:max="50000"
/>
<TextView android:id="@+android:id/summary"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_below="@android:id/progress"
android:layout_alignLeft="@android:id/progress"
android:textAppearance="?android:attr/textAppearanceSmall"
android:textColor="?android:attr/textColorSecondary"
android:maxLines="4" />
</RelativeLayout>
<!-- Preference should place its actual preference widget here. -->
<LinearLayout android:id="@+android:id/widget_frame"
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:gravity="center_vertical"
android:orientation="vertical" />
</LinearLayout>
......@@ -3,7 +3,7 @@
xmlns:app="http://schemas.android.com/apk/res-auto">
<item android:id="@+id/action_join_conference"
android:icon="@drawable/ic_group_white_24dp"
android:icon="@drawable/ic_group_add_white_24dp"
android:orderInCategory="80"
android:title="@string/muc_join"
android:visible="false"
......@@ -39,7 +39,6 @@
/>
<item android:id="@+id/action_show_history"
android:icon="@drawable/ic_forum_white_24dp"
android:orderInCategory="130"
android:title="@string/show_history"
app:showAsAction="never"
......
......@@ -17,7 +17,7 @@
/>
<item android:id="@+id/action_join_conference"
android:icon="@drawable/ic_group_white_24dp"
android:icon="@drawable/ic_group_add_white_24dp"
android:orderInCategory="120"
android:title="@string/muc_add"
app:showAsAction="never"
......
Markdown is supported
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