Import Android SDK Platform O

/google/data/ro/projects/android/fetch_artifact \
    --bid 3685177 \
    --target sdk_phone_armv7-win_sdk \
    sdk-repo-linux-platforms-3685177.zip

AndroidVersion.ApiLevel has been modified to appear as 26

Change-Id: I7d5206c93730b790e5b08e728f03406e119e9bcc
diff --git a/android-stubs-src.jar b/android-stubs-src.jar
index ae76911..d953b78 100644
--- a/android-stubs-src.jar
+++ b/android-stubs-src.jar
Binary files differ
diff --git a/android.jar b/android.jar
index d519556..22e7986 100644
--- a/android.jar
+++ b/android.jar
Binary files differ
diff --git a/build.prop b/build.prop
index 99c8d8b..a6fc03c 100644
--- a/build.prop
+++ b/build.prop
@@ -1,9 +1,9 @@
 
 # begin build properties
 # autogenerated by buildinfo.sh
-ro.build.id=ORG23
-ro.build.display.id=sdk_phone_armv7-userdebug O ORG23 3663304 test-keys
-ro.build.version.incremental=3663304
+ro.build.id=ORG30
+ro.build.display.id=sdk_phone_armv7-userdebug O ORG30 3685177 test-keys
+ro.build.version.incremental=3685177
 ro.build.version.sdk=25
 ro.build.version.preview_sdk=1
 ro.build.version.codename=O
@@ -11,8 +11,8 @@
 ro.build.version.release=O
 ro.build.version.security_patch=2017-03-05
 ro.build.version.base_os=
-ro.build.date=Mon Jan 23 08:45:30 UTC 2017
-ro.build.date.utc=1485161130
+ro.build.date=Mon Jan 30 08:40:59 UTC 2017
+ro.build.date.utc=1485765659
 ro.build.type=userdebug
 ro.build.tags=test-keys
 ro.build.flavor=sdk_phone_armv7-userdebug
@@ -31,8 +31,8 @@
 ro.board.platform=
 # ro.build.product is obsolete; use ro.product.device
 # Do not try to parse description, fingerprint, or thumbprint
-ro.build.description=sdk_phone_armv7-userdebug O ORG23 3663304 test-keys
-ro.build.fingerprint=Android/sdk_phone_armv7/generic:O/ORG23/3663304:userdebug/test-keys
+ro.build.description=sdk_phone_armv7-userdebug O ORG30 3685177 test-keys
+ro.build.fingerprint=Android/sdk_phone_armv7/generic:O/ORG30/3685177:userdebug/test-keys
 ro.build.characteristics=emulator
 # end build properties
 #
@@ -48,6 +48,7 @@
 #
 # ADDITIONAL_BUILD_PROPERTIES
 #
+camera.disable_treble=1
 ro.config.notification_sound=OnTheHunt.ogg
 ro.config.alarm_alert=Alarm_Classic.ogg
 ro.bionic.ld.warning=1
diff --git a/data/activity_actions.txt b/data/activity_actions.txt
index 7f16768..ff1ae2e 100644
--- a/data/activity_actions.txt
+++ b/data/activity_actions.txt
@@ -8,7 +8,8 @@
 android.app.action.START_ENCRYPTION
 android.bluetooth.adapter.action.REQUEST_DISCOVERABLE
 android.bluetooth.adapter.action.REQUEST_ENABLE
-android.content.pm.action.CONFIRM_PIN_ITEM
+android.content.pm.action.CONFIRM_PIN_APPWIDGET
+android.content.pm.action.CONFIRM_PIN_SHORTCUT
 android.content.pm.action.SESSION_DETAILS
 android.intent.action.ALL_APPS
 android.intent.action.ANSWER
@@ -20,6 +21,7 @@
 android.intent.action.CALL
 android.intent.action.CALL_BUTTON
 android.intent.action.CHOOSER
+android.intent.action.CLEAR_PACKAGE
 android.intent.action.CREATE_DOCUMENT
 android.intent.action.CREATE_LIVE_FOLDER
 android.intent.action.CREATE_SHORTCUT
@@ -101,6 +103,7 @@
 android.settings.BLUETOOTH_SETTINGS
 android.settings.CAPTIONING_SETTINGS
 android.settings.CAST_SETTINGS
+android.settings.CHANNEL_NOTIFICATION_SETTINGS
 android.settings.DATA_ROAMING_SETTINGS
 android.settings.DATE_SETTINGS
 android.settings.DEVICE_INFO_SETTINGS
@@ -145,6 +148,7 @@
 android.settings.WIFI_SETTINGS
 android.settings.WIRELESS_SETTINGS
 android.settings.ZEN_MODE_PRIORITY_SETTINGS
+android.settings.action.MANAGE_EXTERNAL_SOURCES
 android.settings.action.MANAGE_OVERLAY_PERMISSION
 android.settings.action.MANAGE_WRITE_SETTINGS
 android.speech.tts.engine.CHECK_TTS_DATA
diff --git a/data/broadcast_actions.txt b/data/broadcast_actions.txt
index afeca5c..51c8b21 100644
--- a/data/broadcast_actions.txt
+++ b/data/broadcast_actions.txt
@@ -2,6 +2,7 @@
 android.app.action.ACTION_PASSWORD_EXPIRING
 android.app.action.ACTION_PASSWORD_FAILED
 android.app.action.ACTION_PASSWORD_SUCCEEDED
+android.app.action.APPLICATION_DELEGATION_SCOPES_CHANGED
 android.app.action.DEVICE_ADMIN_DISABLED
 android.app.action.DEVICE_ADMIN_DISABLE_REQUESTED
 android.app.action.DEVICE_ADMIN_ENABLED
diff --git a/data/features.txt b/data/features.txt
index 2a267b3..5c08b14 100644
--- a/data/features.txt
+++ b/data/features.txt
@@ -51,6 +51,7 @@
 android.hardware.touchscreen.multitouch.distinct
 android.hardware.touchscreen.multitouch.jazzhand
 android.hardware.type.automotive
+android.hardware.type.embedded
 android.hardware.type.television
 android.hardware.type.watch
 android.hardware.usb.accessory
