diff options
Diffstat (limited to 'res')
| -rw-r--r-- | res/layout-land/camera_controls.xml | 6 | ||||
| -rw-r--r-- | res/layout-port/camera_controls.xml | 6 | ||||
| -rw-r--r-- | res/layout/camera_main.xml | 5 | ||||
| -rw-r--r-- | res/values-ko/strings.xml | 12 | ||||
| -rw-r--r-- | res/values-ru/strings.xml | 4 |
5 files changed, 17 insertions, 16 deletions
diff --git a/res/layout-land/camera_controls.xml b/res/layout-land/camera_controls.xml index f090e3d54..59a83e008 100644 --- a/res/layout-land/camera_controls.xml +++ b/res/layout-land/camera_controls.xml @@ -13,13 +13,13 @@ See the License for the specific language governing permissions and limitations under the License. --> -<com.android.camera.ui.RotatableLayout +<com.android.camera.ui.CameraControls xmlns:android="http://schemas.android.com/apk/res/android" android:id="@+id/camera_controls" style="@style/CameraControls" android:layout_gravity="center" > - <com.android.camera.ui.SwitcherBackgroundView + <View android:id="@+id/blocker" android:layout_height="match_parent" android:layout_width="@dimen/switcher_size" @@ -58,4 +58,4 @@ android:focusable="true" android:scaleType="center" android:src="@drawable/btn_new_shutter" /> -</com.android.camera.ui.RotatableLayout> +</com.android.camera.ui.CameraControls> diff --git a/res/layout-port/camera_controls.xml b/res/layout-port/camera_controls.xml index 7a1221782..e3fdce88a 100644 --- a/res/layout-port/camera_controls.xml +++ b/res/layout-port/camera_controls.xml @@ -13,13 +13,13 @@ See the License for the specific language governing permissions and limitations under the License. --> -<com.android.camera.ui.RotatableLayout +<com.android.camera.ui.CameraControls xmlns:android="http://schemas.android.com/apk/res/android" android:id="@+id/camera_controls" style="@style/CameraControls" android:layout_gravity="center" > - <com.android.camera.ui.SwitcherBackgroundView + <View android:id="@+id/blocker" android:layout_width="match_parent" android:layout_height="@dimen/switcher_size" @@ -59,4 +59,4 @@ android:scaleType="center" android:src="@drawable/btn_new_shutter" /> -</com.android.camera.ui.RotatableLayout>
\ No newline at end of file +</com.android.camera.ui.CameraControls>
\ No newline at end of file diff --git a/res/layout/camera_main.xml b/res/layout/camera_main.xml index 710e69dbf..fe5913427 100644 --- a/res/layout/camera_main.xml +++ b/res/layout/camera_main.xml @@ -13,7 +13,8 @@ See the License for the specific language governing permissions and limitations under the License. --> -<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" +<com.android.camera.ui.CameraRootView + xmlns:android="http://schemas.android.com/apk/res/android" android:id="@+id/content" android:layout_width="match_parent" android:layout_height="match_parent" > @@ -29,4 +30,4 @@ style="@style/CameraControls" android:layout_centerInParent="true" /> -</RelativeLayout>
\ No newline at end of file +</com.android.camera.ui.CameraRootView>
\ No newline at end of file diff --git a/res/values-ko/strings.xml b/res/values-ko/strings.xml index 267add372..a6d4a5de5 100644 --- a/res/values-ko/strings.xml +++ b/res/values-ko/strings.xml @@ -242,8 +242,8 @@ <!-- no translation found for pref_camera_timer_sound_default (7066624532144402253) --> <skip /> <string name="pref_camera_timer_sound_title" msgid="2469008631966169105">"카운트다운하는 동안 신호음 울리기"</string> - <string name="setting_off" msgid="4480039384202951946">"사용 안함"</string> - <string name="setting_on" msgid="8602246224465348901">"사용"</string> + <string name="setting_off" msgid="4480039384202951946">"OFF"</string> + <string name="setting_on" msgid="8602246224465348901">"ON"</string> <string name="pref_video_quality_title" msgid="8245379279801096922">"동영상 화질"</string> <string name="pref_video_quality_entry_high" msgid="8664038216234805914">"고화질"</string> <string name="pref_video_quality_entry_low" msgid="7258507152393173784">"저화질"</string> @@ -265,8 +265,8 @@ <string name="pref_camera_focusmode_entry_macro" msgid="4424489110551866161">"매크로"</string> <string name="pref_camera_flashmode_title" msgid="2287362477238791017">"플래시 모드"</string> <string name="pref_camera_flashmode_entry_auto" msgid="7288383434237457709">"자동"</string> - <string name="pref_camera_flashmode_entry_on" msgid="5330043918845197616">"사용"</string> - <string name="pref_camera_flashmode_entry_off" msgid="867242186958805761">"사용 안함"</string> + <string name="pref_camera_flashmode_entry_on" msgid="5330043918845197616">"ON"</string> + <string name="pref_camera_flashmode_entry_off" msgid="867242186958805761">"OFF"</string> <string name="pref_camera_whitebalance_title" msgid="677420930596673340">"화이트 밸런스"</string> <string name="pref_camera_whitebalance_entry_auto" msgid="6580665476983469293">"자동"</string> <string name="pref_camera_whitebalance_entry_incandescent" msgid="8856667786449549938">"백열"</string> @@ -334,8 +334,8 @@ <string name="accessibility_review_cancel" msgid="9070531914908644686">"리뷰 취소"</string> <string name="accessibility_review_ok" msgid="7793302834271343168">"리뷰 완료"</string> <string name="accessibility_review_retake" msgid="659300290054705484">"다시 찍기 검토"</string> - <string name="capital_on" msgid="5491353494964003567">"사용"</string> - <string name="capital_off" msgid="7231052688467970897">"사용 안함"</string> + <string name="capital_on" msgid="5491353494964003567">"ON"</string> + <string name="capital_off" msgid="7231052688467970897">"OFF"</string> <string name="pref_video_time_lapse_frame_interval_off" msgid="3490489191038309496">"사용 안함"</string> <string name="pref_video_time_lapse_frame_interval_500" msgid="2949719376111679816">"0.5초"</string> <string name="pref_video_time_lapse_frame_interval_1000" msgid="1672458758823855874">"1초"</string> diff --git a/res/values-ru/strings.xml b/res/values-ru/strings.xml index 13efe236e..7bb107fbd 100644 --- a/res/values-ru/strings.xml +++ b/res/values-ru/strings.xml @@ -334,8 +334,8 @@ <string name="accessibility_review_cancel" msgid="9070531914908644686">"Отмена"</string> <string name="accessibility_review_ok" msgid="7793302834271343168">"Готово"</string> <string name="accessibility_review_retake" msgid="659300290054705484">"Ещё раз"</string> - <string name="capital_on" msgid="5491353494964003567">"Вкл"</string> - <string name="capital_off" msgid="7231052688467970897">"Выкл"</string> + <string name="capital_on" msgid="5491353494964003567">"I"</string> + <string name="capital_off" msgid="7231052688467970897">"O"</string> <string name="pref_video_time_lapse_frame_interval_off" msgid="3490489191038309496">"Выкл."</string> <string name="pref_video_time_lapse_frame_interval_500" msgid="2949719376111679816">"0,5 сек."</string> <string name="pref_video_time_lapse_frame_interval_1000" msgid="1672458758823855874">"1 сек."</string> |