diff options
| author | android-build-team Robot <android-build-team-robot@google.com> | 2018-03-04 08:21:29 +0000 |
|---|---|---|
| committer | android-build-team Robot <android-build-team-robot@google.com> | 2018-03-04 08:21:29 +0000 |
| commit | 2c9296e1f7052c04d5b07788ba3929d2244d7624 (patch) | |
| tree | a978b67d08cfb27fa9ea5252e0e924c9aafe8ca0 | |
| parent | 7820a9f41ff7c748afc0ac3cee9faf4cc23f44e3 (diff) | |
| parent | bf127c88621cb56ec1cc1d89f5b76d51a38cf91f (diff) | |
| download | Camera2-2c9296e1f7052c04d5b07788ba3929d2244d7624.tar.gz | |
Snap for 4632767 from bf127c88621cb56ec1cc1d89f5b76d51a38cf91f to pi-release
Change-Id: I423a781d4aea076d24e91749aa2abfa7aedf30fc
| -rw-r--r-- | res/values-my/strings.xml | 4 | ||||
| -rw-r--r-- | src/com/android/camera/ui/focus/FocusRingView.java | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/res/values-my/strings.xml b/res/values-my/strings.xml index 458ebb0b8..7f6524bb8 100644 --- a/res/values-my/strings.xml +++ b/res/values-my/strings.xml @@ -156,7 +156,7 @@ <string name="pref_camera_hdr_label" msgid="1918040375414771185">"HDR"</string> <string name="pref_camera_id_label_back" msgid="1645608049757733858">"အရှေ့ကင်မရာ"</string> <string name="pref_camera_id_label_front" msgid="349308803062874842">"နောက်ကင်မရာ"</string> - <string name="dialog_ok" msgid="774141340500181131">"အိုကေ"</string> + <string name="dialog_ok" msgid="774141340500181131">"OK"</string> <string name="dialog_cancel" msgid="692365061128351656">"မလုပ်တော့"</string> <string name="dialog_report" msgid="7616428760369876209">"သတင်းပို့ပါ"</string> <string name="dialog_dismiss" msgid="1382550604990470119">"ပယ်ရန်"</string> @@ -373,7 +373,7 @@ <string name="share_to" msgid="5144911209144798122">"...အား မျှဝေရန်"</string> <string name="edit_with" msgid="615569327230783971">"...နှင့် တည်းဖြတ်ရန်"</string> <string name="startup_dialog_button_next" msgid="1011831256978228993">"ရှေ့သို့"</string> - <string name="confirm_button_text" msgid="7389949384482206814">"အိုကေ၊ ရပါပြီ"</string> + <string name="confirm_button_text" msgid="7389949384482206814">"OK၊ ရပါပြီ"</string> <string name="full_sensor_4x3_aspect_ratio" msgid="1270461419743888925">"အာရုံခံပုံ အပြည့် \n(4:3)"</string> <string name="cropped_sensor_16x9_aspect_ratio" msgid="4742161537633251795">"အာရုံခံကိရိယာမှ ဖြတ်ထား\n(16:9)"</string> <string name="pref_boolean_false" msgid="461317129020087333">"၀"</string> diff --git a/src/com/android/camera/ui/focus/FocusRingView.java b/src/com/android/camera/ui/focus/FocusRingView.java index 6b5cca0ec..1b4960d76 100644 --- a/src/com/android/camera/ui/focus/FocusRingView.java +++ b/src/com/android/camera/ui/focus/FocusRingView.java @@ -172,7 +172,7 @@ public class FocusRingView extends View implements Invalidator, FocusRing { } if (mPreviewSize != null) { - canvas.clipRect(mPreviewSize, Region.Op.REPLACE); + canvas.clipRect(mPreviewSize); } mAnimator.draw(canvas); |