diff --git a/data/fonts/AndroidClock.ttf b/data/fonts/AndroidClock.ttf
index b74e92d..a81d50d 100644
--- a/data/fonts/AndroidClock.ttf
+++ b/data/fonts/AndroidClock.ttf
Binary files differ
diff --git a/data/fonts/CarroisGothicSC-Regular.ttf b/data/fonts/CarroisGothicSC-Regular.ttf
index cefca36..daf4182 100644
--- a/data/fonts/CarroisGothicSC-Regular.ttf
+++ b/data/fonts/CarroisGothicSC-Regular.ttf
Binary files differ
diff --git a/data/fonts/ComingSoon.ttf b/data/fonts/ComingSoon.ttf
index cdc511d..6b05c14 100644
--- a/data/fonts/ComingSoon.ttf
+++ b/data/fonts/ComingSoon.ttf
Binary files differ
diff --git a/data/fonts/CutiveMono.ttf b/data/fonts/CutiveMono.ttf
index ab85145..d5aeb26 100644
--- a/data/fonts/CutiveMono.ttf
+++ b/data/fonts/CutiveMono.ttf
Binary files differ
diff --git a/data/fonts/DancingScript-Bold.ttf b/data/fonts/DancingScript-Bold.ttf
index 7f65d1b..0ed0cb7 100644
--- a/data/fonts/DancingScript-Bold.ttf
+++ b/data/fonts/DancingScript-Bold.ttf
Binary files differ
diff --git a/data/fonts/DancingScript-Regular.ttf b/data/fonts/DancingScript-Regular.ttf
index 5616de8..d66381d 100644
--- a/data/fonts/DancingScript-Regular.ttf
+++ b/data/fonts/DancingScript-Regular.ttf
Binary files differ
diff --git a/data/fonts/DroidSans-Bold.ttf b/data/fonts/DroidSans-Bold.ttf
index 9bf9345..2c56ac8 100644
--- a/data/fonts/DroidSans-Bold.ttf
+++ b/data/fonts/DroidSans-Bold.ttf
Binary files differ
diff --git a/data/fonts/DroidSans.ttf b/data/fonts/DroidSans.ttf
index 55110f4..9db3132 100644
--- a/data/fonts/DroidSans.ttf
+++ b/data/fonts/DroidSans.ttf
Binary files differ
diff --git a/data/fonts/DroidSansFallback.ttf b/data/fonts/DroidSansFallback.ttf
index e9ac131..a4f0042 100644
--- a/data/fonts/DroidSansFallback.ttf
+++ b/data/fonts/DroidSansFallback.ttf
Binary files differ
diff --git a/data/fonts/DroidSansMono.ttf b/data/fonts/DroidSansMono.ttf
index 187610a..f96860a 100644
--- a/data/fonts/DroidSansMono.ttf
+++ b/data/fonts/DroidSansMono.ttf
Binary files differ
diff --git a/data/fonts/NanumGothic.ttf b/data/fonts/NanumGothic.ttf
index ae49cc9..b1e820a 100644
--- a/data/fonts/NanumGothic.ttf
+++ b/data/fonts/NanumGothic.ttf
Binary files differ
diff --git a/data/fonts/NotoColorEmoji.ttf b/data/fonts/NotoColorEmoji.ttf
index 2678952..a4aa243 100644
--- a/data/fonts/NotoColorEmoji.ttf
+++ b/data/fonts/NotoColorEmoji.ttf
Binary files differ
diff --git a/data/fonts/NotoNaskhArabic-Bold.ttf b/data/fonts/NotoNaskhArabic-Bold.ttf
index b48385b..d6dd566 100644
--- a/data/fonts/NotoNaskhArabic-Bold.ttf
+++ b/data/fonts/NotoNaskhArabic-Bold.ttf
Binary files differ
diff --git a/data/fonts/NotoNaskhArabic-Regular.ttf b/data/fonts/NotoNaskhArabic-Regular.ttf
index a1e7a71..cb6b7d5 100644
--- a/data/fonts/NotoNaskhArabic-Regular.ttf
+++ b/data/fonts/NotoNaskhArabic-Regular.ttf
Binary files differ
diff --git a/data/fonts/NotoNaskhArabicUI-Bold.ttf b/data/fonts/NotoNaskhArabicUI-Bold.ttf
index 77d5887..e4b9e73 100644
--- a/data/fonts/NotoNaskhArabicUI-Bold.ttf
+++ b/data/fonts/NotoNaskhArabicUI-Bold.ttf
Binary files differ
diff --git a/data/fonts/NotoNaskhArabicUI-Regular.ttf b/data/fonts/NotoNaskhArabicUI-Regular.ttf
index fd92917..4593dba 100644
--- a/data/fonts/NotoNaskhArabicUI-Regular.ttf
+++ b/data/fonts/NotoNaskhArabicUI-Regular.ttf
Binary files differ
diff --git a/data/fonts/NotoSansArmenian-Bold.ttf b/data/fonts/NotoSansArmenian-Bold.ttf
index 16d1805..155b9e0 100644
--- a/data/fonts/NotoSansArmenian-Bold.ttf
+++ b/data/fonts/NotoSansArmenian-Bold.ttf
Binary files differ
diff --git a/data/fonts/NotoSansArmenian-Regular.ttf b/data/fonts/NotoSansArmenian-Regular.ttf
index 2e1c607..fff304c 100644
--- a/data/fonts/NotoSansArmenian-Regular.ttf
+++ b/data/fonts/NotoSansArmenian-Regular.ttf
Binary files differ
diff --git a/data/fonts/NotoSansBalinese-Regular.ttf b/data/fonts/NotoSansBalinese-Regular.ttf
index b00914b..3dbe85b 100644
--- a/data/fonts/NotoSansBalinese-Regular.ttf
+++ b/data/fonts/NotoSansBalinese-Regular.ttf
Binary files differ
diff --git a/data/fonts/NotoSansBamum-Regular.ttf b/data/fonts/NotoSansBamum-Regular.ttf
index 149bf46..3587c90 100644
--- a/data/fonts/NotoSansBamum-Regular.ttf
+++ b/data/fonts/NotoSansBamum-Regular.ttf
Binary files differ
diff --git a/data/fonts/NotoSansBatak-Regular.ttf b/data/fonts/NotoSansBatak-Regular.ttf
index a20b9d2..a18c996 100644
--- a/data/fonts/NotoSansBatak-Regular.ttf
+++ b/data/fonts/NotoSansBatak-Regular.ttf
Binary files differ
diff --git a/data/fonts/NotoSansBengali-Bold.ttf b/data/fonts/NotoSansBengali-Bold.ttf
index 8c40688..2866037 100644
--- a/data/fonts/NotoSansBengali-Bold.ttf
+++ b/data/fonts/NotoSansBengali-Bold.ttf
Binary files differ
diff --git a/data/fonts/NotoSansBengali-Regular.ttf b/data/fonts/NotoSansBengali-Regular.ttf
index 00372fc..41a4b4a 100644
--- a/data/fonts/NotoSansBengali-Regular.ttf
+++ b/data/fonts/NotoSansBengali-Regular.ttf
Binary files differ
diff --git a/data/fonts/NotoSansBengaliUI-Bold.ttf b/data/fonts/NotoSansBengaliUI-Bold.ttf
index a92a68e..e8b2100 100644
--- a/data/fonts/NotoSansBengaliUI-Bold.ttf
+++ b/data/fonts/NotoSansBengaliUI-Bold.ttf
Binary files differ
diff --git a/data/fonts/NotoSansBengaliUI-Regular.ttf b/data/fonts/NotoSansBengaliUI-Regular.ttf
index 0747631..64c58a1 100644
--- a/data/fonts/NotoSansBengaliUI-Regular.ttf
+++ b/data/fonts/NotoSansBengaliUI-Regular.ttf
Binary files differ
diff --git a/data/fonts/NotoSansBuginese-Regular.ttf b/data/fonts/NotoSansBuginese-Regular.ttf
index c235a83..6474667 100644
--- a/data/fonts/NotoSansBuginese-Regular.ttf
+++ b/data/fonts/NotoSansBuginese-Regular.ttf
Binary files differ
diff --git a/data/fonts/NotoSansBuhid-Regular.ttf b/data/fonts/NotoSansBuhid-Regular.ttf
index 09ad661..f6fb695 100644
--- a/data/fonts/NotoSansBuhid-Regular.ttf
+++ b/data/fonts/NotoSansBuhid-Regular.ttf
Binary files differ
diff --git a/data/fonts/NotoSansCanadianAboriginal-Regular.ttf b/data/fonts/NotoSansCanadianAboriginal-Regular.ttf
index e1e4e4d..342bab8 100644
--- a/data/fonts/NotoSansCanadianAboriginal-Regular.ttf
+++ b/data/fonts/NotoSansCanadianAboriginal-Regular.ttf
Binary files differ
diff --git a/data/fonts/NotoSansCham-Bold.ttf b/data/fonts/NotoSansCham-Bold.ttf
index 6729ece..7e9c7f5 100644
--- a/data/fonts/NotoSansCham-Bold.ttf
+++ b/data/fonts/NotoSansCham-Bold.ttf
Binary files differ
diff --git a/data/fonts/NotoSansCham-Regular.ttf b/data/fonts/NotoSansCham-Regular.ttf
index 1072447..54ab275 100644
--- a/data/fonts/NotoSansCham-Regular.ttf
+++ b/data/fonts/NotoSansCham-Regular.ttf
Binary files differ
diff --git a/data/fonts/NotoSansCherokee-Regular.ttf b/data/fonts/NotoSansCherokee-Regular.ttf
index bdccfd3..b9478c8 100644
--- a/data/fonts/NotoSansCherokee-Regular.ttf
+++ b/data/fonts/NotoSansCherokee-Regular.ttf
Binary files differ
diff --git a/data/fonts/NotoSansCoptic-Regular.ttf b/data/fonts/NotoSansCoptic-Regular.ttf
index 1371b45..28f8682 100644
--- a/data/fonts/NotoSansCoptic-Regular.ttf
+++ b/data/fonts/NotoSansCoptic-Regular.ttf
Binary files differ
diff --git a/data/fonts/NotoSansDevanagari-Bold.ttf b/data/fonts/NotoSansDevanagari-Bold.ttf
index 7326648..e333c59 100644
--- a/data/fonts/NotoSansDevanagari-Bold.ttf
+++ b/data/fonts/NotoSansDevanagari-Bold.ttf
Binary files differ
diff --git a/data/fonts/NotoSansDevanagari-Regular.ttf b/data/fonts/NotoSansDevanagari-Regular.ttf
index 61bfc76..dbb57f9 100644
--- a/data/fonts/NotoSansDevanagari-Regular.ttf
+++ b/data/fonts/NotoSansDevanagari-Regular.ttf
Binary files differ
diff --git a/data/fonts/NotoSansDevanagariUI-Bold.ttf b/data/fonts/NotoSansDevanagariUI-Bold.ttf
index 1a48245..00fe620 100644
--- a/data/fonts/NotoSansDevanagariUI-Bold.ttf
+++ b/data/fonts/NotoSansDevanagariUI-Bold.ttf
Binary files differ
diff --git a/data/fonts/NotoSansDevanagariUI-Regular.ttf b/data/fonts/NotoSansDevanagariUI-Regular.ttf
index ebc44a4..1d76366 100644
--- a/data/fonts/NotoSansDevanagariUI-Regular.ttf
+++ b/data/fonts/NotoSansDevanagariUI-Regular.ttf
Binary files differ
diff --git a/data/fonts/NotoSansEthiopic-Bold.ttf b/data/fonts/NotoSansEthiopic-Bold.ttf
index 197978d..13294b6 100644
--- a/data/fonts/NotoSansEthiopic-Bold.ttf
+++ b/data/fonts/NotoSansEthiopic-Bold.ttf
Binary files differ
diff --git a/data/fonts/NotoSansEthiopic-Regular.ttf b/data/fonts/NotoSansEthiopic-Regular.ttf
index e3c4d58..df6c5ba 100644
--- a/data/fonts/NotoSansEthiopic-Regular.ttf
+++ b/data/fonts/NotoSansEthiopic-Regular.ttf
Binary files differ
diff --git a/data/fonts/NotoSansGeorgian-Bold.ttf b/data/fonts/NotoSansGeorgian-Bold.ttf
index 25788d6..6145f31 100644
--- a/data/fonts/NotoSansGeorgian-Bold.ttf
+++ b/data/fonts/NotoSansGeorgian-Bold.ttf
Binary files differ
diff --git a/data/fonts/NotoSansGeorgian-Regular.ttf b/data/fonts/NotoSansGeorgian-Regular.ttf
index 2c26f6d..d59fb78 100644
--- a/data/fonts/NotoSansGeorgian-Regular.ttf
+++ b/data/fonts/NotoSansGeorgian-Regular.ttf
Binary files differ
diff --git a/data/fonts/NotoSansGlagolitic-Regular.ttf b/data/fonts/NotoSansGlagolitic-Regular.ttf
index 06bf797..bcdb6b4 100644
--- a/data/fonts/NotoSansGlagolitic-Regular.ttf
+++ b/data/fonts/NotoSansGlagolitic-Regular.ttf
Binary files differ
diff --git a/data/fonts/NotoSansGujarati-Bold.ttf b/data/fonts/NotoSansGujarati-Bold.ttf
index 2f087a4..6005568 100644
--- a/data/fonts/NotoSansGujarati-Bold.ttf
+++ b/data/fonts/NotoSansGujarati-Bold.ttf
Binary files differ
diff --git a/data/fonts/NotoSansGujarati-Regular.ttf b/data/fonts/NotoSansGujarati-Regular.ttf
index 044b8fd..f044f56 100644
--- a/data/fonts/NotoSansGujarati-Regular.ttf
+++ b/data/fonts/NotoSansGujarati-Regular.ttf
Binary files differ
diff --git a/data/fonts/NotoSansGujaratiUI-Bold.ttf b/data/fonts/NotoSansGujaratiUI-Bold.ttf
index da0abb5..505a58b 100644
--- a/data/fonts/NotoSansGujaratiUI-Bold.ttf
+++ b/data/fonts/NotoSansGujaratiUI-Bold.ttf
Binary files differ
diff --git a/data/fonts/NotoSansGujaratiUI-Regular.ttf b/data/fonts/NotoSansGujaratiUI-Regular.ttf
index df62b08..390b3c5 100644
--- a/data/fonts/NotoSansGujaratiUI-Regular.ttf
+++ b/data/fonts/NotoSansGujaratiUI-Regular.ttf
Binary files differ
diff --git a/data/fonts/NotoSansGurmukhi-Bold.ttf b/data/fonts/NotoSansGurmukhi-Bold.ttf
index 9ad7a21..8253408 100644
--- a/data/fonts/NotoSansGurmukhi-Bold.ttf
+++ b/data/fonts/NotoSansGurmukhi-Bold.ttf
Binary files differ
diff --git a/data/fonts/NotoSansGurmukhi-Regular.ttf b/data/fonts/NotoSansGurmukhi-Regular.ttf
index 0999a72..8179151 100644
--- a/data/fonts/NotoSansGurmukhi-Regular.ttf
+++ b/data/fonts/NotoSansGurmukhi-Regular.ttf
Binary files differ
diff --git a/data/fonts/NotoSansGurmukhiUI-Bold.ttf b/data/fonts/NotoSansGurmukhiUI-Bold.ttf
index 2bb971f..530cadc 100644
--- a/data/fonts/NotoSansGurmukhiUI-Bold.ttf
+++ b/data/fonts/NotoSansGurmukhiUI-Bold.ttf
Binary files differ
diff --git a/data/fonts/NotoSansGurmukhiUI-Regular.ttf b/data/fonts/NotoSansGurmukhiUI-Regular.ttf
index 4ab87c7..0ec42cc 100644
--- a/data/fonts/NotoSansGurmukhiUI-Regular.ttf
+++ b/data/fonts/NotoSansGurmukhiUI-Regular.ttf
Binary files differ
diff --git a/data/fonts/NotoSansHanunoo-Regular.ttf b/data/fonts/NotoSansHanunoo-Regular.ttf
index 1bbc159..b70c74c 100644
--- a/data/fonts/NotoSansHanunoo-Regular.ttf
+++ b/data/fonts/NotoSansHanunoo-Regular.ttf
Binary files differ
diff --git a/data/fonts/NotoSansHebrew-Bold.ttf b/data/fonts/NotoSansHebrew-Bold.ttf
index b5599f2..dd4b062 100644
--- a/data/fonts/NotoSansHebrew-Bold.ttf
+++ b/data/fonts/NotoSansHebrew-Bold.ttf
Binary files differ
diff --git a/data/fonts/NotoSansHebrew-Regular.ttf b/data/fonts/NotoSansHebrew-Regular.ttf
index 5428a43..868d2dc 100644
--- a/data/fonts/NotoSansHebrew-Regular.ttf
+++ b/data/fonts/NotoSansHebrew-Regular.ttf
Binary files differ
diff --git a/data/fonts/NotoSansJavanese-Regular.ttf b/data/fonts/NotoSansJavanese-Regular.ttf
index 1cf3528..e515ec8 100644
--- a/data/fonts/NotoSansJavanese-Regular.ttf
+++ b/data/fonts/NotoSansJavanese-Regular.ttf
Binary files differ
diff --git a/data/fonts/NotoSansKannada-Bold.ttf b/data/fonts/NotoSansKannada-Bold.ttf
index cd73648..ac7ec6c 100644
--- a/data/fonts/NotoSansKannada-Bold.ttf
+++ b/data/fonts/NotoSansKannada-Bold.ttf
Binary files differ
diff --git a/data/fonts/NotoSansKannada-Regular.ttf b/data/fonts/NotoSansKannada-Regular.ttf
index cfdcab1..61eefee 100644
--- a/data/fonts/NotoSansKannada-Regular.ttf
+++ b/data/fonts/NotoSansKannada-Regular.ttf
Binary files differ
diff --git a/data/fonts/NotoSansKannadaUI-Bold.ttf b/data/fonts/NotoSansKannadaUI-Bold.ttf
index e21b21f..3fc4527 100644
--- a/data/fonts/NotoSansKannadaUI-Bold.ttf
+++ b/data/fonts/NotoSansKannadaUI-Bold.ttf
Binary files differ
diff --git a/data/fonts/NotoSansKannadaUI-Regular.ttf b/data/fonts/NotoSansKannadaUI-Regular.ttf
index 31f3204..1c191e7 100644
--- a/data/fonts/NotoSansKannadaUI-Regular.ttf
+++ b/data/fonts/NotoSansKannadaUI-Regular.ttf
Binary files differ
diff --git a/data/fonts/NotoSansKayahLi-Regular.ttf b/data/fonts/NotoSansKayahLi-Regular.ttf
index 59e6329..472c560 100644
--- a/data/fonts/NotoSansKayahLi-Regular.ttf
+++ b/data/fonts/NotoSansKayahLi-Regular.ttf
Binary files differ
diff --git a/data/fonts/NotoSansKhmer-Bold.ttf b/data/fonts/NotoSansKhmer-Bold.ttf
index b061f6d..2979dc1 100644
--- a/data/fonts/NotoSansKhmer-Bold.ttf
+++ b/data/fonts/NotoSansKhmer-Bold.ttf
Binary files differ
diff --git a/data/fonts/NotoSansKhmer-Regular.ttf b/data/fonts/NotoSansKhmer-Regular.ttf
index e865a46..300b30c 100644
--- a/data/fonts/NotoSansKhmer-Regular.ttf
+++ b/data/fonts/NotoSansKhmer-Regular.ttf
Binary files differ
diff --git a/data/fonts/NotoSansKhmerUI-Bold.ttf b/data/fonts/NotoSansKhmerUI-Bold.ttf
index 10fa51a..94febf7 100644
--- a/data/fonts/NotoSansKhmerUI-Bold.ttf
+++ b/data/fonts/NotoSansKhmerUI-Bold.ttf
Binary files differ
diff --git a/data/fonts/NotoSansKhmerUI-Regular.ttf b/data/fonts/NotoSansKhmerUI-Regular.ttf
index c193a98..8347ea3 100644
--- a/data/fonts/NotoSansKhmerUI-Regular.ttf
+++ b/data/fonts/NotoSansKhmerUI-Regular.ttf
Binary files differ
diff --git a/data/fonts/NotoSansLao-Bold.ttf b/data/fonts/NotoSansLao-Bold.ttf
index 04bd877..4ea6a76 100644
--- a/data/fonts/NotoSansLao-Bold.ttf
+++ b/data/fonts/NotoSansLao-Bold.ttf
Binary files differ
diff --git a/data/fonts/NotoSansLao-Regular.ttf b/data/fonts/NotoSansLao-Regular.ttf
index 1c4f0e4..a6d4e4d 100644
--- a/data/fonts/NotoSansLao-Regular.ttf
+++ b/data/fonts/NotoSansLao-Regular.ttf
Binary files differ
diff --git a/data/fonts/NotoSansLaoUI-Bold.ttf b/data/fonts/NotoSansLaoUI-Bold.ttf
index 5345233..dd7c6ef 100644
--- a/data/fonts/NotoSansLaoUI-Bold.ttf
+++ b/data/fonts/NotoSansLaoUI-Bold.ttf
Binary files differ
diff --git a/data/fonts/NotoSansLaoUI-Regular.ttf b/data/fonts/NotoSansLaoUI-Regular.ttf
index 5c68d6a..4eab3c9 100644
--- a/data/fonts/NotoSansLaoUI-Regular.ttf
+++ b/data/fonts/NotoSansLaoUI-Regular.ttf
Binary files differ
diff --git a/data/fonts/NotoSansLepcha-Regular.ttf b/data/fonts/NotoSansLepcha-Regular.ttf
index 01d8f37..c30eade 100644
--- a/data/fonts/NotoSansLepcha-Regular.ttf
+++ b/data/fonts/NotoSansLepcha-Regular.ttf
Binary files differ
diff --git a/data/fonts/NotoSansLimbu-Regular.ttf b/data/fonts/NotoSansLimbu-Regular.ttf
index d867b67..b67d242 100644
--- a/data/fonts/NotoSansLimbu-Regular.ttf
+++ b/data/fonts/NotoSansLimbu-Regular.ttf
Binary files differ
diff --git a/data/fonts/NotoSansLisu-Regular.ttf b/data/fonts/NotoSansLisu-Regular.ttf
index 0cfb10f..89cb2bd 100644
--- a/data/fonts/NotoSansLisu-Regular.ttf
+++ b/data/fonts/NotoSansLisu-Regular.ttf
Binary files differ
diff --git a/data/fonts/NotoSansMalayalam-Bold.ttf b/data/fonts/NotoSansMalayalam-Bold.ttf
index 06e8feb..745bc51 100644
--- a/data/fonts/NotoSansMalayalam-Bold.ttf
+++ b/data/fonts/NotoSansMalayalam-Bold.ttf
Binary files differ
diff --git a/data/fonts/NotoSansMalayalam-Regular.ttf b/data/fonts/NotoSansMalayalam-Regular.ttf
index de541ab..3d37b34 100644
--- a/data/fonts/NotoSansMalayalam-Regular.ttf
+++ b/data/fonts/NotoSansMalayalam-Regular.ttf
Binary files differ
diff --git a/data/fonts/NotoSansMalayalamUI-Bold.ttf b/data/fonts/NotoSansMalayalamUI-Bold.ttf
index 6a1cf76..5da0212 100644
--- a/data/fonts/NotoSansMalayalamUI-Bold.ttf
+++ b/data/fonts/NotoSansMalayalamUI-Bold.ttf
Binary files differ
diff --git a/data/fonts/NotoSansMalayalamUI-Regular.ttf b/data/fonts/NotoSansMalayalamUI-Regular.ttf
index 244f71f..570ad1e 100644
--- a/data/fonts/NotoSansMalayalamUI-Regular.ttf
+++ b/data/fonts/NotoSansMalayalamUI-Regular.ttf
Binary files differ
diff --git a/data/fonts/NotoSansMandaic-Regular.ttf b/data/fonts/NotoSansMandaic-Regular.ttf
index fa23cdc..0934e88 100644
--- a/data/fonts/NotoSansMandaic-Regular.ttf
+++ b/data/fonts/NotoSansMandaic-Regular.ttf
Binary files differ
diff --git a/data/fonts/NotoSansMeeteiMayek-Regular.ttf b/data/fonts/NotoSansMeeteiMayek-Regular.ttf
index fae953b..57c8c55 100644
--- a/data/fonts/NotoSansMeeteiMayek-Regular.ttf
+++ b/data/fonts/NotoSansMeeteiMayek-Regular.ttf
Binary files differ
diff --git a/data/fonts/NotoSansMongolian-Regular.ttf b/data/fonts/NotoSansMongolian-Regular.ttf
index 1bec517..27c4774 100644
--- a/data/fonts/NotoSansMongolian-Regular.ttf
+++ b/data/fonts/NotoSansMongolian-Regular.ttf
Binary files differ
diff --git a/data/fonts/NotoSansMyanmar-Bold.ttf b/data/fonts/NotoSansMyanmar-Bold.ttf
index f96b7ed..a737f1a 100644
--- a/data/fonts/NotoSansMyanmar-Bold.ttf
+++ b/data/fonts/NotoSansMyanmar-Bold.ttf
Binary files differ
diff --git a/data/fonts/NotoSansMyanmar-Regular.ttf b/data/fonts/NotoSansMyanmar-Regular.ttf
index d46c88c..be368a5 100644
--- a/data/fonts/NotoSansMyanmar-Regular.ttf
+++ b/data/fonts/NotoSansMyanmar-Regular.ttf
Binary files differ
diff --git a/data/fonts/NotoSansMyanmarUI-Bold.ttf b/data/fonts/NotoSansMyanmarUI-Bold.ttf
index d6e3734..b18f819 100644
--- a/data/fonts/NotoSansMyanmarUI-Bold.ttf
+++ b/data/fonts/NotoSansMyanmarUI-Bold.ttf
Binary files differ
diff --git a/data/fonts/NotoSansMyanmarUI-Regular.ttf b/data/fonts/NotoSansMyanmarUI-Regular.ttf
index f0feda5..6efbede 100644
--- a/data/fonts/NotoSansMyanmarUI-Regular.ttf
+++ b/data/fonts/NotoSansMyanmarUI-Regular.ttf
Binary files differ
diff --git a/data/fonts/NotoSansNKo-Regular.ttf b/data/fonts/NotoSansNKo-Regular.ttf
index bfcbfb9..fd83df2 100644
--- a/data/fonts/NotoSansNKo-Regular.ttf
+++ b/data/fonts/NotoSansNKo-Regular.ttf
Binary files differ
diff --git a/data/fonts/NotoSansNewTaiLue-Regular.ttf b/data/fonts/NotoSansNewTaiLue-Regular.ttf
index 21b45d1..b247046 100644
--- a/data/fonts/NotoSansNewTaiLue-Regular.ttf
+++ b/data/fonts/NotoSansNewTaiLue-Regular.ttf
Binary files differ
diff --git a/data/fonts/NotoSansOlChiki-Regular.ttf b/data/fonts/NotoSansOlChiki-Regular.ttf
index 656507f..bfc5dbc 100644
--- a/data/fonts/NotoSansOlChiki-Regular.ttf
+++ b/data/fonts/NotoSansOlChiki-Regular.ttf
Binary files differ
diff --git a/data/fonts/NotoSansOriya-Bold.ttf b/data/fonts/NotoSansOriya-Bold.ttf
index 2a892d2..bfe1f5e 100644
--- a/data/fonts/NotoSansOriya-Bold.ttf
+++ b/data/fonts/NotoSansOriya-Bold.ttf
Binary files differ
diff --git a/data/fonts/NotoSansOriya-Regular.ttf b/data/fonts/NotoSansOriya-Regular.ttf
index 2a074da..96c263e 100644
--- a/data/fonts/NotoSansOriya-Regular.ttf
+++ b/data/fonts/NotoSansOriya-Regular.ttf
Binary files differ
diff --git a/data/fonts/NotoSansOriyaUI-Bold.ttf b/data/fonts/NotoSansOriyaUI-Bold.ttf
index b31c655..729f14c 100644
--- a/data/fonts/NotoSansOriyaUI-Bold.ttf
+++ b/data/fonts/NotoSansOriyaUI-Bold.ttf
Binary files differ
diff --git a/data/fonts/NotoSansOriyaUI-Regular.ttf b/data/fonts/NotoSansOriyaUI-Regular.ttf
index 72d87b8..92a0024 100644
--- a/data/fonts/NotoSansOriyaUI-Regular.ttf
+++ b/data/fonts/NotoSansOriyaUI-Regular.ttf
Binary files differ
diff --git a/data/fonts/NotoSansPhagsPa-Regular.ttf b/data/fonts/NotoSansPhagsPa-Regular.ttf
index cfacf92..8ee7a1f 100644
--- a/data/fonts/NotoSansPhagsPa-Regular.ttf
+++ b/data/fonts/NotoSansPhagsPa-Regular.ttf
Binary files differ
diff --git a/data/fonts/NotoSansRejang-Regular.ttf b/data/fonts/NotoSansRejang-Regular.ttf
index 367f758..fe5ae6c 100644
--- a/data/fonts/NotoSansRejang-Regular.ttf
+++ b/data/fonts/NotoSansRejang-Regular.ttf
Binary files differ
diff --git a/data/fonts/NotoSansRunic-Regular.ttf b/data/fonts/NotoSansRunic-Regular.ttf
index 45dbcd1..f177aee 100644
--- a/data/fonts/NotoSansRunic-Regular.ttf
+++ b/data/fonts/NotoSansRunic-Regular.ttf
Binary files differ
diff --git a/data/fonts/NotoSansSamaritan-Regular.ttf b/data/fonts/NotoSansSamaritan-Regular.ttf
index 6bb7de1..c70080a 100644
--- a/data/fonts/NotoSansSamaritan-Regular.ttf
+++ b/data/fonts/NotoSansSamaritan-Regular.ttf
Binary files differ
diff --git a/data/fonts/NotoSansSaurashtra-Regular.ttf b/data/fonts/NotoSansSaurashtra-Regular.ttf
index eeedb60..5bedaa9 100644
--- a/data/fonts/NotoSansSaurashtra-Regular.ttf
+++ b/data/fonts/NotoSansSaurashtra-Regular.ttf
Binary files differ
diff --git a/data/fonts/NotoSansSinhala-Bold.ttf b/data/fonts/NotoSansSinhala-Bold.ttf
index af5a27d..753af7c 100644
--- a/data/fonts/NotoSansSinhala-Bold.ttf
+++ b/data/fonts/NotoSansSinhala-Bold.ttf
Binary files differ
diff --git a/data/fonts/NotoSansSinhala-Regular.ttf b/data/fonts/NotoSansSinhala-Regular.ttf
index d5fde8c..5c54739 100644
--- a/data/fonts/NotoSansSinhala-Regular.ttf
+++ b/data/fonts/NotoSansSinhala-Regular.ttf
Binary files differ
diff --git a/data/fonts/NotoSansSundanese-Regular.ttf b/data/fonts/NotoSansSundanese-Regular.ttf
index d36c4e1..d80eea7 100644
--- a/data/fonts/NotoSansSundanese-Regular.ttf
+++ b/data/fonts/NotoSansSundanese-Regular.ttf
Binary files differ
diff --git a/data/fonts/NotoSansSylotiNagri-Regular.ttf b/data/fonts/NotoSansSylotiNagri-Regular.ttf
index b94c742..67a17a4 100644
--- a/data/fonts/NotoSansSylotiNagri-Regular.ttf
+++ b/data/fonts/NotoSansSylotiNagri-Regular.ttf
Binary files differ
diff --git a/data/fonts/NotoSansSymbols-Regular-Subsetted.ttf b/data/fonts/NotoSansSymbols-Regular-Subsetted.ttf
index 30e64d0..7186d0b 100644
--- a/data/fonts/NotoSansSymbols-Regular-Subsetted.ttf
+++ b/data/fonts/NotoSansSymbols-Regular-Subsetted.ttf
Binary files differ
diff --git a/data/fonts/NotoSansSymbols-Regular-Subsetted2.ttf b/data/fonts/NotoSansSymbols-Regular-Subsetted2.ttf
index 87b9bce..165125e 100644
--- a/data/fonts/NotoSansSymbols-Regular-Subsetted2.ttf
+++ b/data/fonts/NotoSansSymbols-Regular-Subsetted2.ttf
Binary files differ
diff --git a/data/fonts/NotoSansSyriacEastern-Regular.ttf b/data/fonts/NotoSansSyriacEastern-Regular.ttf
index b0bbbea..212f854 100644
--- a/data/fonts/NotoSansSyriacEastern-Regular.ttf
+++ b/data/fonts/NotoSansSyriacEastern-Regular.ttf
Binary files differ
diff --git a/data/fonts/NotoSansSyriacEstrangela-Regular.ttf b/data/fonts/NotoSansSyriacEstrangela-Regular.ttf
index 4a39608..f7226b7 100644
--- a/data/fonts/NotoSansSyriacEstrangela-Regular.ttf
+++ b/data/fonts/NotoSansSyriacEstrangela-Regular.ttf
Binary files differ
diff --git a/data/fonts/NotoSansSyriacWestern-Regular.ttf b/data/fonts/NotoSansSyriacWestern-Regular.ttf
index d73a1d7..9978a6c 100644
--- a/data/fonts/NotoSansSyriacWestern-Regular.ttf
+++ b/data/fonts/NotoSansSyriacWestern-Regular.ttf
Binary files differ
diff --git a/data/fonts/NotoSansTagalog-Regular.ttf b/data/fonts/NotoSansTagalog-Regular.ttf
index d53e2cf..aa9af35 100644
--- a/data/fonts/NotoSansTagalog-Regular.ttf
+++ b/data/fonts/NotoSansTagalog-Regular.ttf
Binary files differ
diff --git a/data/fonts/NotoSansTagbanwa-Regular.ttf b/data/fonts/NotoSansTagbanwa-Regular.ttf
index e6f47f2..36a4ad5 100644
--- a/data/fonts/NotoSansTagbanwa-Regular.ttf
+++ b/data/fonts/NotoSansTagbanwa-Regular.ttf
Binary files differ
diff --git a/data/fonts/NotoSansTaiLe-Regular.ttf b/data/fonts/NotoSansTaiLe-Regular.ttf
index 75b2542..a46ca73 100644
--- a/data/fonts/NotoSansTaiLe-Regular.ttf
+++ b/data/fonts/NotoSansTaiLe-Regular.ttf
Binary files differ
diff --git a/data/fonts/NotoSansTaiTham-Regular.ttf b/data/fonts/NotoSansTaiTham-Regular.ttf
index 1717938..3503b78 100644
--- a/data/fonts/NotoSansTaiTham-Regular.ttf
+++ b/data/fonts/NotoSansTaiTham-Regular.ttf
Binary files differ
diff --git a/data/fonts/NotoSansTaiViet-Regular.ttf b/data/fonts/NotoSansTaiViet-Regular.ttf
index 0a51c1b..fb33f46 100644
--- a/data/fonts/NotoSansTaiViet-Regular.ttf
+++ b/data/fonts/NotoSansTaiViet-Regular.ttf
Binary files differ
diff --git a/data/fonts/NotoSansTamil-Bold.ttf b/data/fonts/NotoSansTamil-Bold.ttf
index 3834517..2f97e90 100644
--- a/data/fonts/NotoSansTamil-Bold.ttf
+++ b/data/fonts/NotoSansTamil-Bold.ttf
Binary files differ
diff --git a/data/fonts/NotoSansTamil-Regular.ttf b/data/fonts/NotoSansTamil-Regular.ttf
index a1f9b70..dec48f7 100644
--- a/data/fonts/NotoSansTamil-Regular.ttf
+++ b/data/fonts/NotoSansTamil-Regular.ttf
Binary files differ
diff --git a/data/fonts/NotoSansTamilUI-Bold.ttf b/data/fonts/NotoSansTamilUI-Bold.ttf
index 6930c27..82d5b35 100644
--- a/data/fonts/NotoSansTamilUI-Bold.ttf
+++ b/data/fonts/NotoSansTamilUI-Bold.ttf
Binary files differ
diff --git a/data/fonts/NotoSansTamilUI-Regular.ttf b/data/fonts/NotoSansTamilUI-Regular.ttf
index 3eb0a66..04d6c59 100644
--- a/data/fonts/NotoSansTamilUI-Regular.ttf
+++ b/data/fonts/NotoSansTamilUI-Regular.ttf
Binary files differ
diff --git a/data/fonts/NotoSansTelugu-Bold.ttf b/data/fonts/NotoSansTelugu-Bold.ttf
index 5ccd93f..c7dd100 100644
--- a/data/fonts/NotoSansTelugu-Bold.ttf
+++ b/data/fonts/NotoSansTelugu-Bold.ttf
Binary files differ
diff --git a/data/fonts/NotoSansTelugu-Regular.ttf b/data/fonts/NotoSansTelugu-Regular.ttf
index 5396c64..fef8014 100644
--- a/data/fonts/NotoSansTelugu-Regular.ttf
+++ b/data/fonts/NotoSansTelugu-Regular.ttf
Binary files differ
diff --git a/data/fonts/NotoSansTeluguUI-Bold.ttf b/data/fonts/NotoSansTeluguUI-Bold.ttf
index 28ba7bd..d8e4096 100644
--- a/data/fonts/NotoSansTeluguUI-Bold.ttf
+++ b/data/fonts/NotoSansTeluguUI-Bold.ttf
Binary files differ
diff --git a/data/fonts/NotoSansTeluguUI-Regular.ttf b/data/fonts/NotoSansTeluguUI-Regular.ttf
index 7d1ab65..4bfbd39 100644
--- a/data/fonts/NotoSansTeluguUI-Regular.ttf
+++ b/data/fonts/NotoSansTeluguUI-Regular.ttf
Binary files differ
diff --git a/data/fonts/NotoSansThaana-Bold.ttf b/data/fonts/NotoSansThaana-Bold.ttf
index f368efa..f9a4d58 100644
--- a/data/fonts/NotoSansThaana-Bold.ttf
+++ b/data/fonts/NotoSansThaana-Bold.ttf
Binary files differ
diff --git a/data/fonts/NotoSansThaana-Regular.ttf b/data/fonts/NotoSansThaana-Regular.ttf
index c2d94c3..3fa582c 100644
--- a/data/fonts/NotoSansThaana-Regular.ttf
+++ b/data/fonts/NotoSansThaana-Regular.ttf
Binary files differ
diff --git a/data/fonts/NotoSansThai-Bold.ttf b/data/fonts/NotoSansThai-Bold.ttf
index 33f895d..0ddb0ac 100644
--- a/data/fonts/NotoSansThai-Bold.ttf
+++ b/data/fonts/NotoSansThai-Bold.ttf
Binary files differ
diff --git a/data/fonts/NotoSansThai-Regular.ttf b/data/fonts/NotoSansThai-Regular.ttf
index 2a3a37b..64794ed 100644
--- a/data/fonts/NotoSansThai-Regular.ttf
+++ b/data/fonts/NotoSansThai-Regular.ttf
Binary files differ
diff --git a/data/fonts/NotoSansThaiUI-Bold.ttf b/data/fonts/NotoSansThaiUI-Bold.ttf
index a216520..c4d5767 100644
--- a/data/fonts/NotoSansThaiUI-Bold.ttf
+++ b/data/fonts/NotoSansThaiUI-Bold.ttf
Binary files differ
diff --git a/data/fonts/NotoSansThaiUI-Regular.ttf b/data/fonts/NotoSansThaiUI-Regular.ttf
index 50a434e..deb1380 100644
--- a/data/fonts/NotoSansThaiUI-Regular.ttf
+++ b/data/fonts/NotoSansThaiUI-Regular.ttf
Binary files differ
diff --git a/data/fonts/NotoSansTibetan-Bold.ttf b/data/fonts/NotoSansTibetan-Bold.ttf
index 30efabc..85b13c5 100644
--- a/data/fonts/NotoSansTibetan-Bold.ttf
+++ b/data/fonts/NotoSansTibetan-Bold.ttf
Binary files differ
diff --git a/data/fonts/NotoSansTibetan-Regular.ttf b/data/fonts/NotoSansTibetan-Regular.ttf
index 31182ee..1f5cf9e 100644
--- a/data/fonts/NotoSansTibetan-Regular.ttf
+++ b/data/fonts/NotoSansTibetan-Regular.ttf
Binary files differ
diff --git a/data/fonts/NotoSansTifinagh-Regular.ttf b/data/fonts/NotoSansTifinagh-Regular.ttf
index 0953d7c..7953c87 100644
--- a/data/fonts/NotoSansTifinagh-Regular.ttf
+++ b/data/fonts/NotoSansTifinagh-Regular.ttf
Binary files differ
diff --git a/data/fonts/NotoSansVai-Regular.ttf b/data/fonts/NotoSansVai-Regular.ttf
index bf2bedb..aea6006 100644
--- a/data/fonts/NotoSansVai-Regular.ttf
+++ b/data/fonts/NotoSansVai-Regular.ttf
Binary files differ
diff --git a/data/fonts/NotoSansYi-Regular.ttf b/data/fonts/NotoSansYi-Regular.ttf
index c562a06..403db24 100644
--- a/data/fonts/NotoSansYi-Regular.ttf
+++ b/data/fonts/NotoSansYi-Regular.ttf
Binary files differ
diff --git a/data/fonts/NotoSerif-Bold.ttf b/data/fonts/NotoSerif-Bold.ttf
index 9d390bf..2b00083 100644
--- a/data/fonts/NotoSerif-Bold.ttf
+++ b/data/fonts/NotoSerif-Bold.ttf
Binary files differ
diff --git a/data/fonts/NotoSerif-BoldItalic.ttf b/data/fonts/NotoSerif-BoldItalic.ttf
index 7473935..0c2b44a 100644
--- a/data/fonts/NotoSerif-BoldItalic.ttf
+++ b/data/fonts/NotoSerif-BoldItalic.ttf
Binary files differ
diff --git a/data/fonts/NotoSerif-Italic.ttf b/data/fonts/NotoSerif-Italic.ttf
index 88a25a2..10cd43d 100644
--- a/data/fonts/NotoSerif-Italic.ttf
+++ b/data/fonts/NotoSerif-Italic.ttf
Binary files differ
diff --git a/data/fonts/NotoSerif-Regular.ttf b/data/fonts/NotoSerif-Regular.ttf
index 64fd40f..e0ddcc7 100644
--- a/data/fonts/NotoSerif-Regular.ttf
+++ b/data/fonts/NotoSerif-Regular.ttf
Binary files differ
diff --git a/data/fonts/Roboto-Black.ttf b/data/fonts/Roboto-Black.ttf
index 49cb248..aae11fe 100644
--- a/data/fonts/Roboto-Black.ttf
+++ b/data/fonts/Roboto-Black.ttf
Binary files differ
diff --git a/data/fonts/Roboto-BlackItalic.ttf b/data/fonts/Roboto-BlackItalic.ttf
index f6e67c9..edfbe94 100644
--- a/data/fonts/Roboto-BlackItalic.ttf
+++ b/data/fonts/Roboto-BlackItalic.ttf
Binary files differ
diff --git a/data/fonts/Roboto-Bold.ttf b/data/fonts/Roboto-Bold.ttf
index 9e4bad1..6a4802e 100644
--- a/data/fonts/Roboto-Bold.ttf
+++ b/data/fonts/Roboto-Bold.ttf
Binary files differ
diff --git a/data/fonts/Roboto-BoldItalic.ttf b/data/fonts/Roboto-BoldItalic.ttf
index 67e4826..124d4bf 100644
--- a/data/fonts/Roboto-BoldItalic.ttf
+++ b/data/fonts/Roboto-BoldItalic.ttf
Binary files differ
diff --git a/data/fonts/Roboto-Italic.ttf b/data/fonts/Roboto-Italic.ttf
index 57f5c72..5cc4577 100644
--- a/data/fonts/Roboto-Italic.ttf
+++ b/data/fonts/Roboto-Italic.ttf
Binary files differ
diff --git a/data/fonts/Roboto-Light.ttf b/data/fonts/Roboto-Light.ttf
index 1a0c9d5..aaa3262 100644
--- a/data/fonts/Roboto-Light.ttf
+++ b/data/fonts/Roboto-Light.ttf
Binary files differ
diff --git a/data/fonts/Roboto-LightItalic.ttf b/data/fonts/Roboto-LightItalic.ttf
index cfae985..7f60612 100644
--- a/data/fonts/Roboto-LightItalic.ttf
+++ b/data/fonts/Roboto-LightItalic.ttf
Binary files differ
diff --git a/data/fonts/Roboto-Medium.ttf b/data/fonts/Roboto-Medium.ttf
index 97191c3..db498dd 100644
--- a/data/fonts/Roboto-Medium.ttf
+++ b/data/fonts/Roboto-Medium.ttf
Binary files differ
diff --git a/data/fonts/Roboto-MediumItalic.ttf b/data/fonts/Roboto-MediumItalic.ttf
index 8f3c279..405c704 100644
--- a/data/fonts/Roboto-MediumItalic.ttf
+++ b/data/fonts/Roboto-MediumItalic.ttf
Binary files differ
diff --git a/data/fonts/Roboto-Regular.ttf b/data/fonts/Roboto-Regular.ttf
index aeac814..92f32ce 100644
--- a/data/fonts/Roboto-Regular.ttf
+++ b/data/fonts/Roboto-Regular.ttf
Binary files differ
diff --git a/data/fonts/Roboto-Thin.ttf b/data/fonts/Roboto-Thin.ttf
index f6d443f..1afd0b7 100644
--- a/data/fonts/Roboto-Thin.ttf
+++ b/data/fonts/Roboto-Thin.ttf
Binary files differ
diff --git a/data/fonts/Roboto-ThinItalic.ttf b/data/fonts/Roboto-ThinItalic.ttf
index b40546c..85cf0c8 100644
--- a/data/fonts/Roboto-ThinItalic.ttf
+++ b/data/fonts/Roboto-ThinItalic.ttf
Binary files differ
diff --git a/data/fonts/RobotoCondensed-Bold.ttf b/data/fonts/RobotoCondensed-Bold.ttf
index c5f90b4..f67a3b7 100644
--- a/data/fonts/RobotoCondensed-Bold.ttf
+++ b/data/fonts/RobotoCondensed-Bold.ttf
Binary files differ
diff --git a/data/fonts/RobotoCondensed-BoldItalic.ttf b/data/fonts/RobotoCondensed-BoldItalic.ttf
index 17e7c38..1e74f87 100644
--- a/data/fonts/RobotoCondensed-BoldItalic.ttf
+++ b/data/fonts/RobotoCondensed-BoldItalic.ttf
Binary files differ
diff --git a/data/fonts/RobotoCondensed-Italic.ttf b/data/fonts/RobotoCondensed-Italic.ttf
index 54de73d..a74e828 100644
--- a/data/fonts/RobotoCondensed-Italic.ttf
+++ b/data/fonts/RobotoCondensed-Italic.ttf
Binary files differ
diff --git a/data/fonts/RobotoCondensed-Light.ttf b/data/fonts/RobotoCondensed-Light.ttf
index e8c6eb4..eba76cb 100644
--- a/data/fonts/RobotoCondensed-Light.ttf
+++ b/data/fonts/RobotoCondensed-Light.ttf
Binary files differ
diff --git a/data/fonts/RobotoCondensed-LightItalic.ttf b/data/fonts/RobotoCondensed-LightItalic.ttf
index 5b247d7..ee09992 100644
--- a/data/fonts/RobotoCondensed-LightItalic.ttf
+++ b/data/fonts/RobotoCondensed-LightItalic.ttf
Binary files differ
diff --git a/data/fonts/RobotoCondensed-Regular.ttf b/data/fonts/RobotoCondensed-Regular.ttf
index 3d3050e..a96fe2a 100644
--- a/data/fonts/RobotoCondensed-Regular.ttf
+++ b/data/fonts/RobotoCondensed-Regular.ttf
Binary files differ
diff --git a/data/layoutlib.jar b/data/layoutlib.jar
index cfd8930..717d883 100644
--- a/data/layoutlib.jar
+++ b/data/layoutlib.jar
Binary files differ
diff --git a/data/res/anim/app_starting_exit.xml b/data/res/anim/app_starting_exit.xml
index aaf7f15..dfa42e2 100644
--- a/data/res/anim/app_starting_exit.xml
+++ b/data/res/anim/app_starting_exit.xml
@@ -21,8 +21,8 @@
 <alpha
     xmlns:android="http://schemas.android.com/apk/res/android"
     android:detachWallpaper="true"
