diff options
| author | Maurice Lam <yukl@google.com> | 2018-02-17 00:11:24 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2018-02-17 00:11:24 +0000 |
| commit | 53c263400cd8f58044490994337c27198f03132a (patch) | |
| tree | f4bea48a3cd9d4a9498681fb6c49e4bb8e6a6d76 | |
| parent | f0001e7af7d641c0ce3112fd913d83448725ae63 (diff) | |
| parent | 5a94caca34f577b8c6d4d65acc00c8acf9666855 (diff) | |
| download | setupwizard-53c263400cd8f58044490994337c27198f03132a.tar.gz | |
Merge "Build against SDK 28"
| -rw-r--r-- | library/gingerbread/res/values-v27/styles.xml | 8 | ||||
| -rw-r--r-- | library/platform/res/values-v27/styles.xml | 8 | ||||
| -rw-r--r-- | tools/gradle/android.properties | 4 |
3 files changed, 12 insertions, 8 deletions
diff --git a/library/gingerbread/res/values-v27/styles.xml b/library/gingerbread/res/values-v27/styles.xml index a81b86b..305a55e 100644 --- a/library/gingerbread/res/values-v27/styles.xml +++ b/library/gingerbread/res/values-v27/styles.xml @@ -15,14 +15,16 @@ limitations under the License. --> -<resources> +<resources xmlns:tools="http://schemas.android.com/tools"> <!-- Not needed for dark theme, as default nav bar bg color is black. We need a separate style override here since windowLightNavigationBar is new in v27, and these two styles need to be applied together as a unit. --> <style name="SuwThemeGlifV3.Light" parent="SuwBaseThemeGlifV3.Light"> <item name="android:navigationBarColor">@color/suw_glif_v3_nav_bar_color_light</item> - <item name="android:navigationBarDividerColor">@color/suw_glif_v3_nav_bar_divider_color_light</item> - <item name="android:windowLightNavigationBar">true</item> + <!-- Ignore NewApi: For some reason lint seems to think this API is new in v28 (b/73514594) --> + <item name="android:navigationBarDividerColor" tools:ignore="NewApi">@color/suw_glif_v3_nav_bar_divider_color_light</item> + <!-- Ignore NewApi: For some reason lint seems to think this API is new in v28 (b/73514594) --> + <item name="android:windowLightNavigationBar" tools:ignore="NewApi">true</item> </style> </resources> diff --git a/library/platform/res/values-v27/styles.xml b/library/platform/res/values-v27/styles.xml index 4833d60..ba287fc 100644 --- a/library/platform/res/values-v27/styles.xml +++ b/library/platform/res/values-v27/styles.xml @@ -17,7 +17,7 @@ <!-- These styles are only included in the platform build, to make sure that they do not override the corresponding styles in the compatibility build. --> -<resources> +<resources xmlns:tools="http://schemas.android.com/tools"> <!-- General styles --> @@ -167,8 +167,10 @@ <style name="SuwThemeGlifV3.Light" parent="SuwThemeGlifV2.Light"> <item name="android:colorAccent">@color/suw_color_accent_glif_v3</item> <item name="android:navigationBarColor">@color/suw_glif_v3_nav_bar_color_light</item> - <item name="android:navigationBarDividerColor">@color/suw_glif_v3_nav_bar_divider_color_light</item> - <item name="android:windowLightNavigationBar">true</item> + <!-- Ignore NewApi: For some reason lint seems to think this API is new in v28 (b/73514594) --> + <item name="android:navigationBarDividerColor" tools:ignore="NewApi">@color/suw_glif_v3_nav_bar_divider_color_light</item> + <!-- Ignore NewApi: For some reason lint seems to think this API is new in v28 (b/73514594) --> + <item name="android:windowLightNavigationBar" tools:ignore="NewApi">true</item> <item name="suwButtonAllCaps">false</item> <item name="suwButtonFontFamily">@string/suwFontSecondaryMedium</item> diff --git a/tools/gradle/android.properties b/tools/gradle/android.properties index 3795eee..f62de66 100644 --- a/tools/gradle/android.properties +++ b/tools/gradle/android.properties @@ -1,6 +1,6 @@ // Set the default SDK and build tools version for all apps -compileSdkVersion 27 -buildToolsVersion = '27.0.0' +compileSdkVersion 28 +buildToolsVersion = '28.0.0' // enable Java7 compileOptions.sourceCompatibility JavaVersion.VERSION_1_7 |