Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 53ad2a15 authored by George Mount's avatar George Mount Committed by Android (Google) Code Review
Browse files

Merge "Make public basic transitions."

parents a7838754 7da1f582

api/current.txt

+7 −0
Original line number Diff line number Diff line
@@ -2525,7 +2525,14 @@ package android { 














  public static final class R.transition {















    ctor public R.transition();













    field public static final int explode = 17760259; // 0x10f0003













    field public static final int fade = 17760258; // 0x10f0002













    field public static final int move = 17760257; // 0x10f0001















    field public static final int no_transition = 17760256; // 0x10f0000













    field public static final int slide_bottom = 17760260; // 0x10f0004













    field public static final int slide_left = 17760263; // 0x10f0007













    field public static final int slide_right = 17760262; // 0x10f0006













    field public static final int slide_top = 17760261; // 0x10f0005















  }





























  public static final class R.xml {

























core/res/res/transition/explode.xml
0 → 100644



+16
−0




























Original line number
Diff line number
Diff line













<?xml version="1.0" encoding="utf-8"?>













<!-- Copyright (C) 2014 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.













-->













<explode xmlns:android="http://schemas.android.com/apk/res/android"/>
























core/res/res/transition/slide_bottom.xml
0 → 100644



+16
−0




























Original line number
Diff line number
Diff line













<?xml version="1.0" encoding="utf-8"?>













<!-- Copyright (C) 2014 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.













-->













<slide xmlns:android="http://schemas.android.com/apk/res/android" android:slideEdge="bottom"/>
























core/res/res/transition/slide_left.xml
0 → 100644



+16
−0




























Original line number
Diff line number
Diff line













<?xml version="1.0" encoding="utf-8"?>













<!-- Copyright (C) 2014 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.













-->













<slide xmlns:android="http://schemas.android.com/apk/res/android" android:slideEdge="left"/>
























core/res/res/transition/slide_right.xml
0 → 100644



+16
−0




























Original line number
Diff line number
Diff line













<?xml version="1.0" encoding="utf-8"?>













<!-- Copyright (C) 2014 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.













-->













<slide xmlns:android="http://schemas.android.com/apk/res/android" android:slideEdge="right"/>