-    android:interpolator="@interpolator/decelerate_quad"
+    android:interpolator="@interpolator/linear"
     android:fromAlpha="1.0"
     android:toAlpha="0.0"
-    android:duration="160" />
+    android:duration="150" />
 
diff --git a/data/res/color/text_color_secondary.xml b/data/res/color/text_color_secondary.xml
new file mode 100644
index 0000000..60e0af8
--- /dev/null
+++ b/data/res/color/text_color_secondary.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2017 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.
+-->
+
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:state_enabled="false"
+        android:alpha="?attr/disabledAlpha"
+        android:color="?attr/colorForeground"/>
+    <item android:alpha="?attr/secondaryContentAlpha"
+        android:color="?attr/colorForeground"/>
+</selector>
diff --git a/data/res/drawable-nodpi/platlogo.xml b/data/res/drawable-nodpi/platlogo.xml
index 516f252..182ba24 100644
--- a/data/res/drawable-nodpi/platlogo.xml
+++ b/data/res/drawable-nodpi/platlogo.xml
@@ -1,5 +1,5 @@
 <!--
-Copyright (C) 2016 The Android Open Source Project
+Copyright (C) 2017 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.
@@ -14,24 +14,27 @@
     limitations under the License.
 -->
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-        android:width="512dp"
-        android:height="512dp"
+        android:width="480dp"
+        android:height="480dp"
         android:viewportWidth="48.0"
         android:viewportHeight="48.0">
     <path
