Skip to content
This repository has been archived by the owner on Sep 6, 2019. It is now read-only.

Commit

Permalink
Renamed filter button 'Clear all' to 'Default'
Browse files Browse the repository at this point in the history
Fixes #1920
  • Loading branch information
M66B committed Aug 27, 2014
1 parent 8a2b6eb commit ba43ddc
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 4 deletions.
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,7 @@ Version 2.99.x and version 3.x will be available with a [pro license](http://www

**Next release**

* Renamed filter button *Clear all* to *Default* ([issue](/../../issues/1920))
* Updated Japanese translation

[Open issues](https://github.com/M66B/XPrivacy/issues?state=open)
Expand Down
4 changes: 2 additions & 2 deletions res/layout/filters.xml
Original file line number Diff line number Diff line change
Expand Up @@ -210,12 +210,12 @@
android:background="@android:color/darker_gray" />

<Button
android:id="@+id/btnClear"
android:id="@+id/btnDefault"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:layout_marginTop="6dip"
android:text="@string/menu_clear_all" />
android:text="@string/title_default" />
</LinearLayout>

</ScrollView>
4 changes: 2 additions & 2 deletions src/biz/bokhorst/xprivacy/ActivityMain.java
Original file line number Diff line number Diff line change
Expand Up @@ -745,7 +745,7 @@ private void optionFilter() {
final CheckBox cbFOnDemandNot = (CheckBox) view.findViewById(R.id.cbFOnDemandNot);
final CheckBox cbFUser = (CheckBox) view.findViewById(R.id.cbFUser);
final CheckBox cbFSystem = (CheckBox) view.findViewById(R.id.cbFSystem);
final Button btnClear = (Button) view.findViewById(R.id.btnClear);
final Button btnDefault = (Button) view.findViewById(R.id.btnDefault);

// Get settings
final int userId = Util.getUserId(Process.myUid());
Expand Down Expand Up @@ -799,7 +799,7 @@ else if (buttonView == cbFOnDemand)
cbFOnDemand.setOnCheckedChangeListener(checkListener);

// Clear button
btnClear.setOnClickListener(new OnClickListener() {
btnDefault.setOnClickListener(new OnClickListener() {
@Override
public void onClick(View arg0) {
cbFUsed.setChecked(false);
Expand Down

0 comments on commit ba43ddc

Please sign in to comment.