Only select Wi-fi when needed
am: 1b33c11804
Change-Id: I23eec4dbb07f97a942212e52e2486a0d6a065a84
diff --git a/Android.mk b/Android.mk
index 5fd4116..7b303ac 100644
--- a/Android.mk
+++ b/Android.mk
@@ -13,6 +13,8 @@
LOCAL_CERTIFICATE := platform
LOCAL_PRIVILEGED_MODULE := true
+LOCAL_JACK_COVERAGE_INCLUDE_FILTER := com.android.managedprovisioning.*
+
include frameworks/opt/setupwizard/library/common.mk
include $(BUILD_PACKAGE)
diff --git a/res/drawable-hdpi/briefcase_icon.png b/res/drawable-hdpi/briefcase_icon.png
deleted file mode 100644
index 24aff11..0000000
--- a/res/drawable-hdpi/briefcase_icon.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi/ic_corp_icon.png b/res/drawable-hdpi/ic_corp_icon.png
new file mode 100644
index 0000000..d83a862
--- /dev/null
+++ b/res/drawable-hdpi/ic_corp_icon.png
Binary files differ
diff --git a/res/drawable-mdpi/briefcase_icon.png b/res/drawable-mdpi/briefcase_icon.png
deleted file mode 100644
index 429e149..0000000
--- a/res/drawable-mdpi/briefcase_icon.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/ic_corp_icon.png b/res/drawable-mdpi/ic_corp_icon.png
new file mode 100644
index 0000000..79372b2
--- /dev/null
+++ b/res/drawable-mdpi/ic_corp_icon.png
Binary files differ
diff --git a/res/drawable-xhdpi/briefcase_icon.png b/res/drawable-xhdpi/briefcase_icon.png
deleted file mode 100644
index 3466ec8..0000000
--- a/res/drawable-xhdpi/briefcase_icon.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xhdpi/ic_corp_icon.png b/res/drawable-xhdpi/ic_corp_icon.png
new file mode 100644
index 0000000..0a97c3c
--- /dev/null
+++ b/res/drawable-xhdpi/ic_corp_icon.png
Binary files differ
diff --git a/res/drawable-xxhdpi/briefcase_icon.png b/res/drawable-xxhdpi/briefcase_icon.png
deleted file mode 100644
index 5164c47..0000000
--- a/res/drawable-xxhdpi/briefcase_icon.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xxhdpi/ic_corp_icon.png b/res/drawable-xxhdpi/ic_corp_icon.png
new file mode 100644
index 0000000..d33319f
--- /dev/null
+++ b/res/drawable-xxhdpi/ic_corp_icon.png
Binary files differ
diff --git a/res/drawable-xxxhdpi/briefcase_icon.png b/res/drawable-xxxhdpi/briefcase_icon.png
deleted file mode 100644
index 8fc7115..0000000
--- a/res/drawable-xxxhdpi/briefcase_icon.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xxxhdpi/ic_corp_icon.png b/res/drawable-xxxhdpi/ic_corp_icon.png
new file mode 100644
index 0000000..359e210
--- /dev/null
+++ b/res/drawable-xxxhdpi/ic_corp_icon.png
Binary files differ
diff --git a/res/layout/encrypt_device.xml b/res/layout/encrypt_device.xml
index bb48608..8656c44 100644
--- a/res/layout/encrypt_device.xml
+++ b/res/layout/encrypt_device.xml
@@ -16,13 +16,28 @@
* limitations under the License.
*/
-->
-<com.android.setupwizardlib.SetupWizardLayout
- xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:app="http://schemas.android.com/apk/res-auto"
- android:id="@+id/setup_wizard_layout"
- android:layout_width="match_parent"
- android:layout_height="match_parent">
- <TextView
- android:id="@+id/encrypt_main_text"
- style="@style/MainTextContainer" />
-</com.android.setupwizardlib.SetupWizardLayout>
\ No newline at end of file
+<com.android.setupwizardlib.GlifLayout
+ xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:app="http://schemas.android.com/apk/res-auto"
+ android:id="@+id/setup_wizard_layout"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent">
+ <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+ style="@style/MainTextContainer"
+ android:orientation="vertical">
+ <TextView
+ android:id="@+id/encrypt_main_text"
+ style="@style/MainText" />
+ <LinearLayout
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:gravity="right"
+ android:orientation="horizontal" >
+ <Button
+ android:id="@+id/encrypt_button"
+ style="@style/TransparentButton"
+ android:text="@string/encrypt_device_launch_settings"
+ android:paddingTop="@dimen/button_padding_top"/>
+ </LinearLayout>
+ </LinearLayout>
+</com.android.setupwizardlib.GlifLayout>
diff --git a/res/layout/progress.xml b/res/layout/progress.xml
index 49c40d3..9313afd 100644
--- a/res/layout/progress.xml
+++ b/res/layout/progress.xml
@@ -16,7 +16,7 @@
* limitations under the License.
*/
-->
-<com.android.setupwizardlib.SetupWizardLayout
+<com.android.setupwizardlib.GlifLayout
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:id="@+id/setup_wizard_layout"
@@ -25,4 +25,4 @@
<TextView
style="@style/MainTextContainer"
android:id="@+id/prog_text" />
-</com.android.setupwizardlib.SetupWizardLayout>
+</com.android.setupwizardlib.GlifLayout>
diff --git a/res/layout/user_consent.xml b/res/layout/user_consent.xml
index 1f39c3e..e55808b 100644
--- a/res/layout/user_consent.xml
+++ b/res/layout/user_consent.xml
@@ -16,11 +16,11 @@
* limitations under the License.
*/
-->
-<com.android.setupwizardlib.SetupWizardLayout
- xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:app="http://schemas.android.com/apk/res-auto"
- android:id="@+id/setup_wizard_layout"
- android:layout_width="match_parent"
- android:layout_height="match_parent">
- <include layout="@layout/user_consent_main_text" />
-</com.android.setupwizardlib.SetupWizardLayout>
+<com.android.setupwizardlib.GlifLayout
+ xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:app="http://schemas.android.com/apk/res-auto"
+ android:id="@+id/setup_wizard_layout"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent">
+ <include layout="@layout/user_consent_main_text" />
+</com.android.setupwizardlib.GlifLayout>
diff --git a/res/layout/user_consent_main_text.xml b/res/layout/user_consent_main_text.xml
index 0d6d15a..17ce3ca 100644
--- a/res/layout/user_consent_main_text.xml
+++ b/res/layout/user_consent_main_text.xml
@@ -27,4 +27,14 @@
android:id="@+id/mdm_info_message"
style="@style/MainText"/>
<include layout="@layout/device_manager_icon_label"/>
+ <LinearLayout
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:gravity="right"
+ android:orientation="horizontal" >
+ <Button
+ android:id="@+id/setup_button"
+ style="@style/TransparentButton"
+ android:paddingTop="@dimen/button_padding_top"/>
+ </LinearLayout>
</LinearLayout>
diff --git a/res/values-hi/strings.xml b/res/values-hi/strings.xml
index d75df51..f46dd7f 100644
--- a/res/values-hi/strings.xml
+++ b/res/values-hi/strings.xml
@@ -31,7 +31,7 @@
<string name="admin_has_ability_to_monitor_profile" msgid="4138671070145317359">"आपके व्यवस्थापक के पास इस प्रोफ़ाइल से संबद्ध सेटिंग, कॉर्पोरेट एक्सेस, ऐप्लिकेशन, अनुमतियों और डेटा की निगरानी करने तथा उन्हें प्रबंधित करने की क्षमता है, जिसमें आपकी नेटवर्क गतिविधि के साथ ही आपके डिवाइस का स्थान, कॉल इतिहास और संपर्क खोज इतिहास शामिल है."</string>
<string name="admin_has_ability_to_monitor_device" msgid="7400390654083275019">"आपके व्यवस्थापक के पास नेटवर्क गतिविधि और आपके डिवाइस के स्थान की जानकारी सहित, इस डिवाइस से संबद्ध सेटिंग, कॉर्पोरेट एक्सेस, ऐप्लिकेशन, अनुमतियों और डेटा की निगरानी करने और उसे प्रबंधित करने की क्षमता है."</string>
<string name="theft_protection_disabled_warning" msgid="3708092473574738478">"चोरी से सुरक्षा संबंधी सुविधाओं का उपयोग करने के लिए, आपके पास अपने डिवाइस के लिए पासवर्ड द्वारा सुरक्षित स्क्रीन लॉक होना चाहिए."</string>
- <string name="contact_your_admin_for_more_info" msgid="5959191345827902911">"अपने संगठन की गोपनीयता नीतियों सहित, अधिक जानकारी के लिए अपने व्यवस्थापक से संपर्क करें."</string>
+ <string name="contact_your_admin_for_more_info" msgid="5959191345827902911">"अपने संगठन की निजता नीतियों सहित, अधिक जानकारी के लिए अपने व्यवस्थापक से संपर्क करें."</string>
<string name="learn_more_link" msgid="3012495805919550043">"और जानें"</string>
<string name="cancel_setup" msgid="2949928239276274745">"अभी नहीं"</string>
<string name="ok_setup" msgid="4593707675416137504">"ठीक"</string>
diff --git a/res/values-kn-rIN/strings.xml b/res/values-kn-rIN/strings.xml
index 5f561e8..dd00bbf 100644
--- a/res/values-kn-rIN/strings.xml
+++ b/res/values-kn-rIN/strings.xml
@@ -33,7 +33,7 @@
<string name="theft_protection_disabled_warning" msgid="3708092473574738478">"ಕಳವು ಸಂರಕ್ಷಣಾ ವೈಶಿಷ್ಟ್ಯತೆಗಳನ್ನು ಉಪಯೋಗಿಸಲು, ನಿಮ್ಮ ಸಾಧನವು ಪಾಸ್ವರ್ಡ್ ರಕ್ಷಣೆಯ ಸ್ಕ್ರೀನ್ ಲಾಕ್ ಅನ್ನು ಹೊಂದಿರಬೇಕು."</string>
<string name="contact_your_admin_for_more_info" msgid="5959191345827902911">"ನಿಮ್ಮ ಸಂಸ್ಥೆಯ ಗೌಪ್ಯತೆ ನೀತಿಗಳನ್ನು ಒಳಗೊಂಡಂತೆ, ಹೆಚ್ಚಿನ ಮಾಹಿತಿಗಾಗಿ ನಿಮ್ಮ ನಿರ್ವಾಹಕರನ್ನು ಸಂಪರ್ಕಿಸಿ."</string>
<string name="learn_more_link" msgid="3012495805919550043">"ಇನ್ನಷ್ಟು ತಿಳಿಯಿರಿ"</string>
- <string name="cancel_setup" msgid="2949928239276274745">"ರದ್ದುಮಾಡು"</string>
+ <string name="cancel_setup" msgid="2949928239276274745">"ರದ್ದುಮಾಡಿ"</string>
<string name="ok_setup" msgid="4593707675416137504">"ಸರಿ"</string>
<string name="user_consent_msg" msgid="8820951802130353584">"ನಾನು ಸಮ್ಮತಿಸುತ್ತೇನೆ"</string>
<string name="default_managed_profile_name" msgid="5370257687074907055">"ಕೆಲಸದ ಪ್ರೊಫೈಲ್"</string>
@@ -44,7 +44,7 @@
<string name="read_more_delete_profile" msgid="7789171620401666343">"ಮುಂದುವರಿಯುವ ಮೊದಲು, "<a href="#read_this_link">"ಇದನ್ನು ಓದಿ"</a>"."</string>
<string name="sure_you_want_to_delete_profile" msgid="6927697984573575564">"ನೀವು ಮುಂದುವರಿಸಿದರೆ, ಈ ಪ್ರೊಫೈಲ್ನಲ್ಲಿನ ಎಲ್ಲ ಅಪ್ಲಿಕೇಶನ್ಗಳು ಮತ್ತು ಡೇಟಾವನ್ನು ಅಳಿಸಲಾಗುತ್ತದೆ."</string>
<string name="delete_profile" msgid="2299218578684663459">"ಅಳಿಸಿ"</string>
- <string name="cancel_delete_profile" msgid="5155447537894046036">"ರದ್ದುಮಾಡು"</string>
+ <string name="cancel_delete_profile" msgid="5155447537894046036">"ರದ್ದುಮಾಡಿ"</string>
<string name="encrypt_device_text_for_profile_owner_setup" msgid="4325067657681168120">"ನಿಮ್ಮ ಕೆಲಸದ ಪ್ರೊಫೈಲ್ ಹೊಂದಿಸುವುದನ್ನು ಮುಂದುವರಿಸಲು, ನಿಮ್ಮ ಸಾಧನವನ್ನು ನೀವು ಎನ್ಕ್ರಿಪ್ಟ್ ಮಾಡಬೇಕಾದ ಅಗತ್ಯವಿದೆ. ಇದು ಸ್ವಲ್ಪ ಸಮಯವನ್ನು ತೆಗೆದುಕೊಳ್ಳಬಹುದು."</string>
<string name="encrypt_device_text_for_device_owner_setup" msgid="9206667711446040692">"ನಿಮ್ಮ ಸಾಧನವನ್ನು ಹೊಂದಿಸುವುದನ್ನು ಮುಂದುವರಿಸಲು, ನೀವು ಅದನ್ನು ಎನ್ಕ್ರಿಪ್ಟ್ ಮಾಡಬೇಕಾದ ಅಗತ್ಯವಿದೆ. ಇದಕ್ಕೆ ಸ್ವಲ್ಪ ಸಮಯ ತೆಗೆದುಕೊಳ್ಳಬಹುದು."</string>
<string name="encrypt_device_launch_settings" msgid="826115154646195837">"ಎನ್ಕ್ರಿಪ್ಟ್ ಮಾಡಿ"</string>
@@ -56,7 +56,7 @@
<string name="device_owner_exists" msgid="8020080296133337023">"ನಿರ್ವಹಿಸಿದ ಸಾಧನದಲ್ಲಿ ಕೆಲಸದ ಪ್ರೊಫೈಲ್ಗಳನ್ನು ಹೊಂದಿಸಲು ಸಾಧ್ಯವಿಲ್ಲ"</string>
<string name="maximum_user_limit_reached" msgid="4821228722266114449">"ನಿಮ್ಮ ಸಾಧನದಲ್ಲಿ ಬಳಕೆದಾರರ ಗರಿಷ್ಠ ಸಂಖ್ಯೆಯನ್ನು ನೀವು ತಲುಪಿರುವ ಕಾರಣ ಕೆಲಸದ ಪ್ರೊಫೈಲ್ ರಚಿಸಲು ಸಾಧ್ಯವಾಗುವುದಿಲ್ಲ. ಕನಿಷ್ಠ ಒಬ್ಬ ಬಳಕೆದಾರರನ್ನು ತೆಗೆದುಹಾಕಿ ಹಾಗೂ ಮತ್ತೆ ಪ್ರಯತ್ನಿಸಿ."</string>
<string name="managed_provisioning_not_supported_by_launcher" msgid="8710138269807942163">"ನಿಮ್ಮ ಕೆಲಸದ ಪ್ರೊಫೈಲ್ ಈ ಲಾಂಚರ್ ಅಪ್ಲಿಕೇಶನ್ನಿಂದ ಬೆಂಬಲಿತವಾಗಿಲ್ಲ. ನೀವು, ಹೊಂದಿಕೆಯಾಗುವಂತಹ ಲಾಂಚರ್ಗೆ ಬದಲಾಯಿಸುವ ಅಗತ್ಯವಿದೆ."</string>
- <string name="cancel_provisioning" msgid="3408069559452653724">"ರದ್ದುಮಾಡು"</string>
+ <string name="cancel_provisioning" msgid="3408069559452653724">"ರದ್ದುಮಾಡಿ"</string>
<string name="pick_launcher" msgid="4257084827403983845">"ಸರಿ"</string>
<string name="user_setup_incomplete" msgid="6494920045526591079">"ಬಳಕೆದಾರ ಸೆಟಪ್ ಅಪೂರ್ಣವಾಗಿದೆ"</string>
<string name="default_owned_device_username" msgid="3915120202811807955">"ಕೆಲಸದ ಸಾಧನದ ಬಳಕೆದಾರರು"</string>
@@ -68,7 +68,7 @@
<string name="progress_set_owner" msgid="8214062820093757961">"ಸಾಧನದ ಮಾಲೀಕರನ್ನು ಹೊಂದಿಸಲಾಗುತ್ತಿದೆ…"</string>
<string name="preprovisioning_error_encryption_not_supported" msgid="4633230675475838898">"ನಿಮ್ಮ ಸಾಧನವು ಎನ್ಕ್ರಿಪ್ಶನ್ ಬೆಂಬಲಿಸುವುದಿಲ್ಲ. ನಿಮ್ಮ IT ವಿಭಾಗವನ್ನು ಸಂಪರ್ಕಿಸಿ."</string>
<string name="device_owner_cancel_message" msgid="2529288571742712065">"ಹೊಂದಾಣಿಕೆಯನ್ನು ನಿಲ್ಲಿಸುವುದೇ ಮತ್ತು ನಿಮ್ಮ ಸಾಧನದ ಡೇಟಾವನ್ನು ಅಳಿಸುವುದೇ?"</string>
- <string name="device_owner_cancel_cancel" msgid="1052951540909389275">"ರದ್ದುಮಾಡು"</string>
+ <string name="device_owner_cancel_cancel" msgid="1052951540909389275">"ರದ್ದುಮಾಡಿ"</string>
<string name="device_owner_error_ok" msgid="2002250763093787051">"ಸರಿ"</string>
<string name="device_owner_error_reset" msgid="1609782972753569267">"ಮರುಹೊಂದಿಸು"</string>
<string name="device_owner_error_general" msgid="5962462955470123776">"ನಿಮ್ಮ ಸಾಧನವನ್ನು ಹೊಂದಿಸಲು ಸಾಧ್ಯವಾಗುತ್ತಿಲ್ಲ. ನಿಮ್ಮ IT ವಿಭಾಗವನ್ನು ಸಂಪರ್ಕಿಸಿ."</string>
@@ -101,6 +101,6 @@
<string name="mdm_icon_label" msgid="3399134595549660561">"<xliff:g id="ICON_LABEL">%1$s</xliff:g> ಐಕಾನ್"</string>
<string name="cancel_setup_and_factory_reset_dialog_title" msgid="5416045931532004811">"ಸೆಟಪ್ ಮತ್ತು ಫ್ಯಾಕ್ಟರಿ ಮರುಹೊಂದಿಸುವಿಕೆಯನ್ನು ಅಂತ್ಯಗೊಳಿಸುವುದೇ?"</string>
<string name="cancel_setup_and_factory_reset_dialog_msg" msgid="808442439937994485">"ಈ ಸೆಟಪ್ ಅನ್ನು ಅಂತ್ಯಗೊಳಿಸುವ ಮೂಲಕ ನಿಮ್ಮ ಸಾಧನವನ್ನು ಫ್ಯಾಕ್ಟರಿ ಸೆಟ್ಟಿಂಗ್ಗೆ ಮರುಹೊಂದಿಸುತ್ತದೆ ಮತ್ತು ನಿಮ್ಮನ್ನು ಮೊದಲ ಪರದೆಗೆ ಕರೆದೊಯ್ಯುತ್ತದೆ."</string>
- <string name="cancel_setup_and_factory_reset_dialog_cancel" msgid="2810966091829264727">"ರದ್ದುಮಾಡು"</string>
+ <string name="cancel_setup_and_factory_reset_dialog_cancel" msgid="2810966091829264727">"ರದ್ದುಮಾಡಿ"</string>
<string name="cancel_setup_and_factory_reset_dialog_ok" msgid="7168008267496150529">"ಸಾಧನವನ್ನು ಮರುಹೊಂದಿಸಿ"</string>
</resources>
diff --git a/res/values-ko/strings.xml b/res/values-ko/strings.xml
index 5e5399b..f9584b9 100644
--- a/res/values-ko/strings.xml
+++ b/res/values-ko/strings.xml
@@ -31,7 +31,7 @@
<string name="admin_has_ability_to_monitor_profile" msgid="4138671070145317359">"관리자는 네트워크 활동, 기기의 위치, 통화 기록, 연락처 검색 기록을 비롯하여 이 프로필과 연결된 데이터, 설정, 기업 액세스, 앱, 권한을 모니터링하고 관리할 수 있습니다."</string>
<string name="admin_has_ability_to_monitor_device" msgid="7400390654083275019">"관리자는 네트워크 활동 및 기기의 위치 정보를 비롯하여 기기와 연결된 데이터, 설정, 기업 액세스, 앱, 권한, 도난 방지 기능을 모니터링하고 관리할 수 있습니다."</string>
<string name="theft_protection_disabled_warning" msgid="3708092473574738478">"도난 방지 기능을 사용하려면 기기에 비밀번호로 보호되는 화면 잠금이 있어야 합니다."</string>
- <string name="contact_your_admin_for_more_info" msgid="5959191345827902911">"조직의 개인정보취급방침을 비롯한 자세한 내용은 관리자에게 문의하세요."</string>
+ <string name="contact_your_admin_for_more_info" msgid="5959191345827902911">"조직의 개인정보처리방침을 비롯한 자세한 내용은 관리자에게 문의하세요."</string>
<string name="learn_more_link" msgid="3012495805919550043">"자세히 알아보기"</string>
<string name="cancel_setup" msgid="2949928239276274745">"취소"</string>
<string name="ok_setup" msgid="4593707675416137504">"확인"</string>
diff --git a/res/values-my-rMM/strings.xml b/res/values-my-rMM/strings.xml
index cc68ec7..bd0a306 100644
--- a/res/values-my-rMM/strings.xml
+++ b/res/values-my-rMM/strings.xml
@@ -28,12 +28,12 @@
<string name="the_following_is_your_mdm_for_device" msgid="6717973404364414816">"အောက်ပါအပ်ဖ်မှ သင့်ကိရိယာကို စီမံခန့်ခွဲလိမ့်မည်။"</string>
<string name="next" msgid="1004321437324424398">"ရှေ့သို့"</string>
<string name="setting_up_workspace" msgid="4517537806569988620">"သင်၏အလုပ် ကိုယ်ရေးအချက်အလက်ကို အသင့်သုံးနိုင်ရန်စီစဉ်နေသည်..."</string>
- <string name="admin_has_ability_to_monitor_profile" msgid="4138671070145317359">"သင့်စီမံခန့်ခွဲသူသည် ကွန်ရက်လှုပ်ရှားမှု၊ စက်ပစ္စည်း၏တည်နေရာ၊ ခေါ်ဆိုမှုမှတ်တမ်းနှင့် အဆက်အသွယ် ရှာဖွေမှုမှတ်တမ်းများအပါအဝင် ဆက်တင်များ၊ ပူးပေါင်းအသုံးပြုမှု၊ အက်ပ်များ၊ ခွင့်ပြုချက်များနှင့် သင့်ပရိုဖိုင်နှင့်ဆက်စပ်လျက်ရှိသည့် ဒေတာများကို စောင့်ကြည့်ပြီး စီမံခန့်ခွဲနိုင်ပါသည်။"</string>
- <string name="admin_has_ability_to_monitor_device" msgid="7400390654083275019">"သင့်စီမံခန့်ခွဲသူသည် ကွန်ရက်လှုပ်ရှားမှုနှင့် သင့်စက်ပစ္စည်း၏တည်နေရာ အချက်အလက်များ အပါအဝင် ဆက်တင်များ၊ ပူးပေါင်းအသုံးပြုမှုများ၊ အက်ပ်များ၊ ခွင့်ပြုချက်များ၊ သူခိုးရန်မှ ကာကွယ်ခြင်း ဝန်ဆောင်မှုများနှင့် ဤစက်ပစ္စည်းနှင့် ဆက်စပ်နေသည့် ဒေတာများကို စီမံခန့်ခွဲခွင့်ရှိပါသည်။"</string>
+ <string name="admin_has_ability_to_monitor_profile" msgid="4138671070145317359">"သင့်စီမံခန့်ခွဲသူသည် ကွန်ရက်လုပ်ဆောင်ချက်၊ စက်ပစ္စည်း၏တည်နေရာ၊ ခေါ်ဆိုမှုမှတ်တမ်းနှင့် အဆက်အသွယ် ရှာဖွေမှုမှတ်တမ်းများအပါအဝင် ဆက်တင်များ၊ ပူးပေါင်းအသုံးပြုမှု၊ အက်ပ်များ၊ ခွင့်ပြုချက်များနှင့် သင့်ပရိုဖိုင်နှင့်ဆက်စပ်လျက်ရှိသည့် ဒေတာများကို စောင့်ကြည့်ပြီး စီမံခန့်ခွဲနိုင်ပါသည်။"</string>
+ <string name="admin_has_ability_to_monitor_device" msgid="7400390654083275019">"သင့်စီမံခန့်ခွဲသူသည် ကွန်ရက်လုပ်ဆောင်ချက်နှင့် သင့်စက်ပစ္စည်း၏တည်နေရာ အချက်အလက်များအပါအဝင် ဆက်တင်များ၊ ပူးပေါင်းအသုံးပြုမှုများ၊ အက်ပ်များ၊ ခွင့်ပြုချက်များ၊ သူခိုးရန်မှ ကာကွယ်ခြင်း ဝန်ဆောင်မှုများနှင့် ဤစက်ပစ္စည်းနှင့် ဆက်စပ်နေသည့် ဒေတာများကို စီမံခန့်ခွဲခွင့်ရှိပါသည်။"</string>
<string name="theft_protection_disabled_warning" msgid="3708092473574738478">"သူခိုးရန်မှကာကွယ်ခြင်း ဝန်ဆောင်မှုများကိုအသုံးပြုရန်၊ သင့်စက်ပစ္စည်းတွင် စကားဝှက်ဖြင့်ကာကွယ်ထားသည့် ဖန်သားပြင်လော့ခ်ချခြင်း ရှိရပါမည်။"</string>
<string name="contact_your_admin_for_more_info" msgid="5959191345827902911">"သင့်အဖွဲ့အစည်း၏ ပုဂ္ဂိုလ်ရေးဆိုင်ရာ လုံခြုံရေးမူဝါဒများအပါအဝင်၊ နောက်ထပ်အချက်အလက်များအတွက် သင့်စီမံခန့်ခွဲသူကိုဆက်သွယ်ပါ။"</string>
<string name="learn_more_link" msgid="3012495805919550043">"ပိုမိုသိလိုလျှင်"</string>
- <string name="cancel_setup" msgid="2949928239276274745">"မလုပ်တော့ပါ"</string>
+ <string name="cancel_setup" msgid="2949928239276274745">"မလုပ်တော့"</string>
<string name="ok_setup" msgid="4593707675416137504">"အိုကေ"</string>
<string name="user_consent_msg" msgid="8820951802130353584">"သဘောတူခွင့်ပြုသည်"</string>
<string name="default_managed_profile_name" msgid="5370257687074907055">"အလုပ် ပရိုဖိုင်"</string>
@@ -44,7 +44,7 @@
<string name="read_more_delete_profile" msgid="7789171620401666343">"ရှေ့မဆက်မှီ၊ "<a href="#read_this_link">"ဖတ်ပါ"</a>"။"</string>
<string name="sure_you_want_to_delete_profile" msgid="6927697984573575564">"သင်ရှေ့ဆက်လျှင်၊ ဤပရိုဖိုင်ရှိ အက်ပ်များနှင့် ဒေတာများအားလုံးကို ဖျက်လိုက်ပါမည်။"</string>
<string name="delete_profile" msgid="2299218578684663459">"ဖျက်ရန်"</string>
- <string name="cancel_delete_profile" msgid="5155447537894046036">"မလုပ်တော့ပါ"</string>
+ <string name="cancel_delete_profile" msgid="5155447537894046036">"မလုပ်တော့"</string>
<string name="encrypt_device_text_for_profile_owner_setup" msgid="4325067657681168120">"သင့် အလုပ်ပရိုဖိုင်ကို ဆက်လက် တပ်ဆင်သတ်မှတ်ရန်၊ သင့်စက်အား လျှို့ဝှက်ကုဒ် သွင်းရမည်။ အချိန်အနည်းငယ် ကြာနိုင်သည်။"</string>
<string name="encrypt_device_text_for_device_owner_setup" msgid="9206667711446040692">"သင့်စက်ပစ္စည်းအား ဆက်လက် တပ်ဆင်ရန်၊ လုံခြုံအောင်ပြုလုပ်ရန် လိုအပ်သည်။ ၎င်းသည် အချိန်အနည်းငယ် ယူရပါမည်။"</string>
<string name="encrypt_device_launch_settings" msgid="826115154646195837">"လျှို့ဝှက်ကုဒ်သွင်း"</string>
@@ -56,7 +56,7 @@
<string name="device_owner_exists" msgid="8020080296133337023">"စီမံထားသော စက်ကိရိယာတစ်ခုတွင် အလုပ်ပရိုဖိုင်များ ပြင်ဆင်သတ်မှတ်နိုင်ခြင်း မရှိပါ"</string>
<string name="maximum_user_limit_reached" msgid="4821228722266114449">"သင့်စက်ကိရိယာတွင် သုံးစွဲသူ အများဆုံးအရေအတွက်သို့ ရောက်ရှိပြီးဖြစ်သောကြောင့် အလုပ်ပရိုဖိုင်းအား မဖန်တီးနိုင်ပါ။ သုံးစွဲသူတစ်ယောက်အား အနည်းဆုံး ဖယ်ထုတ်ပြီး ထပ်မံကြိုးစားပါ။"</string>
<string name="managed_provisioning_not_supported_by_launcher" msgid="8710138269807942163">"သင့် အလုပ် ပရိုဖိုင်ကို ဒီဖွင့်တင်ရေး အက်ပ်မှ မပံ့ပိုးပါ။ သင်သည် လိုက်ဖက်သည့် ဖွင့်တင်ရေးစက်သို့ ပြောင်းရန် လိုသည်။"</string>
- <string name="cancel_provisioning" msgid="3408069559452653724">"မလုပ်တော့ပါ"</string>
+ <string name="cancel_provisioning" msgid="3408069559452653724">"မလုပ်တော့"</string>
<string name="pick_launcher" msgid="4257084827403983845">"အိုကေ"</string>
<string name="user_setup_incomplete" msgid="6494920045526591079">"အသုံးပြုသူ ပြင်ဆင်သတ်မှတ်မှု မပြီးစီးပါ"</string>
<string name="default_owned_device_username" msgid="3915120202811807955">"အလုပ်စက်ပစ္စည်း အသုံးပြုသူ"</string>
@@ -68,7 +68,7 @@
<string name="progress_set_owner" msgid="8214062820093757961">"စက်ပစ္စည်းပိုင်ရှင်ကို အသင့်သုံးနိုင်ရန်စီစဉ်နေသည်..."</string>
<string name="preprovisioning_error_encryption_not_supported" msgid="4633230675475838898">"သင့်စက်ပစ္စည်းသည် အသွင်ဝှက်ခြင်းကို ပံ့ပိုးမှုမရှိပါ။ သင့်အိုင်တီဌာနကို ဆက်သွယ်ပါ။"</string>
<string name="device_owner_cancel_message" msgid="2529288571742712065">"စဖွင့်စီစဉ်မှုအား ရပ်စဲကာ သင့် ကိရိယာ၏ဒေတာကို ဖျက်ပစ်မည်လား?"</string>
- <string name="device_owner_cancel_cancel" msgid="1052951540909389275">"မလုပ်တော့ပါ"</string>
+ <string name="device_owner_cancel_cancel" msgid="1052951540909389275">"မလုပ်တော့"</string>
<string name="device_owner_error_ok" msgid="2002250763093787051">"အိုကေ"</string>
<string name="device_owner_error_reset" msgid="1609782972753569267">"ပြန်ညှိရန်"</string>
<string name="device_owner_error_general" msgid="5962462955470123776">"သင်၏ ကိရိယာကို စဖွင့်စီစဉ် မပေးနိုင်ခဲ့ပါ။ သင်၏ IT ဌာနကို ဆက်သွယ်ပါ။"</string>
@@ -83,11 +83,11 @@
<string name="device_owner_error_installation_failed" msgid="684566845601079360">"အက်ဒမင် အက်ပ်ကို မတပ်ဆင်နိုင်ပါ။"</string>
<string name="profile_owner_cancel_message" msgid="6868736915633023477">"စဖွင့်သတ်မှတ်ခြင်း ရပ်စဲမလား?"</string>
<string name="profile_owner_cancel_cancel" msgid="4408725524311574891">"No"</string>
- <string name="profile_owner_cancel_ok" msgid="5951679183850766029">"ဟုတ်"</string>
+ <string name="profile_owner_cancel_ok" msgid="5951679183850766029">"Yes"</string>
<string name="profile_owner_cancelling" msgid="5679573829145112822">"ပယ်ဖျက်နေသည်..."</string>
<string name="work_profile_setup_later_title" msgid="9069148190226279892">"ကိုယ်ရေးအချက်အလက် အသင့်သုံးနိုင်ရန်စီစဉ်ခြင်းကိုရပ်တန့်လိုပါသလား။"</string>
<string name="work_profile_setup_later_message" msgid="2446733709871989895">"သင့်အဖွဲ့အစည်းမှအသုံးပြုတဲ့ စက်ပစ္စည်းစီမံခန့်ခွဲမှုအပ်ဖ်ကနေ နောက်ပိုင်းတွင်သင်၏အလုပ်ကိုယ်ရေးအချက်အလက်ကို အသင့်သုံးနိုင်ရန်စီစဉ်နိုင်သည်။"</string>
- <string name="work_profile_setup_continue" msgid="6549708818974016509">"ရှေ့ဆက်ပါ"</string>
+ <string name="work_profile_setup_continue" msgid="6549708818974016509">"ဆက်လုပ်ရန်"</string>
<string name="work_profile_setup_stop" msgid="6772128629992514750">"ရပ်ပါ"</string>
<string name="provisioning" msgid="4512493827019163451">"စီမံဆောင်ရွက်ပေးနေသည်။"</string>
<string name="copying_certs" msgid="5697938664953550881">"CA လက်မှတ်များကို တည်ဆောက်ခြင်း"</string>
diff --git a/res/values-ne-rNP/strings.xml b/res/values-ne-rNP/strings.xml
index 619f72a..02ab008 100644
--- a/res/values-ne-rNP/strings.xml
+++ b/res/values-ne-rNP/strings.xml
@@ -32,7 +32,7 @@
<string name="admin_has_ability_to_monitor_device" msgid="7400390654083275019">"तपाईँको प्रशासकसँग नेटवर्कको गतिविधि र तपाईँको यन्त्रको स्थान सम्बन्धी जानकारी लगायत सेटिङहरू, संस्थागत पहुँच, अनुप्रयोग, अनुमति, चोरीबाट सुरक्षा गर्ने सुविधाहरू र यस यन्त्रसँग सम्बन्धित डेटालाई अनुगमन तथा व्यवस्थापन गर्ने क्षमता छ।"</string>
<string name="theft_protection_disabled_warning" msgid="3708092473574738478">"चोरीबाट सुरक्षा गर्ने सुविधाहरू प्रयोग गर्नका लागि तपाईँले आफ्नो यन्त्रको लागि पासवर्डद्वारा सुरक्षित स्क्रिन लक अनिवार्य रूपमा राख्नुपर्छ।"</string>
<string name="contact_your_admin_for_more_info" msgid="5959191345827902911">"आफ्नो संगठनका गोपनीयता नीतिहरू लगायत थप जानकारीको लागि आफ्नो प्रशासकसँग सम्पर्क गर्नुहोस्।"</string>
- <string name="learn_more_link" msgid="3012495805919550043">"थप सिक्नुहोस्"</string>
+ <string name="learn_more_link" msgid="3012495805919550043">"थप जान्नुहोस्"</string>
<string name="cancel_setup" msgid="2949928239276274745">"रद्द गर्नुहोस्"</string>
<string name="ok_setup" msgid="4593707675416137504">"ठीक छ"</string>
<string name="user_consent_msg" msgid="8820951802130353584">"म स्वीकृति दिन्छु"</string>
diff --git a/res/values/dimens.xml b/res/values/dimens.xml
index 7a9245c..327f48c 100644
--- a/res/values/dimens.xml
+++ b/res/values/dimens.xml
@@ -21,8 +21,8 @@
<!-- Main text -->
<dimen name="main_text_padding_left_right">40dp</dimen>
<dimen name="main_text_padding_bottom">24dp</dimen>
- <dimen name="main_text_padding_top">34dp</dimen>
- <dimen name="main_text_padding_between_text">16dp</dimen>
+ <dimen name="main_text_padding_top">0dp</dimen>
+ <dimen name="main_text_padding_between_text">24dp</dimen>
<dimen name="main_text_size">16sp</dimen>
<!-- Dialog Fragment text -->
@@ -37,6 +37,7 @@
<dimen name="row_height">72dp</dimen>
<dimen name="row_padding_top">0dp</dimen>
+ <dimen name="button_padding_top">32dp</dimen>
<dimen name="checkbox_padding_left">24dp</dimen>
<dimen name="checkbox_margin_top">24dp</dimen>
diff --git a/res/values/required_apps_managed_device.xml b/res/values/required_apps_managed_device.xml
index 911faac..0b204e6 100644
--- a/res/values/required_apps_managed_device.xml
+++ b/res/values/required_apps_managed_device.xml
@@ -23,6 +23,7 @@
<item>com.android.settings</item>
<item>com.android.contacts</item>
<item>com.android.dialer</item>
+ <item>com.android.stk</item> <!-- Required by com.android.phone by certain carriers -->
<item>com.android.providers.downloads</item>
<item>com.android.providers.downloads.ui</item>
<item>com.android.documentsui</item>
diff --git a/res/values/required_apps_managed_user.xml b/res/values/required_apps_managed_user.xml
index 88f88fe..87974c9 100644
--- a/res/values/required_apps_managed_user.xml
+++ b/res/values/required_apps_managed_user.xml
@@ -23,6 +23,7 @@
<item>com.android.settings</item>
<item>com.android.contacts</item>
<item>com.android.dialer</item>
+ <item>com.android.stk</item> <!-- Required by com.android.phone by certain carriers -->
<item>com.android.providers.downloads</item>
<item>com.android.providers.downloads.ui</item>
<item>com.android.documentsui</item>
diff --git a/src/com/android/managedprovisioning/DeviceOwnerProvisioningActivity.java b/src/com/android/managedprovisioning/DeviceOwnerProvisioningActivity.java
index 1b9689e..465406f 100644
--- a/src/com/android/managedprovisioning/DeviceOwnerProvisioningActivity.java
+++ b/src/com/android/managedprovisioning/DeviceOwnerProvisioningActivity.java
@@ -88,7 +88,6 @@
// Setup the UI.
initializeLayoutParams(R.layout.progress, R.string.setup_work_device, true);
- configureNavigationButtons(NEXT_BUTTON_EMPTY_LABEL, View.INVISIBLE, View.VISIBLE);
setTitle(R.string.setup_device_progress);
mProgressTextView = (TextView) findViewById(R.id.prog_text);
diff --git a/src/com/android/managedprovisioning/LogoUtils.java b/src/com/android/managedprovisioning/LogoUtils.java
index 74b801b..5e37773 100644
--- a/src/com/android/managedprovisioning/LogoUtils.java
+++ b/src/com/android/managedprovisioning/LogoUtils.java
@@ -72,8 +72,7 @@
// If the app that started ManagedProvisioning didn't specify a logo or we couldn't get a
// logo from the uri they specified, use the default logo.
if (bitmap == null) {
- bitmap = BitmapFactory.decodeResource(context.getResources(),
- R.drawable.briefcase_icon);
+ bitmap = BitmapFactory.decodeResource(context.getResources(), R.drawable.ic_corp_icon);
}
return new BitmapDrawable(context.getResources(),
resizeBitmap(bitmap, maxWidth, maxHeight));
diff --git a/src/com/android/managedprovisioning/ProfileOwnerProvisioningActivity.java b/src/com/android/managedprovisioning/ProfileOwnerProvisioningActivity.java
index ff8c227..985625a 100644
--- a/src/com/android/managedprovisioning/ProfileOwnerProvisioningActivity.java
+++ b/src/com/android/managedprovisioning/ProfileOwnerProvisioningActivity.java
@@ -100,13 +100,9 @@
mPendingProvisioningResult = savedInstanceState.getParcelable(KEY_PENDING_INTENT);
}
- initializeLayoutParams(R.layout.progress, R.string.setup_work_profile, true);
- configureNavigationButtons(NEXT_BUTTON_EMPTY_LABEL, View.INVISIBLE, View.VISIBLE);
+ initializeLayoutParams(R.layout.progress, R.string.setting_up_workspace, true);
setTitle(R.string.setup_profile_progress);
- TextView textView = (TextView) findViewById(R.id.prog_text);
- if (textView != null) textView.setText(R.string.setting_up_workspace);
-
if (mCancelStatus == STATUS_CANCEL_CONFIRMING) {
showCancelProvisioningDialog();
} else if (mCancelStatus == STATUS_CANCELLING) {
@@ -269,8 +265,6 @@
* Finish activity and stop service.
*/
private void onProvisioningSuccess() {
- mBackButton.setVisibility(View.INVISIBLE);
-
mCancelStatus = STATUS_FINALIZING;
stopService(new Intent(this, ProfileOwnerProvisioningService.class));
setResult(Activity.RESULT_OK);
diff --git a/src/com/android/managedprovisioning/SetupLayoutActivity.java b/src/com/android/managedprovisioning/SetupLayoutActivity.java
index 7fa8330..d40eb4d 100644
--- a/src/com/android/managedprovisioning/SetupLayoutActivity.java
+++ b/src/com/android/managedprovisioning/SetupLayoutActivity.java
@@ -17,41 +17,30 @@
package com.android.managedprovisioning;
import android.app.Activity;
-import android.content.Context;
import android.content.res.ColorStateList;
-import android.content.res.Resources;
-import android.graphics.Canvas;
import android.graphics.Color;
-import android.graphics.ColorFilter;
-import android.graphics.Paint;
-import android.graphics.PixelFormat;
-import android.graphics.drawable.ColorDrawable;
import android.graphics.drawable.Drawable;
-import android.util.DisplayMetrics;
-import android.util.TypedValue;
-import android.view.View;
import android.view.Window;
import android.view.WindowManager;
-import android.widget.Button;
-import android.widget.ImageView;
-import android.widget.TextView;
import com.android.managedprovisioning.common.Utils;
-import com.android.setupwizardlib.SetupWizardLayout;
-import com.android.setupwizardlib.util.SystemBarHelper;
-import com.android.setupwizardlib.view.NavigationBar;
-import com.android.setupwizardlib.view.NavigationBar.NavigationBarListener;
+import com.android.setupwizardlib.GlifLayout;
/**
* Base class for setting up the layout.
*/
-public abstract class SetupLayoutActivity extends Activity implements NavigationBarListener {
+public abstract class SetupLayoutActivity extends Activity {
protected final Utils mUtils = new Utils();
- protected Button mNextButton;
- protected Button mBackButton;
-
- public static final int NEXT_BUTTON_EMPTY_LABEL = 0;
+ protected void initializeLayoutParams(int layoutResourceId, int headerResourceId,
+ boolean showProgressBar) {
+ setContentView(layoutResourceId);
+ GlifLayout layout = (GlifLayout) findViewById(R.id.setup_wizard_layout);
+ layout.setHeaderText(headerResourceId);
+ if (showProgressBar) {
+ layout.setProgressBarShown(true);
+ }
+ }
protected void maybeSetLogoAndMainColor(Integer mainColor) {
// null means the default value
@@ -61,156 +50,14 @@
// We should always use a value of 255 for the alpha.
mainColor = Color.argb(255, Color.red(mainColor), Color.green(mainColor),
Color.blue(mainColor));
+
Window window = getWindow();
window.clearFlags(WindowManager.LayoutParams.FLAG_TRANSLUCENT_STATUS);
window.addFlags(WindowManager.LayoutParams.FLAG_DRAWS_SYSTEM_BAR_BACKGROUNDS);
-
- SetupWizardLayout layout = (SetupWizardLayout) findViewById(R.id.setup_wizard_layout);
-
- layout.setIllustration(new HeaderDrawable(this, mainColor));
- layout.setLayoutBackground(new ColorDrawable(mainColor));
- layout.setProgressBarColor(ColorStateList.valueOf(mainColor));
-
- final TextView titleView = (TextView) findViewById(R.id.suw_layout_title);
- if (mUtils.isBrightColor(mainColor)) {
- titleView.setTextColor(Color.BLACK);
- } else {
- titleView.setTextColor(Color.WHITE);
- }
- if (!mUtils.isUserSetupCompleted(this)) {
- SystemBarHelper.hideSystemBars(window);
- }
- }
-
- public void initializeLayoutParams(int layoutResourceId, int headerResourceId,
- boolean showProgressBar) {
- setContentView(layoutResourceId);
- SetupWizardLayout layout = (SetupWizardLayout) findViewById(R.id.setup_wizard_layout);
- layout.setHeaderText(headerResourceId);
- if (showProgressBar) {
- layout.showProgressBar();
- }
- setupNavigationBar(layout.getNavigationBar());
- }
-
- private void setupNavigationBar(NavigationBar bar) {
- bar.setNavigationBarListener(this);
- mNextButton = bar.getNextButton();
- mBackButton = bar.getBackButton();
- }
-
- public void configureNavigationButtons(int nextButtonResourceId, int nextButtonVisibility,
- int backButtonVisibility) {
- if (nextButtonResourceId != NEXT_BUTTON_EMPTY_LABEL) {
- mNextButton.setText(nextButtonResourceId);
- }
- mNextButton.setVisibility(nextButtonVisibility);
- mBackButton.setVisibility(backButtonVisibility);
- }
-
- @Override
- public void onNavigateBack() {
- onBackPressed();
- }
-
- @Override
- public void onNavigateNext() {
- }
-
- private class HeaderDrawable extends Drawable {
- private Activity mActivity;
- private int mMainColor;
-
- HeaderDrawable(Activity a, int mainColor) {
- mActivity = a;
- mMainColor = mainColor;
- }
-
- @Override
- public void draw(Canvas canvas) {
- Drawable logo = LogoUtils.getOrganisationLogo(mActivity);
- // At this point, the logo has already been resized.
- int logoWidth = logo.getIntrinsicWidth();
- int logoHeight = logo.getIntrinsicHeight();
- Resources resources = mActivity.getResources();
-
- int logoPaddingLeftRight = (int) resources
- .getDimension(R.dimen.logo_padding_left_right);
- int logoPaddingBottom = (int) resources
- .getDimension(R.dimen.logo_padding_bottom);
- int totalWidth = getIntrinsicWidth();
- int totalHeight = getIntrinsicHeight();
-
- // By default, the drawable is materialized: it is not a solid color. Draw a white
- // rectangle over the whole drawable so that it is a solid color.
- Paint paint = new Paint();
- paint.setColor(resources.getColor(R.color.white));
- canvas.drawRect(0, 0, totalWidth, totalHeight, paint);
-
- // Draw the logo.
- if (shouldDrawLogoOnLeftSide()) {
- logo.setBounds(logoPaddingLeftRight,
- totalHeight - logoPaddingBottom - logoHeight,
- logoPaddingLeftRight + logoWidth,
- totalHeight - logoPaddingBottom);
- } else {
- logo.setBounds(totalWidth - logoPaddingLeftRight - logoWidth,
- totalHeight - logoPaddingBottom - logoHeight,
- totalWidth - logoPaddingLeftRight,
- totalHeight - logoPaddingBottom);
- }
- logo.draw(canvas);
-
- }
-
- @Override
- public int getIntrinsicHeight() {
- if (mActivity.getResources().getBoolean(R.bool.suwUseTabletLayout)) {
- return (int) mActivity.getResources()
- .getDimension(R.dimen.suw_tablet_illustration_height);
- }
- return getScreenWidth() * 9 / 20;
- }
-
- @Override
- public int getIntrinsicWidth() {
- return getScreenWidth();
- }
-
- @Override
- public int getOpacity() {
- return PixelFormat.OPAQUE;
- }
-
- @Override
- public void setAlpha(int alpha) {
- //ignore
- }
-
- @Override
- public void setColorFilter(ColorFilter cf) {
- // ignore
- }
-
- private int getScreenWidth() {
- DisplayMetrics metrics = new DisplayMetrics();
- mActivity.getWindowManager().getDefaultDisplay().getMetrics(metrics);
- return metrics.widthPixels;
- }
-
- private boolean shouldDrawLogoOnLeftSide() {
- // for a tablet layout, the logo should be in the bottom left
- boolean result = useTabletLayout();
- // for a right-to-left language, reverse it.
- if (mActivity.getResources().getConfiguration().getLayoutDirection()
- == View.LAYOUT_DIRECTION_RTL) {
- result = !result;
- }
- return result;
- }
-
- private boolean useTabletLayout() {
- return mActivity.getResources().getBoolean(R.bool.suwUseTabletLayout);
- }
+ window.setStatusBarColor(mainColor);
+ GlifLayout layout = (GlifLayout) findViewById(R.id.setup_wizard_layout);
+ Drawable logo = LogoUtils.getOrganisationLogo(this);
+ layout.setIcon(logo);
+ layout.setPrimaryColor(ColorStateList.valueOf(mainColor));
}
}
diff --git a/src/com/android/managedprovisioning/common/Utils.java b/src/com/android/managedprovisioning/common/Utils.java
index a2a9d73..8eed939 100644
--- a/src/com/android/managedprovisioning/common/Utils.java
+++ b/src/com/android/managedprovisioning/common/Utils.java
@@ -764,10 +764,4 @@
private boolean versionNumberAtLeastL(int versionNumber) {
return versionNumber >= Build.VERSION_CODES.LOLLIPOP;
}
-
- public boolean isBrightColor(int color) {
- // we're using the brightness formula: (r * 299 + g * 587 + b * 144) / 1000
- return Color.red(color) * 299 + Color.green(color) * 587 + Color.blue(color) * 114
- >= 1000 * THRESHOLD_BRIGHT_COLOR;
- }
}
diff --git a/src/com/android/managedprovisioning/task/DisableInstallShortcutListenersTask.java b/src/com/android/managedprovisioning/task/DisableInstallShortcutListenersTask.java
index f3c1c7e..04446a1 100644
--- a/src/com/android/managedprovisioning/task/DisableInstallShortcutListenersTask.java
+++ b/src/com/android/managedprovisioning/task/DisableInstallShortcutListenersTask.java
@@ -60,7 +60,9 @@
* Disable all components that can handle the specified broadcast intent.
*/
private void disableReceivers(Intent intent) {
- List<ResolveInfo> receivers = mPm.queryBroadcastReceiversAsUser(intent, 0, mUserId);
+ List<ResolveInfo> receivers = mPm.queryBroadcastReceiversAsUser(intent,
+ PackageManager.MATCH_DIRECT_BOOT_UNAWARE | PackageManager.MATCH_DIRECT_BOOT_AWARE,
+ mUserId);
for (ResolveInfo ri : receivers) {
// One of ri.activityInfo, ri.serviceInfo, ri.providerInfo is not null. Let's find which
// one.
diff --git a/src/com/android/managedprovisioning/uiflows/EncryptDeviceActivity.java b/src/com/android/managedprovisioning/uiflows/EncryptDeviceActivity.java
index 6e99b37..e0230d4 100644
--- a/src/com/android/managedprovisioning/uiflows/EncryptDeviceActivity.java
+++ b/src/com/android/managedprovisioning/uiflows/EncryptDeviceActivity.java
@@ -19,6 +19,7 @@
import android.content.Intent;
import android.os.Bundle;
import android.view.View;
+import android.widget.Button;
import android.widget.TextView;
import com.android.managedprovisioning.BootReminder;
@@ -60,24 +61,26 @@
ProvisionLogger.loge("Unknown provisioning action: " + mParams.provisioningAction);
finish();
}
+
+ Button encryptButton = (Button) findViewById(R.id.encrypt_button);
+ encryptButton.setOnClickListener(new View.OnClickListener() {
+ @Override
+ public void onClick(View v) {
+ EncryptionController.getInstance(EncryptDeviceActivity.this)
+ .setEncryptionReminder(mParams);
+ // Use settings so user confirms password/pattern and its passed
+ // to encryption tool.
+ Intent intent = new Intent();
+ intent.setAction(DevicePolicyManager.ACTION_START_ENCRYPTION);
+ startActivity(intent);
+ }
+ });
}
private void initializeUi(int headerRes, int titleRes, int mainTextRes) {
initializeLayoutParams(R.layout.encrypt_device, headerRes, false);
setTitle(titleRes);
((TextView) findViewById(R.id.encrypt_main_text)).setText(mainTextRes);
- configureNavigationButtons(R.string.encrypt_device_launch_settings,
- View.VISIBLE, View.VISIBLE);
maybeSetLogoAndMainColor(mParams.mainColor);
}
-
- @Override
- public void onNavigateNext() {
- EncryptionController.getInstance(this).setEncryptionReminder(mParams);
- // Use settings so user confirms password/pattern and its passed
- // to encryption tool.
- Intent intent = new Intent();
- intent.setAction(DevicePolicyManager.ACTION_START_ENCRYPTION);
- startActivity(intent);
- }
}
diff --git a/src/com/android/managedprovisioning/uiflows/PreProvisioningActivity.java b/src/com/android/managedprovisioning/uiflows/PreProvisioningActivity.java
index bb25211..cbd2c04 100644
--- a/src/com/android/managedprovisioning/uiflows/PreProvisioningActivity.java
+++ b/src/com/android/managedprovisioning/uiflows/PreProvisioningActivity.java
@@ -28,11 +28,10 @@
import android.os.UserManager;
import android.provider.Settings;
import android.view.View;
+import android.widget.Button;
import android.widget.ImageView;
import android.widget.TextView;
-import com.android.managedprovisioning.common.MdmPackageInfo;
-import com.android.managedprovisioning.common.Utils;
import com.android.managedprovisioning.DeleteManagedProfileDialog;
import com.android.managedprovisioning.DeviceOwnerProvisioningActivity;
import com.android.managedprovisioning.LogoUtils;
@@ -41,8 +40,8 @@
import com.android.managedprovisioning.R;
import com.android.managedprovisioning.SetupLayoutActivity;
import com.android.managedprovisioning.UserConsentDialog;
+import com.android.managedprovisioning.common.MdmPackageInfo;
import com.android.managedprovisioning.model.ProvisioningParams;
-import com.android.managedprovisioning.parser.MessageParser;
public class PreProvisioningActivity extends SetupLayoutActivity
implements UserConsentDialog.ConsentCallback,
@@ -201,7 +200,14 @@
ProvisioningParams params) {
// Setup the UI.
initializeLayoutParams(R.layout.user_consent, headerRes, false);
- configureNavigationButtons(R.string.next, View.INVISIBLE, View.VISIBLE);
+ Button nextButton = (Button) findViewById(R.id.setup_button);
+ nextButton.setOnClickListener(new View.OnClickListener() {
+ @Override
+ public void onClick(View v) {
+ mController.afterNavigateNext();
+ }
+ });
+ nextButton.setText(R.string.next);
mConsentMessageTextView = (TextView) findViewById(R.id.user_consent_message);
mMdmInfoTextView = (TextView) findViewById(R.id.mdm_info_message);
@@ -212,7 +218,6 @@
setMdmIconAndLabel(params.inferDeviceAdminPackageName());
maybeSetLogoAndMainColor(params.mainColor);
- mNextButton.setVisibility(View.VISIBLE);
setTitle(titleRes);
}
@@ -353,9 +358,4 @@
})
.show();
}
-
- @Override
- public void onNavigateNext() {
- mController.afterNavigateNext();
- }
}
diff --git a/src/com/android/managedprovisioning/uiflows/WebActivity.java b/src/com/android/managedprovisioning/uiflows/WebActivity.java
index eefcfa9..9858fdd 100644
--- a/src/com/android/managedprovisioning/uiflows/WebActivity.java
+++ b/src/com/android/managedprovisioning/uiflows/WebActivity.java
@@ -20,10 +20,14 @@
import android.content.Context;
import android.content.Intent;
import android.os.Bundle;
+import android.view.View;
+import android.view.View.OnLongClickListener;
+import android.webkit.WebResourceRequest;
import android.webkit.WebView;
import android.webkit.WebViewClient;
import com.android.managedprovisioning.ProvisionLogger;
+import com.android.managedprovisioning.common.Utils;
/**
* This activity shows a web view, which loads the url indicated in the starting intent. By default
@@ -42,6 +46,7 @@
private static final String EXTRA_ALLOWED_URL_BASE = "extra_allowed_url_base";
private WebView mWebView;
+ private final Utils mUtils = new Utils();
@Override
public void onCreate(Bundle savedInstanceState) {
@@ -57,15 +62,24 @@
}
mWebView.loadUrl(extraUrl);
mWebView.setWebViewClient(new WebViewClient() {
+ @Override
+ public boolean shouldOverrideUrlLoading(WebView view, WebResourceRequest request) {
+ String url = request.getUrl().toString();
+ if (extraAllowedUrlBase != null && url.startsWith(extraAllowedUrlBase)) {
+ view.loadUrl(url);
+ }
+ return true;
+ }
+ });
+ if (!mUtils.isUserSetupCompleted(this)) {
+ // User should not be able to escape provisioning if user setup isn't complete.
+ mWebView.setOnLongClickListener(new OnLongClickListener() {
@Override
- public boolean shouldOverrideUrlLoading(WebView view, String url) {
- if (extraAllowedUrlBase != null && url.startsWith(extraAllowedUrlBase)) {
- view.loadUrl(url);
- }
+ public boolean onLongClick(View v) {
return true;
}
});
-
+ }
this.setContentView(mWebView);
}
diff --git a/tests/src/com/android/managedprovisioning/LogoUtilsTest.java b/tests/src/com/android/managedprovisioning/LogoUtilsTest.java
index bdc3862..e247db6 100644
--- a/tests/src/com/android/managedprovisioning/LogoUtilsTest.java
+++ b/tests/src/com/android/managedprovisioning/LogoUtilsTest.java
@@ -115,7 +115,7 @@
// First let's compute the expected logo. It is the default one, resized if too big.
Bitmap expected = BitmapFactory.decodeResource(getContext().getResources(),
- R.drawable.briefcase_icon);
+ R.drawable.ic_corp_icon);
expected = LogoUtils.resizeBitmap(expected, maxWidth, maxHeight);
// Now, get the actual logo
diff --git a/tests/src/com/android/managedprovisioning/common/UtilsTest.java b/tests/src/com/android/managedprovisioning/common/UtilsTest.java
index d0052c6..9d5a598 100644
--- a/tests/src/com/android/managedprovisioning/common/UtilsTest.java
+++ b/tests/src/com/android/managedprovisioning/common/UtilsTest.java
@@ -295,13 +295,6 @@
assertFalse(mUtils.currentLauncherSupportsManagedProfiles(mockContext));
}
- public void testBrightness() {
- assertTrue(mUtils.isBrightColor(Color.WHITE));
- assertTrue(mUtils.isBrightColor(Color.YELLOW));
- assertFalse(mUtils.isBrightColor(Color.BLACK));
- assertFalse(mUtils.isBrightColor(Color.BLUE));
- }
-
private ApplicationInfo createApplicationInfo(String packageName, boolean system) {
ApplicationInfo ai = new ApplicationInfo();
ai.packageName = packageName;