-        android:fillColor="#FFc7d4b6"
-        android:pathData="M32.0,12.5l0.0,28.0l12.0,-5.0l0.0,-28.0z"/>
+        android:pathData="M25.0,25.0m-20.5,0.0a20.5,20.5,0,1,1,41.0,0.0a20.5,20.5,0,1,1,-41.0,0.0"
+        android:fillAlpha="0.066"
+        android:fillColor="#000000"/>
     <path
-        android:fillColor="#FFfbd3cb"
-        android:pathData="M4.0,40.5l12.0,-5.0l0.0,-11.0l-12.0,-12.0z"/>
+        android:pathData="M24.0,24.0m-20.0,0.0a20.0,20.0,0,1,1,40.0,0.0a20.0,20.0,0,1,1,-40.0,0.0"
+        android:fillColor="#FFC107"/>
     <path
-        android:fillColor="#40000000"
-        android:pathData="M44.0,35.5l-12.0,-12.0l0.0,-4.0z"/>
+        android:pathData="M44,24.2010101 L33.9004889,14.101499 L14.101499,33.9004889 L24.2010101,44 C29.2525804,43.9497929 34.2887564,41.9975027 38.1431296,38.1431296 C41.9975027,34.2887564 43.9497929,29.2525804 44,24.2010101 Z"
+        android:fillColor="#FE9F00"/>
     <path
-        android:fillColor="#40000000"
-        android:pathData="M4.0,12.5l12.0,12.0l0.0,4.0z"/>
+        android:pathData="M24.0,24.0m-14.0,0.0a14.0,14.0,0,1,1,28.0,0.0a14.0,14.0,0,1,1,-28.0,0.0"
+        android:fillColor="#FED44F"/>
     <path
-        android:fillColor="#FFe0e0d6"
-        android:pathData="M32.0,23.5l-16.0,-16.0l-12.0,5.0l0.0,0.0l12.0,12.0l16.0,16.0l12.0,-5.0l0.0,0.0z"/>
+        android:pathData="M37.7829445,26.469236 L29.6578482,18.3441397 L18.3441397,29.6578482 L26.469236,37.7829445 C29.1911841,37.2979273 31.7972024,36.0037754 33.9004889,33.9004889 C36.0037754,31.7972024 37.2979273,29.1911841 37.7829445,26.469236 Z"
+        android:fillColor="#FFC107"/>
+    <path
+        android:pathData="M24.0,24.0m-8.0,0.0a8.0,8.0,0,1,1,16.0,0.0a8.0,8.0,0,1,1,-16.0,0.0"
+        android:fillColor="#FFFFFF"/>
 </vector>
-
diff --git a/data/res/drawable-nodpi/stat_sys_adb.xml b/data/res/drawable-nodpi/stat_sys_adb.xml
index 5043cba..89e42e6 100644
--- a/data/res/drawable-nodpi/stat_sys_adb.xml
+++ b/data/res/drawable-nodpi/stat_sys_adb.xml
@@ -1,5 +1,5 @@
 <!--
-Copyright (C) 2016 The Android Open Source Project
+Copyright (C) 2017 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.
@@ -16,21 +16,17 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
         android:width="24dp"
         android:height="24dp"
-        android:viewportWidth="48.0"
-        android:viewportHeight="48.0">
+        android:viewportWidth="24.0"
+        android:viewportHeight="24.0">
     <path
-        android:fillColor="#A0FFFFFF"
-        android:pathData="M32.0,12.5l0.0,28.0l12.0,-5.0l0.0,-28.0z"/>
+        android:fillColor="#FF000000"
+        android:pathData="M12.0,12.0m-10.0,0.0a10.0,10.0,0,1,1,20.0,0.0a10.0,10.0,0,1,1,-20.0,0.0"
+        android:fillAlpha="0.25"/>
     <path
-        android:fillColor="#A0FFFFFF"
-        android:pathData="M4.0,40.5l12.0,-5.0l0.0,-11.0l-12.0,-12.0z"/>
+        android:fillColor="#FF000000"
+        android:pathData="M12,22 C6.4771525,22 2,17.5228475 2,12 C2,6.4771525 6.4771525,2 12,2 C17.5228475,2 22,6.4771525 22,12 C22,17.5228475 17.5228475,22 12,22 Z M12,18.5 C15.5898509,18.5 18.5,15.5898509 18.5,12 C18.5,8.41014913 15.5898509,5.5 12,5.5 C8.41014913,5.5 5.5,8.41014913 5.5,12 C5.5,15.5898509 8.41014913,18.5 12,18.5 Z"/>
     <path
-        android:fillColor="#40000000"
-        android:pathData="M44.0,35.5l-12.0,-12.0l0.0,-4.0z"/>
-    <path
-        android:fillColor="#40000000"
-        android:pathData="M4.0,12.5l12.0,12.0l0.0,4.0z"/>
-    <path
-        android:fillColor="#FFFFFFFF"
-        android:pathData="M32.0,23.5l-16.0,-16.0l-12.0,5.0l0.0,0.0l12.0,12.0l16.0,16.0l12.0,-5.0l0.0,0.0z"/>
+        android:fillColor="#FF000000"
+        android:pathData="M12,18.5 C8.41014913,18.5 5.5,15.5898509 5.5,12 C5.5,8.41014913 8.41014913,5.5 12,5.5 C15.5898509,5.5 18.5,8.41014913 18.5,12 C18.5,15.5898509 15.5898509,18.5 12,18.5 Z M12,15 C13.6568542,15 15,13.6568542 15,12 C15,10.3431458 13.6568542,9 12,9 C10.3431458,9 9,10.3431458 9,12 C9,13.6568542 10.3431458,15 12,15 Z"
+        android:fillAlpha="0.25"/>
 </vector>
diff --git a/data/res/drawable/ic_signal_wifi_badged_0_bars.xml b/data/res/drawable/ic_signal_wifi_badged_0_bars.xml
index bd1eb41..606b686 100644
--- a/data/res/drawable/ic_signal_wifi_badged_0_bars.xml
+++ b/data/res/drawable/ic_signal_wifi_badged_0_bars.xml
@@ -13,11 +13,11 @@
      See the License for the specific language governing permissions and
      limitations under the License.
 -->
-<vector xmlns:api24="http://schemas.android.com/apk/res/android" xmlns:android="http://schemas.android.com/apk/res/android"
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
     android:viewportWidth="18"
     android:viewportHeight="18"
-    android:width="18dp"
-    android:height="18dp">
+    android:width="26dp"
+    android:height="24dp">
     <group
         android:translateX="386"
         android:translateY="-298">
diff --git a/data/res/drawable/ic_signal_wifi_badged_1_bar.xml b/data/res/drawable/ic_signal_wifi_badged_1_bar.xml
index aedb12c..a4c5bc2 100644
--- a/data/res/drawable/ic_signal_wifi_badged_1_bar.xml
+++ b/data/res/drawable/ic_signal_wifi_badged_1_bar.xml
@@ -13,11 +13,11 @@
      See the License for the specific language governing permissions and
      limitations under the License.
 -->
-<vector xmlns:api24="http://schemas.android.com/apk/res/android" xmlns:android="http://schemas.android.com/apk/res/android"
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
     android:viewportWidth="18"
     android:viewportHeight="18"
-    android:width="18dp"
-    android:height="18dp">
+    android:width="26dp"
+    android:height="24dp">
     <group
         android:translateX="386"
         android:translateY="-298">
diff --git a/data/res/drawable/ic_signal_wifi_badged_2_bars.xml b/data/res/drawable/ic_signal_wifi_badged_2_bars.xml
index 6f07cb5..9c27833 100644
--- a/data/res/drawable/ic_signal_wifi_badged_2_bars.xml
+++ b/data/res/drawable/ic_signal_wifi_badged_2_bars.xml
@@ -13,11 +13,11 @@
      See the License for the specific language governing permissions and
      limitations under the License.
 -->
-<vector xmlns:api24="http://schemas.android.com/apk/res/android" xmlns:android="http://schemas.android.com/apk/res/android"
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
     android:viewportWidth="18"
     android:viewportHeight="18"
-    android:width="18dp"
-    android:height="18dp">
+    android:width="26dp"
+    android:height="24dp">
     <group
         android:translateX="386"
         android:translateY="-298">
diff --git a/data/res/drawable/ic_signal_wifi_badged_3_bars.xml b/data/res/drawable/ic_signal_wifi_badged_3_bars.xml
index c41a8ca..6d693f1 100644
--- a/data/res/drawable/ic_signal_wifi_badged_3_bars.xml
+++ b/data/res/drawable/ic_signal_wifi_badged_3_bars.xml
@@ -13,11 +13,11 @@
      See the License for the specific language governing permissions and
      limitations under the License.
 -->
-<vector xmlns:api24="http://schemas.android.com/apk/res/android" xmlns:android="http://schemas.android.com/apk/res/android"
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
     android:viewportWidth="18"
     android:viewportHeight="18"
-    android:width="18dp"
-    android:height="18dp">
+    android:width="26dp"
+    android:height="24dp">
     <group
         android:translateX="386"
         android:translateY="-298">
diff --git a/data/res/drawable/ic_signal_wifi_badged_4_bars.xml b/data/res/drawable/ic_signal_wifi_badged_4_bars.xml
index ec0a52f..c48fa36 100644
--- a/data/res/drawable/ic_signal_wifi_badged_4_bars.xml
+++ b/data/res/drawable/ic_signal_wifi_badged_4_bars.xml
@@ -13,11 +13,11 @@
      See the License for the specific language governing permissions and
      limitations under the License.
 -->
-<vector xmlns:api24="http://schemas.android.com/apk/res/android" xmlns:android="http://schemas.android.com/apk/res/android"
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
     android:viewportWidth="18"
     android:viewportHeight="18"
-    android:width="18dp"
-    android:height="18dp">
+    android:width="26dp"
+    android:height="24dp">
     <group
         android:translateX="386"
         android:translateY="-298">
