mudhorn/zxing
1
0
Fork 0
mirror of https://github.com/zxing/zxing.git synced 2025-03-05 20:48:51 -08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Tiny differences to back port from review of diff with BS Plus

Browse source
This commit is contained in:
Sean Owen 2014-01-19 00:54:33 +00:00
parent 9983ccc428
commit 542319c18f
15 changed files with 38 additions and 31 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
android/res/layout-land/encode.xml
View file

@ -41,7 +41,8 @@
android:textColor="@color/contents_text"
android:paddingRight="8dip"
android:paddingTop="8dip"
android:paddingBottom="8dip"/>
android:paddingBottom="8dip"
android:textIsSelectable="true"/>
</ScrollView>

3
android/res/layout-land/share.xml
View file

@ -27,7 +27,8 @@
android:layout_height="wrap_content"
android:gravity="center"
android:text="@string/msg_share_explanation"
android:paddingBottom="12dip"/>
android:paddingBottom="12dip"
android:textIsSelectable="false"/>
<LinearLayout
android:layout_width="fill_parent"

5
android/res/layout-ldpi/capture.xml
View file

@ -151,7 +151,8 @@
android:textColorLink="@color/result_text"
android:textSize="22sp"
android:paddingLeft="12dip"
android:autoLink="web"/>
android:autoLink="web"
android:textIsSelectable="true"/>
<TextView android:id="@+id/contents_supplement_text_view"
android:layout_width="wrap_content"
@ -160,7 +161,7 @@
android:textColorLink="@color/result_text"
android:paddingLeft="12dip"
android:autoLink="web"
android:clickable="true"/>
android:textIsSelectable="true"/>
</LinearLayout>

6
android/res/layout/bookmark_picker_list_item.xml
View file

@ -25,12 +25,14 @@
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:textAppearance="?android:attr/textAppearanceLarge"
android:singleLine="true"/>
android:singleLine="true"
android:textIsSelectable="false"/>
<TextView android:id="@+id/bookmark_url"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:textAppearance="?android:attr/textAppearanceSmall"
android:singleLine="false"/>
android:singleLine="false"
android:textIsSelectable="false"/>
</LinearLayout>

6
android/res/layout/capture.xml
View file

@ -151,7 +151,8 @@
android:textColorLink="@color/result_text"
android:textSize="22sp"
android:paddingLeft="12dip"
android:autoLink="web"/>
android:autoLink="web"
android:textIsSelectable="true"/>
<TextView android:id="@+id/contents_supplement_text_view"
android:layout_width="wrap_content"
@ -159,7 +160,8 @@
android:textColor="@color/result_text"
android:textColorLink="@color/result_text"
android:paddingLeft="12dip"
android:autoLink="web"/>
android:autoLink="web"
android:textIsSelectable="true"/>
</LinearLayout>

3
android/res/layout/encode.xml
View file

@ -42,7 +42,8 @@
android:textColor="@color/contents_text"
android:paddingBottom="@dimen/standard_padding"
android:paddingLeft="@dimen/standard_padding"
android:paddingRight="@dimen/standard_padding"/>
android:paddingRight="@dimen/standard_padding"
android:textIsSelectable="true"/>
</ScrollView>

6
android/res/layout/history_list_item.xml
View file

@ -11,12 +11,14 @@
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:textAppearance="?android:attr/textAppearanceLarge"
android:singleLine="true"/>
android:singleLine="true"
android:textIsSelectable="false"/>
<TextView android:id="@+id/history_detail"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:textAppearance="?android:attr/textAppearanceSmall"
android:singleLine="false"/>
android:singleLine="false"
android:textIsSelectable="false"/>
</LinearLayout>

3
android/res/layout/search_book_contents_header.xml
View file

@ -20,4 +20,5 @@
android:paddingLeft="@dimen/standard_padding"
android:paddingBottom="@dimen/half_padding"
android:enabled="false"
android:singleLine="true"/>
android:singleLine="true"
android:textIsSelectable="false"/>

6
android/res/layout/search_book_contents_list_item.xml
View file

@ -27,12 +27,14 @@
android:layout_gravity="left|top"
android:layout_marginRight="@dimen/standard_padding"
android:singleLine="false"
android:textStyle="bold"/>
android:textStyle="bold"
android:textIsSelectable="false"/>
<TextView android:id="@+id/snippet_view"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="left|top"
android:singleLine="false"/>
android:singleLine="false"
android:textIsSelectable="false"/>
</com.google.zxing.client.android.book.SearchBookContentsListItem>

3
android/res/layout/share.xml
View file

