resolved conflicts for merge of efddd2c5 to master

Change-Id: Ida5785a4b936ed485ee6f895cbe994acf5b37626
2010-10-05 14:06:01 -07:00
parent 7da3f9f51e efddd2c5b2
commit ee3433bc58
5 changed files with 140 additions and 0 deletions
--- a/samples/ApiDemos/src/com/example/android/apis/app/ScreenOrientation.java
+++ b/samples/ApiDemos/src/com/example/android/apis/app/ScreenOrientation.java
@@ -0,0 +1,73 @@
+/*
+ * Copyright (C) 2010 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.
+ */
+
+package com.example.android.apis.app;
+
+import com.example.android.apis.R;
+
+import android.app.Activity;
+import android.app.admin.DevicePolicyManager;
+import android.content.pm.ActivityInfo;
+import android.os.Bundle;
+import android.view.View;
+import android.widget.AdapterView;
+import android.widget.ArrayAdapter;
+import android.widget.Spinner;
+import android.widget.AdapterView.OnItemSelectedListener;
+
+public class ScreenOrientation extends Activity {
+    Spinner mOrientation;
+
+    // Orientation spinner choices
+    // This list must match the list found in samples/ApiDemos/res/values/arrays.xml
+    final static int mOrientationValues[] = new int[] {
+        ActivityInfo.SCREEN_ORIENTATION_UNSPECIFIED,
+        ActivityInfo.SCREEN_ORIENTATION_LANDSCAPE,
+        ActivityInfo.SCREEN_ORIENTATION_PORTRAIT,
+        ActivityInfo.SCREEN_ORIENTATION_USER,
+        ActivityInfo.SCREEN_ORIENTATION_BEHIND,
+        ActivityInfo.SCREEN_ORIENTATION_SENSOR,
+        ActivityInfo.SCREEN_ORIENTATION_NOSENSOR,
+        ActivityInfo.SCREEN_ORIENTATION_SENSOR_LANDSCAPE,
+        ActivityInfo.SCREEN_ORIENTATION_SENSOR_PORTRAIT,
+        ActivityInfo.SCREEN_ORIENTATION_REVERSE_LANDSCAPE,
+        ActivityInfo.SCREEN_ORIENTATION_REVERSE_PORTRAIT,
+        ActivityInfo.SCREEN_ORIENTATION_FULL_SENSOR,
+    };
+    
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.screen_orientation);
+        
+        mOrientation = (Spinner)findViewById(R.id.orientation);
+        ArrayAdapter<CharSequence> adapter = ArrayAdapter.createFromResource(
+                this, R.array.screen_orientations, android.R.layout.simple_spinner_item);
+        adapter.setDropDownViewResource(android.R.layout.simple_spinner_dropdown_item);
+        mOrientation.setAdapter(adapter);
+        mOrientation.setOnItemSelectedListener(
+                new OnItemSelectedListener() {
+                    public void onItemSelected(
+                            AdapterView<?> parent, View view, int position, long id) {
+                        setRequestedOrientation(mOrientationValues[position]);
+                    }
+
+                    public void onNothingSelected(AdapterView<?> parent) {
+                        setRequestedOrientation(ActivityInfo.SCREEN_ORIENTATION_UNSPECIFIED);
+                    }
+                });
+    }
+}