diff --git a/data/res/drawable/ic_signal_wifi_badged_4k.xml b/data/res/drawable/ic_signal_wifi_badged_4k.xml
index 78bd0a0..0868845 100644
--- a/data/res/drawable/ic_signal_wifi_badged_4k.xml
+++ b/data/res/drawable/ic_signal_wifi_badged_4k.xml
@@ -13,11 +13,11 @@
      See the License for the specific language governing permissions and
      limitations under the License.
 -->
-<vector xmlns:api24="http://schemas.android.com/apk/res/android" xmlns:android="http://schemas.android.com/apk/res/android"
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
     android:viewportWidth="18"
     android:viewportHeight="18"
-    android:width="18dp"
-    android:height="18dp">
+    android:width="26dp"
+    android:height="24dp">
     <group
         android:translateX="386"
         android:translateY="-298">
diff --git a/data/res/drawable/ic_signal_wifi_badged_hd.xml b/data/res/drawable/ic_signal_wifi_badged_hd.xml
index 78085c2..657f5ed 100644
--- a/data/res/drawable/ic_signal_wifi_badged_hd.xml
+++ b/data/res/drawable/ic_signal_wifi_badged_hd.xml
@@ -13,11 +13,11 @@
      See the License for the specific language governing permissions and
      limitations under the License.
 -->
-<vector xmlns:api24="http://schemas.android.com/apk/res/android" xmlns:android="http://schemas.android.com/apk/res/android"
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
     android:viewportWidth="18"
     android:viewportHeight="18"
-    android:width="18dp"
-    android:height="18dp">
+    android:width="26dp"
+    android:height="24dp">
     <group
         android:translateX="386"
         android:translateY="-298">
diff --git a/data/res/drawable/ic_signal_wifi_badged_ld.xml b/data/res/drawable/ic_signal_wifi_badged_ld.xml
index f660ab7..e2971aa 100644
--- a/data/res/drawable/ic_signal_wifi_badged_ld.xml
+++ b/data/res/drawable/ic_signal_wifi_badged_ld.xml
@@ -13,11 +13,11 @@
      See the License for the specific language governing permissions and
      limitations under the License.
 -->
-<vector xmlns:api24="http://schemas.android.com/apk/res/android" xmlns:android="http://schemas.android.com/apk/res/android"
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
     android:viewportWidth="18"
     android:viewportHeight="18"
-    android:width="18dp"
-    android:height="18dp">
+    android:width="26dp"
+    android:height="24dp">
     <group
         android:translateX="386"
         android:translateY="-298">
diff --git a/data/res/drawable/ic_signal_wifi_badged_sd.xml b/data/res/drawable/ic_signal_wifi_badged_sd.xml
index 43b8653..b073be3 100644
--- a/data/res/drawable/ic_signal_wifi_badged_sd.xml
+++ b/data/res/drawable/ic_signal_wifi_badged_sd.xml
@@ -13,11 +13,11 @@
      See the License for the specific language governing permissions and
      limitations under the License.
 -->
-<vector xmlns:api24="http://schemas.android.com/apk/res/android" xmlns:android="http://schemas.android.com/apk/res/android"
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
     android:viewportWidth="18"
     android:viewportHeight="18"
-    android:width="18dp"
-    android:height="18dp">
+    android:width="26dp"
+    android:height="24dp">
     <group
         android:translateX="386"
         android:translateY="-298">
diff --git a/data/res/drawable/ic_wifi_signal_0.xml b/data/res/drawable/ic_wifi_signal_0.xml
new file mode 100644
index 0000000..e732a8d
--- /dev/null
+++ b/data/res/drawable/ic_wifi_signal_0.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+    Copyright (C) 2015 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.
+-->
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+  android:width="26dp"
+  android:height="24dp"
+  android:viewportWidth="26"
+  android:viewportHeight="24">
+  <path
+    android:fillAlpha="0.3"
+    android:fillColor="#FFFFFF"
+    android:pathData="M13.0,22.0L25.6,6.5C25.1,6.1 20.3,2.1 13.0,2.1S0.9,6.1 0.4,6.5L13.0,22.0L13.0,22.0L13.0,22.0L13.0,22.0L13.0,22.0z"/>
+</vector>
\ No newline at end of file
diff --git a/data/res/drawable/ic_wifi_signal_1.xml b/data/res/drawable/ic_wifi_signal_1.xml
new file mode 100644
index 0000000..3d00695
--- /dev/null
+++ b/data/res/drawable/ic_wifi_signal_1.xml
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+    Copyright (C) 2015 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.
+-->
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="26dp"
+    android:height="24dp"
+    android:viewportWidth="26"
+    android:viewportHeight="24">
+    <path
+        android:fillAlpha="0.3"
+        android:fillColor="#FFFFFF"
+        android:pathData="M13.1,22.0L25.6,6.5C25.1,6.1 20.3,2.1 13.0,2.1S0.9,6.1 0.5,6.5L13.1,22.0L13.1,22.0L13.1,22.0L13.1,22.0L13.1,22.0z"/>
+    <path
+        android:fillColor="#FFFFFF"
+        android:pathData="M13.1,22.0l5.5,-6.8c-0.2,-0.2 -2.3,-1.9 -5.5,-1.9s-5.3,1.8 -5.5,1.9L13.1,22.0L13.1,22.0L13.1,22.0L13.1,22.0L13.1,22.0z"/>
+</vector>
diff --git a/data/res/drawable/ic_wifi_signal_2.xml b/data/res/drawable/ic_wifi_signal_2.xml
new file mode 100644
index 0000000..2cce9e9
--- /dev/null
+++ b/data/res/drawable/ic_wifi_signal_2.xml
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+    Copyright (C) 2015 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.
+-->
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="26dp"
+    android:height="24dp"
+    android:viewportWidth="26"
+    android:viewportHeight="24">
+    <path
+        android:fillAlpha="0.3"
+        android:fillColor="#FFFFFF"
+        android:pathData="M13.0,22.0L25.6,6.5C25.1,6.1 20.3,2.1 13.0,2.1S0.9,6.1 0.4,6.5L13.0,22.0L13.0,22.0L13.0,22.0L13.0,22.0L13.0,22.0z"/>
+    <path
+        android:fillColor="#FFFFFF"
+        android:pathData="M13.0,22.0l7.6,-9.4C20.3,12.4 17.4,10.0 13.0,10.0s-7.3,2.4 -7.6,2.7L13.0,22.0L13.0,22.0L13.0,22.0L13.0,22.0L13.0,22.0z"/>
+</vector>
diff --git a/data/res/drawable/ic_wifi_signal_3.xml b/data/res/drawable/ic_wifi_signal_3.xml
new file mode 100644
index 0000000..d3b3d3a
--- /dev/null
+++ b/data/res/drawable/ic_wifi_signal_3.xml
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+    Copyright (C) 2015 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.
+-->
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="26dp"
+    android:height="24dp"
+    android:viewportWidth="26"
+    android:viewportHeight="24">
+    <path
+        android:fillAlpha="0.3"
+        android:fillColor="#FFFFFF"
+        android:pathData="M13.0,22.0L25.6,6.5C25.1,6.1 20.3,2.1 13.0,2.1S0.9,6.1 0.4,6.5L13.0,22.0L13.0,22.0L13.0,22.0L13.0,22.0L13.0,22.0z"/>
+    <path
+        android:fillColor="#FFFFFF"
+        android:pathData="M13.0,22.0l9.2,-11.4c-0.4,-0.3 -3.9,-3.2 -9.2,-3.2s-8.9,3.0 -9.2,3.2L13.0,22.0L13.0,22.0L13.0,22.0L13.0,22.0L13.0,22.0z"/>
+</vector>
diff --git a/data/res/drawable/ic_wifi_signal_4.xml b/data/res/drawable/ic_wifi_signal_4.xml
new file mode 100644
index 0000000..aca4551
--- /dev/null
+++ b/data/res/drawable/ic_wifi_signal_4.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+    Copyright (C) 2015 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.
+-->
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="26dp"
+    android:height="24dp"
+    android:viewportWidth="26"
+    android:viewportHeight="24">
+    <path
+        android:fillColor="#FFFFFF"
+        android:pathData="M13.0,22.0L25.6,6.5C25.1,6.1 20.3,2.1 13.0,2.1S0.9,6.1 0.4,6.5L13.0,22.0L13.0,22.0L13.0,22.0L13.0,22.0L13.0,22.0z"/>
+</vector>
diff --git a/data/res/layout/autofill_save.xml b/data/res/layout/autofill_save.xml
new file mode 100644
index 0000000..d55a012
--- /dev/null
+++ b/data/res/layout/autofill_save.xml
@@ -0,0 +1,57 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2017 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.
+-->
+
+<!-- TODO(b/33197203) remove hardcoded color once color is final -->
+<RelativeLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:paddingStart="16dip"
+    android:paddingEnd="16dip"
+    android:paddingTop="16dip"
+    android:paddingBottom="16dip"
+    android:background="#FDF8C8">
+
+  <!-- TODO(b/33197203) use.R.string once final wording is done -->
+  <TextView
+      android:id="@+id/autofill_save_title"
+      android:layout_width="match_parent"
+      android:layout_height="wrap_content"
+      android:text="Save for autofill?"
+      android:singleLine="true"/>
+
+  <TextView
+      android:id="@+id/autofill_save_no"
+      android:layout_width="wrap_content"
+      android:layout_height="wrap_content"
+      android:layout_below="@+id/autofill_save_title"
+      android:layout_toLeftOf="@+id/autofill_save_yes"
+      android:layout_marginRight="16dip"
+      android:text="No thanks"
+      android:textAllCaps="true"
+      android:singleLine="true"/>
+
+    <TextView
+      android:id="@+id/autofill_save_yes"
+      android:layout_width="wrap_content"
+      android:layout_height="wrap_content"
+      android:layout_below="@+id/autofill_save_title"
+      android:layout_alignParentRight="true"
+      android:text="Save"
+      android:textAllCaps="true"
+      android:singleLine="true"/>
+
+</RelativeLayout>
diff --git a/data/res/layout/notification_template_header.xml b/data/res/layout/notification_template_header.xml
index 1f71a18..0dfeb62 100644
--- a/data/res/layout/notification_template_header.xml
+++ b/data/res/layout/notification_template_header.xml
@@ -20,10 +20,11 @@
     android:id="@+id/notification_header"
     android:orientation="horizontal"
     android:layout_width="wrap_content"
-    android:layout_height="53dp"
+    android:layout_height="48dp"
     android:clipChildren="false"
     android:paddingTop="10dp"
-    android:paddingBottom="16dp"
+    android:paddingBottom="11dp"
+    android:layout_marginBottom="5dp"
     android:paddingStart="@dimen/notification_content_margin_start"
     android:paddingEnd="16dp">
     <com.android.internal.widget.CachingIconView
diff --git a/data/res/layout/notification_template_material_ambient.xml b/data/res/layout/notification_template_material_ambient.xml
index 1ae317c..e2c68b5 100644
--- a/data/res/layout/notification_template_material_ambient.xml
+++ b/data/res/layout/notification_template_material_ambient.xml
@@ -52,19 +52,18 @@
                 android:ellipsize="marquee"
                 android:fadingEdge="horizontal"
                 android:textSize="20sp"
-                android:textColor="@android:color/white"
+                android:textColor="#e6fafafa"
             />
             <TextView android:id="@+id/text"
                 android:layout_width="match_parent"
                 android:layout_height="0dp"
-                android:paddingBottom="@dimen/notification_content_margin_bottom"
                 android:textAppearance="@style/TextAppearance.Material.Notification"
                 android:singleLine="false"
                 android:layout_weight="1"
                 android:gravity="top"
                 android:visibility="gone"
-                android:textSize="18sp"
-                android:textColor="@android:color/white"
+                android:textSize="16sp"
+                android:textColor="#ccfafafa"
                 android:layout_marginTop="4dp"
             />
         </LinearLayout>
diff --git a/data/res/layout/search_view.xml b/data/res/layout/search_view.xml
index 72588c7..0c462fd 100644
--- a/data/res/layout/search_view.xml
+++ b/data/res/layout/search_view.xml
@@ -43,7 +43,8 @@
         android:layout_height="match_parent"
         android:layout_gravity="center_vertical"
         android:focusable="true"
-        android:contentDescription="@string/searchview_description_search" />
+        android:contentDescription="@string/searchview_description_search"
+        android:tooltipText="@string/searchview_description_search" />
 
     <LinearLayout
         android:id="@+id/search_edit_frame"
diff --git a/data/res/values-mcc214-mnc01/config.xml b/data/res/values-mcc214-mnc01/config.xml
index 895b770..24150a7 100644
--- a/data/res/values-mcc214-mnc01/config.xml
+++ b/data/res/values-mcc214-mnc01/config.xml
@@ -40,27 +40,4 @@
       <item>INTERNET,airtelnet.es,,,vodafone,vodafone,,,,,214,01,1,DUN</item>
     </string-array>
 
-    <string-array translatable="false" name="config_operatorConsideredNonRoaming">
-        <item>21402</item>
-        <item>21403</item>
-        <item>21404</item>
-        <item>21405</item>
-        <item>21406</item>
-        <item>21407</item>
-        <item>21408</item>
-        <item>21409</item>
-        <item>21410</item>
-        <item>21411</item>
-        <item>21412</item>
-        <item>21413</item>
-        <item>21414</item>
-        <item>21415</item>
-        <item>21416</item>
-        <item>21417</item>
-        <item>21418</item>
-        <item>21419</item>
-        <item>21420</item>
-        <item>21421</item>
-    </string-array>
-
 </resources>
diff --git a/data/res/values-mcc334-mnc050/config.xml b/data/res/values-mcc334-mnc050/config.xml
index f6777d0..616a8e8 100644
--- a/data/res/values-mcc334-mnc050/config.xml
+++ b/data/res/values-mcc334-mnc050/config.xml
@@ -40,4 +40,8 @@
       <item>Modem,modem.iusacellgsm.mx,,,iusacellgsm,iusacellgsm,,,,,334,050,1,DUN</item>
     </string-array>
 
+    <!-- Do not translate. Defines the slots is Two Digit Number for dialing normally not USSD -->
+    <string-array translatable="false" name="config_twoDigitNumberPattern">
+        <item>"#9"</item>
+    </string-array>
 </resources>
diff --git a/data/res/values-mcc334-mnc090/config.xml b/data/res/values-mcc334-mnc090/config.xml
new file mode 100644
index 0000000..1632a42
--- /dev/null
+++ b/data/res/values-mcc334-mnc090/config.xml
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+/*
+** Copyright 2017, 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 my 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.
+*/
+-->
+
+<!-- These resources are around just to allow their values to be customized
+     for different hardware and product builds. -->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <!-- Do not translate. Defines the slots is Two Digit Number for dialing normally not USSD -->
+
+    <string-array translatable="false" name="config_twoDigitNumberPattern">
+        <item>"#9"</item>
+    </string-array>
+</resources>
diff --git a/data/res/values/attrs.xml b/data/res/values/attrs.xml
index a401314..34f78f3 100644
--- a/data/res/values/attrs.xml
+++ b/data/res/values/attrs.xml
@@ -64,6 +64,8 @@
         <attr name="disabledAlpha" format="float" />
         <!-- The alpha applied to the foreground color to create the primary text color. -->
         <attr name="primaryContentAlpha" format="float" />
+        <!-- The alpha applied to the foreground color to create the secondary text color. -->
+        <attr name="secondaryContentAlpha" format="float" />
         <!-- Default background dim amount when a menu, dialog, or something similar pops up. -->
         <attr name="backgroundDimAmount" format="float" />
         <!-- Control whether dimming behind the window is enabled.  The default