@ -35,7 +35,8 @@
android:layout_height="wrap_content"
android:gravity="center"
android:text="@string/msg_share_explanation"
android:paddingBottom="@dimen/standard_padding"/>
android:paddingBottom="@dimen/standard_padding"
android:textIsSelectable="false"/>
<ImageView
android:layout_width="wrap_content"

4
android/src/com/google/zxing/client/android/CaptureActivityHandler.java
View file

@ -79,11 +79,9 @@ public final class CaptureActivityHandler extends Handler {
public void handleMessage(Message message) {
switch (message.what) {
case R.id.restart_preview:
Log.d(TAG, "Got restart preview message");
restartPreviewAndDecode();
break;
case R.id.decode_succeeded:
Log.d(TAG, "Got decode succeeded message");
state = State.SUCCESS;
Bundle bundle = message.getData();
Bitmap barcode = null;
@ -105,12 +103,10 @@ public final class CaptureActivityHandler extends Handler {
cameraManager.requestPreviewFrame(decodeThread.getHandler(), R.id.decode);
break;
case R.id.return_scan_result:
Log.d(TAG, "Got return scan result message");
activity.setResult(Activity.RESULT_OK, (Intent) message.obj);
activity.finish();
break;
case R.id.launch_product_query:
Log.d(TAG, "Got product query message");
String url = (String) message.obj;
Intent intent = new Intent(Intent.ACTION_VIEW);

8
android/src/com/google/zxing/client/android/Contents.java
View file

@ -58,10 +58,10 @@ public final class Contents {
* Intent intent = new Intent(Intents.Encode.ACTION);
* intent.putExtra(Intents.Encode.TYPE, CONTACT);
* Bundle bundle = new Bundle();
* bundle.putString(Contacts.Intents.Insert.NAME, "Jenny");
* bundle.putString(Contacts.Intents.Insert.PHONE, "8675309");
* bundle.putString(Contacts.Intents.Insert.EMAIL, "jenny@the80s.com");
* bundle.putString(Contacts.Intents.Insert.POSTAL, "123 Fake St. San Francisco, CA 94102");
* bundle.putString(ContactsContract.Intents.Insert.NAME, "Jenny");
* bundle.putString(ContactsContract.Intents.Insert.PHONE, "8675309");
* bundle.putString(ContactsContract.Intents.Insert.EMAIL, "jenny@the80s.com");
* bundle.putString(ContactsContract.Intents.Insert.POSTAL, "123 Fake St. San Francisco, CA 94102");
* intent.putExtra(Intents.Encode.DATA, bundle);
*/
public static final String CONTACT = "CONTACT_TYPE";

1
android/src/com/google/zxing/client/android/encode/EncodeActivity.java
View file

@ -105,6 +105,7 @@ public final class EncodeActivity extends Activity {
return false;
}
intent.putExtra(USE_VCARD_KEY, !qrCodeEncoder.isUseVCard());
intent.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP);
startActivity(intent);
finish();
return true;

5
android/src/com/google/zxing/client/android/result/SMSResultHandler.java
View file

@ -51,13 +51,14 @@ public final class SMSResultHandler extends ResultHandler {
@Override
public void handleButtonPress(int index) {
SMSParsedResult smsResult = (SMSParsedResult) getResult();
String number = smsResult.getNumbers()[0];
switch (index) {
case 0:
// Don't know of a way yet to express a SENDTO intent with multiple recipients
sendSMS(smsResult.getNumbers()[0], smsResult.getBody());
sendSMS(number, smsResult.getBody());
break;
case 1:
sendMMS(smsResult.getNumbers()[0], smsResult.getSubject(), smsResult.getBody());
sendMMS(number, smsResult.getSubject(), smsResult.getBody());
break;
}
}

7
android/src/com/google/zxing/client/android/result/WifiResultHandler.java
View file

@ -82,12 +82,7 @@ public final class WifiResultHandler extends ResultHandler {
@Override
public CharSequence getDisplayContents() {
WifiParsedResult wifiResult = (WifiParsedResult) getResult();
StringBuilder contents = new StringBuilder(50);
String wifiLabel = parent.getString(R.string.wifi_ssid_label);
ParsedResult.maybeAppend(wifiLabel + '\n' + wifiResult.getSsid(), contents);
String typeLabel = parent.getString(R.string.wifi_type_label);
ParsedResult.maybeAppend(typeLabel + '\n' + wifiResult.getNetworkEncryption(), contents);
return contents.toString();
return wifiResult.getSsid() + " (" + wifiResult.getNetworkEncryption() + ')';
}
@Override