@@ -2274,13 +2276,16 @@
         <!-- Sets the padding, in pixels, of the end edge; see {@link android.R.attr#padding}. -->
         <attr name="paddingEnd" format="dimension" />
 
-        <!-- Boolean that controls whether a view can take focus.  By default the user can not
-             move focus to a view; by setting this attribute to true the view is
-             allowed to take focus.  This value does not impact the behavior of
+        <!-- Controls whether a view can take focus.  By default, this is "auto" which lets the
+             framework determine whether a user can move focus to a view.  By setting this attribute
+             to true the view is allowed to take focus. By setting it to "false" the view will not
+             take focus. This value does not impact the behavior of
              directly calling {@link android.view.View#requestFocus}, which will
              always request focus regardless of this view.  It only impacts where
              focus navigation will try to move focus. -->
-        <attr name="focusable" format="boolean" />
+        <attr name="focusable" format="boolean|enum">
+            <enum name="auto" value="0x00000010" />
+        </attr>
 
         <!-- Boolean that controls whether a view can take focus while in touch mode.
              If this is true for a view, that view can gain focus when clicked on, and can keep
@@ -2497,13 +2502,13 @@
         <!-- Sets the id of a view before which this one is visited in accessibility traversal.
              A screen-reader must visit the content of this view before the content of the one
              it precedes.
-             @see android.view.View#setAccessibilityTraversalBefore(int)} -->
+             {@see android.view.View#setAccessibilityTraversalBefore(int)} -->
         <attr name="accessibilityTraversalBefore" format="integer" />
 
         <!-- Sets the id of a view after which this one is visited in accessibility traversal.
              A screen-reader must visit the content of the other view before the content of
              this one.
-             @see android.view.View#setAccessibilityTraversalAfter(int)} -->
+             {@see android.view.View#setAccessibilityTraversalAfter(int)} -->
         <attr name="accessibilityTraversalAfter" format="integer" />
 
         <!-- Name of the method in this View's context to invoke when the view is
@@ -2896,9 +2901,7 @@
              See {@link android.view.View#setKeyboardNavigationCluster(boolean)}. -->
         <attr name="keyboardNavigationCluster" format="boolean" />
 
-        <!-- Whether this view is a root of a keyboard navigation section.
-             See {@link android.view.View#setKeyboardNavigationSection(boolean)}. -->
-        <attr name="keyboardNavigationSection" format="boolean" />
+        <attr name="__removed0" format="boolean" />
 
         <!-- Defines the next keyboard navigation cluster.
 
@@ -2907,12 +2910,7 @@
              will result when the reference is accessed.-->
         <attr name="nextClusterForward" format="reference"/>
 
-        <!-- Defines the next keyboard navigation section.
-
-             If the reference refers to a view that does not exist or is part
-             of a hierarchy that is invisible, a {@link java.lang.RuntimeException}
-             will result when the reference is accessed.-->
-        <attr name="nextSectionForward" format="reference"/>
+        <attr name="__removed1" format="reference"/>
 
         <!-- Whether this view is a default-focus view.
              Only one view per keyboard navigation cluster can have this attribute set to true.
@@ -3270,8 +3268,8 @@
         <!-- The unique id for the subtype. The text service (spell checker) framework keeps track
              of enabled subtypes by ID. When the spell checker package gets upgraded, enabled IDs
              will stay enabled even if other attributes are different. If the ID is unspecified or
-             or explicitly specified to 0 in XML resources,
-             {@code Arrays.hashCode(new Object[] {subtypeLocale, extraValue}) will be used instead.
+             explicitly specified to 0 in XML resources,
+             {@code Arrays.hashCode(new Object[] {subtypeLocale, extraValue})} will be used instead.
               -->
         <attr name="subtypeId" />
         <!-- The BCP-47 Language Tag of the subtype.  This replaces
@@ -4707,7 +4705,8 @@
             screens with limited space for text. -->
             <enum name="full" value="2" />
         </attr>
-        <!-- Specify the type of auto-size. -->
+        <!-- Specify the type of auto-size. Note that this feature is not supported by EditText,
+        works only for TextView -->
         <attr name="autoSizeText" format="enum">
             <!-- No auto-sizing (default). -->
             <enum name="none" value="0" />
@@ -5842,6 +5841,14 @@
         <attr name="color" />
     </declare-styleable>
 
+    <!-- Drawable used to draw masked icons with foreground and background layers. -->
+    <declare-styleable name="MaskableIconDrawableLayer">
+        <!-- The color to use for the layer, only if drawable is not defined. -->
+        <attr name="color" />
+        <!-- The drawable to use for the layer. -->
+        <attr name="drawable" />
+     </declare-styleable>
+
     <!-- Drawable used to show animated touch feedback. -->
     <declare-styleable name="RippleDrawable">
         <!-- The color to use for ripple effects. This attribute is required. -->
@@ -7918,7 +7925,6 @@
         <attr name="queryBackground" format="reference" />
         <!-- Background for the section containing the action (e.g. voice search) -->
         <attr name="submitBackground" format="reference" />
-        <attr name="focusable" />
     </declare-styleable>
 
     <declare-styleable name="Switch">
@@ -8476,4 +8482,14 @@
         <attr name="font" format="reference" />
         <attr name="fontWeight" format="integer" />
     </declare-styleable>
+
+    <!-- @hide -->
+    <declare-styleable name="RecyclerView">
+        <attr name="layoutManager" format="string" />
+        <attr name="orientation" />
+        <attr name="descendantFocusability" />
+        <attr name="spanCount" format="integer"/>
+        <attr name="reverseLayout" format="boolean" />
+        <attr name="stackFromEnd" format="boolean" />
+    </declare-styleable>
 </resources>
diff --git a/data/res/values/attrs_manifest.xml b/data/res/values/attrs_manifest.xml
index 5235116..82e33f8 100644
--- a/data/res/values/attrs_manifest.xml
+++ b/data/res/values/attrs_manifest.xml
@@ -864,9 +864,8 @@
         <flag name="density" value="0x1000" />
         <!-- The layout direction has changed. For example going from LTR to RTL. -->
         <flag name="layoutDirection" value="0x2000" />
-        <!-- The colorimetry capabilities of the screen have changed (color gamut
-             or dynamic range). -->
-        <flag name="colorimetry" value="0x4000" />
+        <!-- The color mode of the screen has changed (color gamut or dynamic range). -->
+        <flag name="colorMode" value="0x4000" />
         <!-- The font scaling factor has changed, that is the user has
              selected a new global font size. -->
         <flag name="fontScale" value="0x40000000" />
@@ -1002,6 +1001,13 @@
         <enum name="preferExternal" value="2" />
     </attr>
 
+    <!-- If set to <code>true</code>, indicates to the platform that any split APKs
+         installed for this application should be loaded into their own Context
+         objects and not appear in the base application's Context.
+
+         <p>The default value of this attribute is <code>false</code>. -->
+    <attr name="isolatedSplits" format="boolean" />
+
     <!-- Extra options for an activity's UI. Applies to either the {@code <activity>} or
          {@code <application>} tag. If specified on the {@code <application>}
          tag these will be considered defaults for all activities in the
@@ -1159,18 +1165,15 @@
          resizeable activities when in multi-window mode. -->
     <attr name="resizeableActivity" format="boolean" />
 
-    <!-- Indicates that the activity supports the picture-in-picture (PiP) form of multi-window.
-         While it makes sense to be able to resize most activities types in multi-window mode when
-         {@link android.R.attr#resizeableActivity} is set. It only makes sense to put specific types
-         of activities in PiP mode of multi-window. For example, activities that play video. When
-         set the activity will be allowed to enter PiP mode when the system deems it appropriate on
-         devices that support PiP.
+    <!-- Indicates that the activity specifically supports the picture-in-picture form of
+         multi-window. If true, this activity will support entering picture-in-picture, but will
+         only support split-screen and other forms of multi-window if
+         {@link android.R.attr#resizeableActivity} is also set to true.
 
-         <p>The default value is <code>false</code> for applications with
-         <code>targetSdkVersion</code> lesser than {@link android.os.Build.VERSION_CODES#N} and
-         <code>true</code> otherwise.
+         Note that your activity may still be resized even if this attribute is true and
+         {@link android.R.attr#resizeableActivity} is false.
 
-         <p>NOTE: Attribute is only used if {@link android.R.attr#resizeableActivity} is true. -->
+         <p>The default value is <code>false</code>.  -->
     <attr name="supportsPictureInPicture" format="boolean" />
 
     <!-- This value indicates how tasks rooted at this activity will behave in lockTask mode.
@@ -1240,6 +1243,10 @@
     <!-- An XML resource with the application's Network Security Config. -->
     <attr name="networkSecurityConfig" format="reference" />
 
+    <!-- When an application is partitioned into splits, this is the name of the
+         split that contains the defined component. -->
+    <attr name="splitName" format="string" />
+
     <!-- The <code>manifest</code> tag is the root of an
          <code>AndroidManifest.xml</code> file,
          describing the contents of an Android package (.apk) file.  One
@@ -1266,6 +1273,7 @@
         <attr name="sharedUserId" />
         <attr name="sharedUserLabel" />
         <attr name="installLocation" />
+        <attr name="isolatedSplits" />
     </declare-styleable>
 
     <!-- The <code>application</code> tag describes application-level components
@@ -1823,6 +1831,8 @@
         <attr name="singleUser" />
         <attr name="directBootAware" />
         <attr name="visibleToInstantApps" />
+        <!-- The code for this component is located in the given split. -->
+        <attr name="splitName" />
     </declare-styleable>
 
     <!-- Attributes that can be supplied in an AndroidManifest.xml
@@ -1913,6 +1923,8 @@
              must also be {@link android.R.attr#exported} if this flag is set. -->
         <attr name="externalService" format="boolean" />
         <attr name="visibleToInstantApps" />
+        <!-- The code for this component is located in the given split. -->
+        <attr name="splitName" />
     </declare-styleable>
 
     <!-- The <code>receiver</code> tag declares an
@@ -2036,6 +2048,18 @@
         <attr name="onTopLauncher" format="boolean" />
         <attr name="rotationAnimation" />
         <attr name="visibleToInstantApps" />
+        <!-- The code for this component is located in the given split. -->
+        <attr name="splitName" />
+        <!-- Specify the color mode the activity desires. The requested color mode may be ignored
+             depending on the capabilities of the display the activity is displayed on. -->
+        <attr name="colorMode">
+            <!-- The default color mode (typically sRGB, low-dynamic range). -->
+            <enum name="default" value="0" />
+            <!-- Wide color gamut color mode. -->
+            <enum name="wideColorGamut" value="1" />
+            <!-- High dynamic range color mode. -->
+            <enum name="hdr" value="2" />
+        </attr>
     </declare-styleable>
 
     <!-- The <code>activity-alias</code> tag declares a new
@@ -2349,7 +2373,7 @@
     </declare-styleable>
 
     <!-- Declaration of an {@link android.content.Intent} object in XML.  May
-         also include zero or more {@link #IntentCategory <category> and
+         also include zero or more {@link #IntentCategory <category>} and
          {@link #Extra <extra>} tags. -->
     <declare-styleable name="Intent">
         <!-- The action name to assign to the Intent, as per
@@ -2446,4 +2470,8 @@
         <attr name="hash" format="string" />
     </declare-styleable>
 
+    <declare-styleable name="AndroidManifestUsesSplit" parent="AndroidManifest">
+        <attr name="name" format="string" />
+    </declare-styleable>
+
 </resources>
diff --git a/data/res/values/colors.xml b/data/res/values/colors.xml
index 4164e5d..b28c6f2 100644
--- a/data/res/values/colors.xml
+++ b/data/res/values/colors.xml
@@ -89,7 +89,7 @@
     <color name="perms_dangerous_perm_color">#33b5e5</color>
     <color name="shadow">#cc222222</color>
     <color name="perms_costs_money">#fff4511e</color>
-    
+
     <!-- For search-related UIs -->
     <color name="search_url_text_normal">#7fa87f</color>
     <color name="search_url_text_selected">@android:color/black</color>
@@ -132,6 +132,10 @@
     <drawable name="notification_template_icon_low_bg">#0cffffff</drawable>
     <drawable name="notification_template_divider">#29000000</drawable>
     <drawable name="notification_template_divider_media">#29ffffff</drawable>
+    <color name="notification_primary_text_color_light">@color/primary_text_default_material_light</color>
+    <color name="notification_primary_text_color_dark">@color/primary_text_default_material_dark</color>
+    <color name="notification_secondary_text_color_light">@color/secondary_text_material_light</color>
+    <color name="notification_secondary_text_color_dark">@color/secondary_text_material_dark</color>
 
     <color name="notification_material_background_color">#ffffffff</color>
 
diff --git a/data/res/values/colors_material.xml b/data/res/values/colors_material.xml
index db89c22..0a24565 100644
--- a/data/res/values/colors_material.xml
+++ b/data/res/values/colors_material.xml
@@ -78,6 +78,8 @@
     <item name="disabled_alpha_material_dark" format="float" type="dimen">0.30</item>
     <item name="primary_content_alpha_material_light" format="float" type="dimen">1</item>
     <item name="primary_content_alpha_material_dark" format="float" type="dimen">0.87</item>
+    <item name="secondary_content_alpha_material_light" format="float" type="dimen">.7</item>
+    <item name="secondary_content_alpha_material_dark" format="float" type="dimen">0.54</item>
 
     <item name="highlight_alpha_material_light" format="float" type="dimen">0.12</item>
     <item name="highlight_alpha_material_dark" format="float" type="dimen">0.20</item>
diff --git a/data/res/values/config.xml b/data/res/values/config.xml
index 7de48d3..9873762 100644
--- a/data/res/values/config.xml
+++ b/data/res/values/config.xml
@@ -2090,6 +2090,7 @@
         <item>com.android.server.notification.ImportanceExtractor</item>
         <item>com.android.server.notification.NotificationIntrusivenessExtractor</item>
         <item>com.android.server.notification.VisibilityExtractor</item>
+        <item>com.android.server.notification.BadgeExtractor</item>
     </string-array>
 
     <!-- Flag indicating that this device does not rotate and will always remain in its default
@@ -2277,6 +2278,13 @@
     <!-- Whether to use voip audio mode for ims call -->
     <bool name="config_use_voip_mode_for_ims">false</bool>
 
+    <!-- ImsService package name to bind to by default. If none is specified in an overlay, an
+         empty string is passed in -->
+    <string name="config_ims_package"/>
+
+    <!-- Flag specifying whether or not IMS will use the dynamic ImsResolver -->
+    <bool name="config_dynamic_bind_ims">true</bool>
+
     <bool name="config_networkSamplingWakesDevice">true</bool>
 
     <string-array translatable="false" name="config_cdma_home_system" />
@@ -2624,8 +2632,14 @@
     <!-- Component that is the default launcher when demo mode is enabled. -->
     <string name="config_demoModeLauncherComponent">com.android.retaildemo/.DemoPlayer</string>
 
-    <!-- Hashed password (SHA-256) used to restrict demo mode operation -->
-    <string name="config_demoModePassword" translatable="false"></string>
+    <!-- Hashed password (SHA-256) used to restrict carrier demo mode operation. -->
+    <string name="config_carrierDemoModePassword" translatable="false"></string>
+
+    <!-- Secure setting used to activate carrier demo mode. -->
+    <string name="config_carrierDemoModeSetting" translatable="false"></string>
+
+    <!-- List of packages to enable in carrier demo mode (comma separated). -->
+    <string name="config_carrierDemoModePackages" translatable="false"></string>
 
     <!-- Flag indicating whether round icons should be parsed from the application manifest. -->
     <bool name="config_useRoundIcon">false</bool>
@@ -2711,6 +2725,9 @@
     <!-- Component name of the default cell broadcast receiver -->
     <string name="config_defaultCellBroadcastReceiverComponent" translatable="false">com.android.cellbroadcastreceiver/.PrivilegedCellBroadcastReceiver</string>
 
+    <!-- Specifies the path that is used by MaskableIconDrawable class to crop launcher icons. -->
+    <string name="config_icon_mask" translatable="false">"M50,0L100,0 100,100 0,100 0,0z"</string>
+
     <!-- The component name, flattened to a string, for the default accessibility service to be
          enabled by the accessibility shortcut. This service must be trusted, as it can be activated
          without explicit consent of the user. If no accessibility service with the specified name
diff --git a/data/res/values/dimens.xml b/data/res/values/dimens.xml
index bd19521..4266f88 100644
--- a/data/res/values/dimens.xml
+++ b/data/res/values/dimens.xml
@@ -488,6 +488,9 @@
     <!-- The default minimal size of a resizable task, in both dimensions. -->
     <dimen name="default_minimal_size_resizable_task">220dp</dimen>
 
+    <!-- Height of a task when in minimized mode from the top when launcher is resizable. -->
+    <dimen name="task_height_of_minimized_mode">80dp</dimen>
+
     <!-- Minimum "smallest width" of the display for cascading menus to be enabled. -->
     <dimen name="cascading_menus_min_smallest_width">720dp</dimen>
 
@@ -509,4 +512,10 @@
     <dimen name="tooltip_precise_anchor_threshold">96dp</dimen>
     <!-- Extra tooltip offset used when anchoring to the mouse/touch position -->
     <dimen name="tooltip_precise_anchor_extra_offset">8dp</dimen>
+
+    <!-- The max amount of scroll ItemTouchHelper will trigger if dragged view is out of
+         RecyclerView's bounds.-->
+    <dimen name="item_touch_helper_max_drag_scroll_per_frame">20dp</dimen>
+    <dimen name="item_touch_helper_swipe_escape_velocity">120dp</dimen>
+    <dimen name="item_touch_helper_swipe_escape_max_velocity">800dp</dimen>
 </resources>
diff --git a/data/res/values/ids.xml b/data/res/values/ids.xml
index 5547706..613616f 100644
--- a/data/res/values/ids.xml
+++ b/data/res/values/ids.xml
@@ -97,6 +97,7 @@
   <item type="id" name="redo" />
   <item type="id" name="replaceText" />
   <item type="id" name="shareText" />
+  <item type="id" name="textAssist" />
   <item type="id" name="selection_start_handle" />
   <item type="id" name="selection_end_handle" />
   <item type="id" name="insertion_handle" />
@@ -131,4 +132,7 @@
   <item type="id" name="cross_task_transition" />
 
   <item type="id" name="accessibilityActionClickOnClickableSpan" />
+
+  <!-- ItemTouchHelper uses this id to save a View's original elevation. -->
+  <item type="id" name="item_touch_helper_previous_elevation"/>
 </resources>
diff --git a/data/res/values/public.xml b/data/res/values/public.xml
index 060c59e..f981029 100644
--- a/data/res/values/public.xml
+++ b/data/res/values/public.xml
@@ -2777,9 +2777,9 @@
         <public name="paddingVertical" />
         <public name="visibleToInstantApps" />
         <public name="keyboardNavigationCluster" />
-        <public name="keyboardNavigationSection" />
+        <public name="__removed0" />
         <public name="nextClusterForward" />
-        <public name="nextSectionForward" />
+        <public name="__removed1" />
         <public name="textColorError" />
         <public name="focusedByDefault" />
         <public name="appCategory" />
@@ -2787,15 +2787,20 @@
         <public name="supportsDismissingWindow" />
         <public name="restartOnConfigChanges" />
         <public name="certDigest" />
+        <public name="splitName" />
+        <public name="colorMode" />
+        <public name="isolatedSplits" />
     </public-group>
 
     <public-group type="style" first-id="0x010302e0">
     </public-group>
 
     <public-group type="id" first-id="0x01020041">
+        <public name="textAssist" />
     </public-group>
 
     <public type="attr" name="primaryContentAlpha" />
+    <public type="attr" name="secondaryContentAlpha" />
 
   <!-- ===============================================================
        DO NOT ADD UN-GROUPED ITEMS HERE
diff --git a/data/res/values/strings.xml b/data/res/values/strings.xml
index d09b190..ac8c896 100644
--- a/data/res/values/strings.xml
+++ b/data/res/values/strings.xml
@@ -578,6 +578,9 @@
     <!-- The divider symbol between different parts of the notification header. not translatable [CHAR LIMIT=1] -->
     <string name="notification_header_divider_symbol" translatable="false">•</string>
 
+    <!-- The divider symbol between different parts of the notification header including spaces. not translatable [CHAR LIMIT=3] -->
+    <string name="notification_header_divider_symbol_with_spaces" translatable="false">" • "</string>
+
     <!-- Text shown in place of notification contents when the notification is hidden on a secure lockscreen -->
     <string name="notification_hidden_text">Contents hidden</string>
 
@@ -2589,6 +2592,15 @@
     <!-- Title for EditText context menu [CHAR LIMIT=20] -->
     <string name="editTextMenuTitle">Text actions</string>
 
+    <!-- Label for item in the text selection menu to trigger an Email app [CHAR LIMIT=20] -->
+    <string name="email">Email</string>
+
+    <!-- Label for item in the text selection menu to trigger a Dialer app [CHAR LIMIT=20] -->
+    <string name="dial">Dial</string>
+
+    <!-- Label for item in the text selection menu to trigger a Map app [CHAR LIMIT=20] -->
+    <string name="map">Map</string>
+
     <!-- If the device is getting low on internal storage, a notification is shown to the user.  This is the title of that notification. -->
     <string name="low_internal_storage_view_title">Storage space running out</string>
     <!-- If the device is getting low on internal storage, a notification is shown to the user.  This is the message of that notification. -->
diff --git a/data/res/values/styles_material.xml b/data/res/values/styles_material.xml
index 0b326e9..1e15348 100644
--- a/data/res/values/styles_material.xml
+++ b/data/res/values/styles_material.xml
@@ -451,14 +451,14 @@
     </style>
 
     <style name="TextAppearance.Material.Notification">
-        <item name="textColor">@color/secondary_text_material_light</item>
+        <item name="textColor">@color/notification_secondary_text_color_light</item>
         <item name="textSize">@dimen/notification_text_size</item>
     </style>
 
     <style name="TextAppearance.Material.Notification.Reply" />
 
     <style name="TextAppearance.Material.Notification.Title">
-        <item name="textColor">@color/primary_text_default_material_light</item>
+        <item name="textColor">@color/notification_primary_text_color_light</item>
         <item name="textSize">@dimen/notification_title_text_size</item>
     </style>
 
@@ -467,7 +467,7 @@
     </style>
 
     <style name="TextAppearance.Material.Notification.Info">
-        <item name="textColor">@color/secondary_text_default_material_light</item>
+        <item name="textColor">@color/notification_secondary_text_color_light</item>
         <item name="textSize">@dimen/notification_subtext_size</item>
     </style>
 
diff --git a/data/res/values/symbols.xml b/data/res/values/symbols.xml
index c370ef7..554e123 100644
--- a/data/res/values/symbols.xml
+++ b/data/res/values/symbols.xml
@@ -254,6 +254,8 @@
   <java-symbol type="bool" name="config_enableBurnInProtection" />
   <java-symbol type="bool" name="config_hotswapCapable" />
   <java-symbol type="bool" name="config_mms_content_disposition_support" />
+  <java-symbol type="string" name="config_ims_package" />
+  <java-symbol type="bool" name="config_dynamic_bind_ims" />
   <java-symbol type="bool" name="config_networkSamplingWakesDevice" />
   <java-symbol type="bool" name="config_showMenuShortcutsWhenKeyboardPresent" />
   <java-symbol type="bool" name="config_sip_wifi_only" />
@@ -476,6 +478,9 @@
   <java-symbol type="string" name="replace" />
   <java-symbol type="string" name="undo" />
   <java-symbol type="string" name="redo" />
+  <java-symbol type="string" name="email" />
+  <java-symbol type="string" name="dial" />
+  <java-symbol type="string" name="map" />
   <java-symbol type="string" name="textSelectionCABTitle" />
   <java-symbol type="string" name="BaMmi" />
   <java-symbol type="string" name="CLIRDefaultOffNextCallOff" />
@@ -501,7 +506,6 @@
   <java-symbol type="string" name="NetworkPreferenceSwitchTitle" />
   <java-symbol type="string" name="SetupCallDefault" />
   <java-symbol type="string" name="accept" />
-  <java-symbol type="string" name="accessibility_enabled" />
   <java-symbol type="string" name="activity_chooser_view_see_all" />
   <java-symbol type="string" name="activitychooserview_choose_application" />
   <java-symbol type="string" name="activitychooserview_choose_application_error" />
@@ -598,7 +602,6 @@
   <java-symbol type="string" name="contentServiceSync" />
   <java-symbol type="string" name="contentServiceSyncNotificationTitle" />
   <java-symbol type="string" name="contentServiceTooManyDeletesNotificationDesc" />
-  <java-symbol type="string" name="continue_to_enable_accessibility" />
   <java-symbol type="string" name="date_and_time" />
   <java-symbol type="string" name="date_picker_decrement_day_button" />
   <java-symbol type="string" name="date_picker_decrement_month_button" />
@@ -645,7 +648,6 @@
   <java-symbol type="string" name="widget_default_class_name" />
   <java-symbol type="string" name="emergency_calls_only" />
   <java-symbol type="array" name="config_ephemeralResolverPackage" />
-  <java-symbol type="string" name="enable_accessibility_canceled" />
   <java-symbol type="string" name="eventTypeAnniversary" />
   <java-symbol type="string" name="eventTypeBirthday" />
   <java-symbol type="string" name="eventTypeCustom" />
@@ -1133,7 +1135,9 @@
   <java-symbol type="string" name="config_ethernet_tcp_buffers" />
   <java-symbol type="string" name="config_wifi_tcp_buffers" />
   <java-symbol type="string" name="config_demoModeLauncherComponent" />
-  <java-symbol type="string" name="config_demoModePassword" />
+  <java-symbol type="string" name="config_carrierDemoModePassword" />
+  <java-symbol type="string" name="config_carrierDemoModeSetting" />
+  <java-symbol type="string" name="config_carrierDemoModePackages" />
   <java-symbol type="string" name="demo_starting_message" />
   <java-symbol type="string" name="demo_restarting_message" />
   <java-symbol type="string" name="conference_call" />
@@ -1251,6 +1255,11 @@
   <java-symbol type="drawable" name="platlogo" />
   <java-symbol type="drawable" name="stat_notify_sync_error" />
   <java-symbol type="drawable" name="stat_notify_wifi_in_range" />
+  <java-symbol type="drawable" name="ic_wifi_signal_0" />
+  <java-symbol type="drawable" name="ic_wifi_signal_1" />
+  <java-symbol type="drawable" name="ic_wifi_signal_2" />
+  <java-symbol type="drawable" name="ic_wifi_signal_3" />
+  <java-symbol type="drawable" name="ic_wifi_signal_4" />
   <java-symbol type="drawable" name="ic_signal_wifi_badged_0_bars" />
   <java-symbol type="drawable" name="ic_signal_wifi_badged_1_bar" />
   <java-symbol type="drawable" name="ic_signal_wifi_badged_2_bars" />
@@ -1767,6 +1776,7 @@
   <java-symbol type="id" name="replace_message" />
   <java-symbol type="fraction" name="config_dimBehindFadeDuration" />
   <java-symbol type="dimen" name="default_minimal_size_resizable_task" />
+  <java-symbol type="dimen" name="task_height_of_minimized_mode" />
   <java-symbol type="fraction" name="config_screenAutoBrightnessDozeScaleFactor" />
   <java-symbol type="fraction" name="config_autoBrightnessAdjustmentMaxGamma" />
   <java-symbol type="integer" name="config_autoBrightnessAmbientLightHorizon"/>
@@ -2783,8 +2793,14 @@
   <java-symbol type="drawable" name="lockscreen_notselected" />
   <java-symbol type="drawable" name="lockscreen_selected" />
 
+  <java-symbol type="string" name="notification_header_divider_symbol_with_spaces" />
   <java-symbol type="string" name="config_defaultCellBroadcastReceiverComponent" />
 
+  <java-symbol type="color" name="notification_primary_text_color_light" />
+  <java-symbol type="color" name="notification_primary_text_color_dark" />
+  <java-symbol type="color" name="notification_secondary_text_color_light" />
+  <java-symbol type="color" name="notification_secondary_text_color_dark" />
+
   <java-symbol type="string" name="app_category_game" />
   <java-symbol type="string" name="app_category_audio" />
   <java-symbol type="string" name="app_category_video" />
@@ -2796,7 +2812,7 @@
 
   <java-symbol type="raw" name="fallback_categories" />
 
-  <java-symbol type="attr" name="primaryContentAlpha" />
+  <java-symbol type="string" name="config_icon_mask" />
 
   <!-- Accessibility Shortcut -->
   <java-symbol type="string" name="accessibility_shortcut_warning_dialog_title" />
@@ -2806,4 +2822,16 @@
   <java-symbol type="string" name="disable_accessibility_shortcut" />
   <java-symbol type="string" name="leave_accessibility_shortcut_on" />
   <java-symbol type="string" name="config_defaultAccessibilityService" />
+
+  <!-- com.android.internal.widget.RecyclerView -->
+  <java-symbol type="id" name="item_touch_helper_previous_elevation"/>
+  <java-symbol type="dimen" name="item_touch_helper_max_drag_scroll_per_frame"/>
+  <java-symbol type="dimen" name="item_touch_helper_swipe_escape_velocity"/>
+  <java-symbol type="dimen" name="item_touch_helper_swipe_escape_max_velocity"/>
+
+  <!-- com.android.server.autofill -->
+  <java-symbol type="layout" name="autofill_save"/>
+  <java-symbol type="id" name="autofill_save_title" />
+  <java-symbol type="id" name="autofill_save_no" />
+  <java-symbol type="id" name="autofill_save_yes" />
 </resources>
diff --git a/data/res/values/themes_material.xml b/data/res/values/themes_material.xml
index 3587fec..b063baf 100644
--- a/data/res/values/themes_material.xml
+++ b/data/res/values/themes_material.xml
@@ -49,6 +49,7 @@
         <item name="colorBackgroundCacheHint">@color/background_cache_hint_selector_material_dark</item>
         <item name="disabledAlpha">@dimen/disabled_alpha_material_dark</item>
         <item name="primaryContentAlpha">@dimen/primary_content_alpha_material_dark</item>
+        <item name="secondaryContentAlpha">@dimen/secondary_content_alpha_material_dark</item>
         <item name="backgroundDimAmount">0.6</item>
 
         <!-- Text styles -->
@@ -59,7 +60,7 @@
         <item name="textColorPrimaryInverse">@color/primary_text_material_light</item>
         <item name="textColorPrimaryActivated">@color/primary_text_inverse_when_activated_material</item>
         <item name="textColorPrimaryDisableOnly">@color/primary_text_disable_only_material_dark</item>
-        <item name="textColorSecondary">@color/secondary_text_material_dark</item>
+        <item name="textColorSecondary">@color/text_color_secondary</item>
         <item name="textColorSecondaryInverse">@color/secondary_text_material_light</item>
         <item name="textColorSecondaryActivated">@color/secondary_text_inverse_when_activated_material</item>
         <item name="textColorTertiary">@color/secondary_text_material_dark</item>
@@ -415,6 +416,7 @@
         <item name="colorBackgroundCacheHint">@color/background_cache_hint_selector_material_light</item>
         <item name="disabledAlpha">@dimen/disabled_alpha_material_light</item>
         <item name="primaryContentAlpha">@dimen/primary_content_alpha_material_light</item>
+        <item name="secondaryContentAlpha">@dimen/secondary_content_alpha_material_light</item>
         <item name="backgroundDimAmount">0.6</item>
 
         <!-- Text styles -->
@@ -424,7 +426,7 @@
         <item name="textColorPrimary">@color/text_color_primary</item>
         <item name="textColorPrimaryInverse">@color/primary_text_material_dark</item>
         <item name="textColorPrimaryActivated">@color/primary_text_inverse_when_activated_material</item>
-        <item name="textColorSecondary">@color/secondary_text_material_light</item>
+        <item name="textColorSecondary">@color/text_color_secondary</item>
         <item name="textColorSecondaryInverse">@color/secondary_text_material_dark</item>
         <item name="textColorSecondaryActivated">@color/secondary_text_inverse_when_activated_material</item>
         <item name="textColorTertiary">@color/secondary_text_material_light</item>
@@ -809,7 +811,7 @@
 
         <item name="textColorPrimary">@color/text_color_primary</item>
         <item name="textColorPrimaryInverse">@color/primary_text_material_dark</item>
-        <item name="textColorSecondary">@color/secondary_text_material_light</item>
+        <item name="textColorSecondary">@color/text_color_secondary</item>
         <item name="textColorSecondaryInverse">@color/secondary_text_material_dark</item>
         <item name="textColorTertiary">@color/secondary_text_material_light</item>
         <item name="textColorTertiaryInverse">@color/secondary_text_material_dark</item>
@@ -844,7 +846,7 @@
         <item name="textColorPrimary">@color/text_color_primary</item>
         <item name="textColorPrimaryInverse">@color/primary_text_material_light</item>
         <item name="textColorPrimaryDisableOnly">@color/primary_text_disable_only_material_dark</item>
-        <item name="textColorSecondary">@color/secondary_text_material_dark</item>
+        <item name="textColorSecondary">@color/text_color_secondary</item>
         <item name="textColorSecondaryInverse">@color/secondary_text_material_light</item>
         <item name="textColorTertiary">@color/secondary_text_material_dark</item>
         <item name="textColorTertiaryInverse">@color/secondary_text_material_light</item>
diff --git a/data/widgets.txt b/data/widgets.txt
index b4285dd..d34f34a 100644
--- a/data/widgets.txt
+++ b/data/widgets.txt
@@ -1,74 +1,74 @@
-Wandroid.widget.Spinner android.widget.AbsSpinner android.widget.AdapterView android.view.ViewGroup android.view.View java.lang.Object
-Wandroid.widget.Switch android.widget.CompoundButton android.widget.Button android.widget.TextView android.view.View java.lang.Object
-Wandroid.widget.TextClock android.widget.TextView android.view.View java.lang.Object
-Wandroid.view.View java.lang.Object
-Wandroid.widget.CheckBox android.widget.CompoundButton android.widget.Button android.widget.TextView android.view.View java.lang.Object
-Wandroid.widget.RadioButton android.widget.CompoundButton android.widget.Button android.widget.TextView android.view.View java.lang.Object
-Wandroid.widget.TimePicker android.widget.FrameLayout android.view.ViewGroup android.view.View java.lang.Object
 Wandroid.widget.ImageView android.view.View java.lang.Object
-Wandroid.widget.ZoomButton android.widget.ImageButton android.widget.ImageView android.view.View java.lang.Object
-Wandroid.widget.Space android.view.View java.lang.Object
-Wandroid.widget.TextView android.view.View java.lang.Object
-Wandroid.widget.EditText android.widget.TextView android.view.View java.lang.Object
-Wandroid.widget.DatePicker android.widget.FrameLayout android.view.ViewGroup android.view.View java.lang.Object
-Wandroid.widget.Gallery android.widget.AbsSpinner android.widget.AdapterView android.view.ViewGroup android.view.View java.lang.Object
-Wandroid.widget.AutoCompleteTextView android.widget.EditText android.widget.TextView android.view.View java.lang.Object
-Wandroid.widget.SeekBar android.widget.AbsSeekBar android.widget.ProgressBar android.view.View java.lang.Object
-Wandroid.widget.RatingBar android.widget.AbsSeekBar android.widget.ProgressBar android.view.View java.lang.Object
-Wandroid.widget.Chronometer android.widget.TextView android.view.View java.lang.Object
-Wandroid.widget.VideoView android.view.SurfaceView android.view.View java.lang.Object
-Wandroid.widget.CalendarView android.widget.FrameLayout android.view.ViewGroup android.view.View java.lang.Object
 Wandroid.gesture.GestureOverlayView android.widget.FrameLayout android.view.ViewGroup android.view.View java.lang.Object
-Wandroid.widget.MultiAutoCompleteTextView android.widget.AutoCompleteTextView android.widget.EditText android.widget.TextView android.view.View java.lang.Object
-Wandroid.widget.Button android.widget.TextView android.view.View java.lang.Object
-Wandroid.view.TextureView android.view.View java.lang.Object
-Wandroid.widget.ProgressBar android.view.View java.lang.Object
 Wandroid.widget.ZoomControls android.widget.LinearLayout android.view.ViewGroup android.view.View java.lang.Object
-Wandroid.widget.TwoLineListItem android.widget.RelativeLayout android.view.ViewGroup android.view.View java.lang.Object
+Wandroid.widget.ZoomButton android.widget.ImageButton android.widget.ImageView android.view.View java.lang.Object
+Wandroid.widget.TimePicker android.widget.FrameLayout android.view.ViewGroup android.view.View java.lang.Object
+Wandroid.widget.Space android.view.View java.lang.Object
 Wandroid.widget.NumberPicker android.widget.LinearLayout android.view.ViewGroup android.view.View java.lang.Object
-Wandroid.widget.ImageButton android.widget.ImageView android.view.View java.lang.Object
+Wandroid.widget.QuickContactBadge android.widget.ImageView android.view.View java.lang.Object
 Wandroid.widget.CheckedTextView android.widget.TextView android.view.View java.lang.Object
-Wandroid.view.SurfaceView android.view.View java.lang.Object
-Wandroid.widget.ToggleButton android.widget.CompoundButton android.widget.Button android.widget.TextView android.view.View java.lang.Object
-Wandroid.widget.DigitalClock android.widget.TextView android.view.View java.lang.Object
+Wandroid.widget.EditText android.widget.TextView android.view.View java.lang.Object
+Wandroid.widget.SeekBar android.widget.AbsSeekBar android.widget.ProgressBar android.view.View java.lang.Object
 Wandroid.view.ViewStub android.view.View java.lang.Object
 Wandroid.webkit.WebView android.widget.AbsoluteLayout android.view.ViewGroup android.view.View java.lang.Object
-Wandroid.widget.QuickContactBadge android.widget.ImageView android.view.View java.lang.Object
+Wandroid.view.SurfaceView android.view.View java.lang.Object
+Wandroid.widget.Chronometer android.widget.TextView android.view.View java.lang.Object
+Wandroid.widget.TextView android.view.View java.lang.Object
+Wandroid.widget.CalendarView android.widget.FrameLayout android.view.ViewGroup android.view.View java.lang.Object
+Wandroid.widget.Gallery android.widget.AbsSpinner android.widget.AdapterView android.view.ViewGroup android.view.View java.lang.Object
+Wandroid.widget.DatePicker android.widget.FrameLayout android.view.ViewGroup android.view.View java.lang.Object
+Wandroid.widget.Switch android.widget.CompoundButton android.widget.Button android.widget.TextView android.view.View java.lang.Object
+Wandroid.widget.TwoLineListItem android.widget.RelativeLayout android.view.ViewGroup android.view.View java.lang.Object
+Wandroid.widget.RatingBar android.widget.AbsSeekBar android.widget.ProgressBar android.view.View java.lang.Object
+Wandroid.widget.Button android.widget.TextView android.view.View java.lang.Object
+Wandroid.widget.ImageButton android.widget.ImageView android.view.View java.lang.Object
+Wandroid.widget.MultiAutoCompleteTextView android.widget.AutoCompleteTextView android.widget.EditText android.widget.TextView android.view.View java.lang.Object
+Wandroid.view.View java.lang.Object
+Wandroid.widget.ProgressBar android.view.View java.lang.Object
+Wandroid.widget.DigitalClock android.widget.TextView android.view.View java.lang.Object
+Wandroid.widget.Spinner android.widget.AbsSpinner android.widget.AdapterView android.view.ViewGroup android.view.View java.lang.Object
 Wandroid.widget.AnalogClock android.view.View java.lang.Object
-Pandroid.widget.RelativeLayout.LayoutParams android.view.ViewGroup.MarginLayoutParams android.view.ViewGroup.LayoutParams java.lang.Object
-Pandroid.widget.TableRow.LayoutParams android.widget.LinearLayout.LayoutParams android.view.ViewGroup.MarginLayoutParams android.view.ViewGroup.LayoutParams java.lang.Object
-Pandroid.widget.GridLayout.LayoutParams android.view.ViewGroup.MarginLayoutParams android.view.ViewGroup.LayoutParams java.lang.Object
-Pandroid.widget.TableLayout.LayoutParams android.widget.LinearLayout.LayoutParams android.view.ViewGroup.MarginLayoutParams android.view.ViewGroup.LayoutParams java.lang.Object
-Pandroid.widget.RadioGroup.LayoutParams android.widget.LinearLayout.LayoutParams android.view.ViewGroup.MarginLayoutParams android.view.ViewGroup.LayoutParams java.lang.Object
-Pandroid.widget.FrameLayout.LayoutParams android.view.ViewGroup.MarginLayoutParams android.view.ViewGroup.LayoutParams java.lang.Object
+Wandroid.widget.ToggleButton android.widget.CompoundButton android.widget.Button android.widget.TextView android.view.View java.lang.Object
+Wandroid.view.TextureView android.view.View java.lang.Object
+Wandroid.widget.VideoView android.view.SurfaceView android.view.View java.lang.Object
+Wandroid.widget.AutoCompleteTextView android.widget.EditText android.widget.TextView android.view.View java.lang.Object
+Wandroid.widget.TextClock android.widget.TextView android.view.View java.lang.Object
+Wandroid.widget.CheckBox android.widget.CompoundButton android.widget.Button android.widget.TextView android.view.View java.lang.Object
+Wandroid.widget.RadioButton android.widget.CompoundButton android.widget.Button android.widget.TextView android.view.View java.lang.Object
 Pandroid.widget.AbsoluteLayout.LayoutParams android.view.ViewGroup.LayoutParams java.lang.Object
-Pandroid.widget.LinearLayout.LayoutParams android.view.ViewGroup.MarginLayoutParams android.view.ViewGroup.LayoutParams java.lang.Object
+Pandroid.widget.TableRow.LayoutParams android.widget.LinearLayout.LayoutParams android.view.ViewGroup.MarginLayoutParams android.view.ViewGroup.LayoutParams java.lang.Object
+Pandroid.widget.FrameLayout.LayoutParams android.view.ViewGroup.MarginLayoutParams android.view.ViewGroup.LayoutParams java.lang.Object
 Pandroid.widget.ActionMenuView.LayoutParams android.widget.LinearLayout.LayoutParams android.view.ViewGroup.MarginLayoutParams android.view.ViewGroup.LayoutParams java.lang.Object
+Pandroid.widget.TableLayout.LayoutParams android.widget.LinearLayout.LayoutParams android.view.ViewGroup.MarginLayoutParams android.view.ViewGroup.LayoutParams java.lang.Object
+Pandroid.widget.RelativeLayout.LayoutParams android.view.ViewGroup.MarginLayoutParams android.view.ViewGroup.LayoutParams java.lang.Object
+Pandroid.widget.LinearLayout.LayoutParams android.view.ViewGroup.MarginLayoutParams android.view.ViewGroup.LayoutParams java.lang.Object
+Pandroid.widget.GridLayout.LayoutParams android.view.ViewGroup.MarginLayoutParams android.view.ViewGroup.LayoutParams java.lang.Object
+Pandroid.widget.RadioGroup.LayoutParams android.widget.LinearLayout.LayoutParams android.view.ViewGroup.MarginLayoutParams android.view.ViewGroup.LayoutParams java.lang.Object
 Landroid.widget.TabWidget android.widget.LinearLayout android.view.ViewGroup android.view.View java.lang.Object
-Landroid.widget.HorizontalScrollView android.widget.FrameLayout android.view.ViewGroup android.view.View java.lang.Object
-Landroid.widget.GridView android.widget.AbsListView android.widget.AdapterView android.view.ViewGroup android.view.View java.lang.Object
-Landroid.widget.ExpandableListView android.widget.ListView android.widget.AbsListView android.widget.AdapterView android.view.ViewGroup android.view.View java.lang.Object
-Landroid.widget.ViewSwitcher android.widget.ViewAnimator android.widget.FrameLayout android.view.ViewGroup android.view.View java.lang.Object
-Landroid.widget.MediaController android.widget.FrameLayout android.view.ViewGroup android.view.View java.lang.Object
-Landroid.widget.ImageSwitcher android.widget.ViewSwitcher android.widget.ViewAnimator android.widget.FrameLayout android.view.ViewGroup android.view.View java.lang.Object
-Landroid.widget.SlidingDrawer android.view.ViewGroup android.view.View java.lang.Object
-Landroid.widget.TableLayout android.widget.LinearLayout android.view.ViewGroup android.view.View java.lang.Object
-Landroid.widget.GridLayout android.view.ViewGroup android.view.View java.lang.Object
-Landroid.widget.FrameLayout android.view.ViewGroup android.view.View java.lang.Object
-Landroid.widget.DialerFilter android.widget.RelativeLayout android.view.ViewGroup android.view.View java.lang.Object
-Landroid.widget.RadioGroup android.widget.LinearLayout android.view.ViewGroup android.view.View java.lang.Object
-Landroid.widget.ScrollView android.widget.FrameLayout android.view.ViewGroup android.view.View java.lang.Object
-Landroid.widget.TabHost android.widget.FrameLayout android.view.ViewGroup android.view.View java.lang.Object
-Landroid.widget.TextSwitcher android.widget.ViewSwitcher android.widget.ViewAnimator android.widget.FrameLayout android.view.ViewGroup android.view.View java.lang.Object
-Landroid.widget.RelativeLayout android.view.ViewGroup android.view.View java.lang.Object
-Landroid.widget.StackView android.widget.AdapterViewAnimator android.widget.AdapterView android.view.ViewGroup android.view.View java.lang.Object
-Landroid.widget.AbsoluteLayout android.view.ViewGroup android.view.View java.lang.Object
-Landroid.widget.ViewAnimator android.widget.FrameLayout android.view.ViewGroup android.view.View java.lang.Object
 Landroid.widget.SearchView android.widget.LinearLayout android.view.ViewGroup android.view.View java.lang.Object
-Landroid.widget.TableRow android.widget.LinearLayout android.view.ViewGroup android.view.View java.lang.Object
-Landroid.widget.ActionMenuView android.widget.LinearLayout android.view.ViewGroup android.view.View java.lang.Object
-Landroid.widget.LinearLayout android.view.ViewGroup android.view.View java.lang.Object
-Landroid.widget.Toolbar android.view.ViewGroup android.view.View java.lang.Object
 Landroid.widget.AdapterViewFlipper android.widget.AdapterViewAnimator android.widget.AdapterView android.view.ViewGroup android.view.View java.lang.Object
-Landroid.widget.ViewFlipper android.widget.ViewAnimator android.widget.FrameLayout android.view.ViewGroup android.view.View java.lang.Object
+Landroid.widget.TableLayout android.widget.LinearLayout android.view.ViewGroup android.view.View java.lang.Object
+Landroid.widget.ImageSwitcher android.widget.ViewSwitcher android.widget.ViewAnimator android.widget.FrameLayout android.view.ViewGroup android.view.View java.lang.Object
+Landroid.widget.TextSwitcher android.widget.ViewSwitcher android.widget.ViewAnimator android.widget.FrameLayout android.view.ViewGroup android.view.View java.lang.Object
+Landroid.widget.ScrollView android.widget.FrameLayout android.view.ViewGroup android.view.View java.lang.Object
 Landroid.widget.ListView android.widget.AbsListView android.widget.AdapterView android.view.ViewGroup android.view.View java.lang.Object
+Landroid.widget.AbsoluteLayout android.view.ViewGroup android.view.View java.lang.Object
+Landroid.widget.MediaController android.widget.FrameLayout android.view.ViewGroup android.view.View java.lang.Object
+Landroid.widget.ViewSwitcher android.widget.ViewAnimator android.widget.FrameLayout android.view.ViewGroup android.view.View java.lang.Object
+Landroid.widget.Toolbar android.view.ViewGroup android.view.View java.lang.Object
+Landroid.widget.GridLayout android.view.ViewGroup android.view.View java.lang.Object
+Landroid.widget.ExpandableListView android.widget.ListView android.widget.AbsListView android.widget.AdapterView android.view.ViewGroup android.view.View java.lang.Object
+Landroid.widget.DialerFilter android.widget.RelativeLayout android.view.ViewGroup android.view.View java.lang.Object
+Landroid.widget.StackView android.widget.AdapterViewAnimator android.widget.AdapterView android.view.ViewGroup android.view.View java.lang.Object
+Landroid.widget.ActionMenuView android.widget.LinearLayout android.view.ViewGroup android.view.View java.lang.Object
+Landroid.widget.SlidingDrawer android.view.ViewGroup android.view.View java.lang.Object
+Landroid.widget.GridView android.widget.AbsListView android.widget.AdapterView android.view.ViewGroup android.view.View java.lang.Object
+Landroid.widget.RelativeLayout android.view.ViewGroup android.view.View java.lang.Object
+Landroid.widget.LinearLayout android.view.ViewGroup android.view.View java.lang.Object
+Landroid.widget.RadioGroup android.widget.LinearLayout android.view.ViewGroup android.view.View java.lang.Object
+Landroid.widget.HorizontalScrollView android.widget.FrameLayout android.view.ViewGroup android.view.View java.lang.Object
+Landroid.widget.TableRow android.widget.LinearLayout android.view.ViewGroup android.view.View java.lang.Object
+Landroid.widget.TabHost android.widget.FrameLayout android.view.ViewGroup android.view.View java.lang.Object
+Landroid.widget.FrameLayout android.view.ViewGroup android.view.View java.lang.Object
+Landroid.widget.ViewFlipper android.widget.ViewAnimator android.widget.FrameLayout android.view.ViewGroup android.view.View java.lang.Object
+Landroid.widget.ViewAnimator android.widget.FrameLayout android.view.ViewGroup android.view.View java.lang.Object
diff --git a/optional/org.apache.http.legacy.jar b/optional/org.apache.http.legacy.jar
index 6e35673..4da4b58 100644
--- a/optional/org.apache.http.legacy.jar
+++ b/optional/org.apache.http.legacy.jar
Binary files differ
diff --git a/uiautomator.jar b/uiautomator.jar
index e1b8f55..b2d2476 100644
--- a/uiautomator.jar
+++ b/uiautomator.jar
Binary files differ