diff options
author | Maurice Lam <yukl@google.com> | 2014-06-20 11:39:24 -0700 |
---|---|---|
committer | Maurice Lam <yukl@google.com> | 2014-06-20 11:39:24 -0700 |
commit | 40dd08f091020a436af0d253d2cb54f560493920 (patch) | |
tree | 0175530af75bcee48c4aed80bd4127a460cb4b3c /navigationbar | |
parent | d9fbe9e218ce792755341aea4cd9c678171c5669 (diff) | |
download | android_frameworks_opt_setupwizard-40dd08f091020a436af0d253d2cb54f560493920.tar.gz android_frameworks_opt_setupwizard-40dd08f091020a436af0d253d2cb54f560493920.tar.bz2 android_frameworks_opt_setupwizard-40dd08f091020a436af0d253d2cb54f560493920.zip |
Make copyright headers consistent
Fixed all the years to 2014, and all header to "The Android Open
Source Project". Also fixed style so they are consistent within
the project.
Change-Id: I4b1c29a997a4f69c189bb94243db1e71b36c0f21
Diffstat (limited to 'navigationbar')
8 files changed, 90 insertions, 103 deletions
diff --git a/navigationbar/AndroidManifest.xml b/navigationbar/AndroidManifest.xml index eae67b4..f1029cf 100644 --- a/navigationbar/AndroidManifest.xml +++ b/navigationbar/AndroidManifest.xml @@ -1,17 +1,18 @@ <?xml version="1.0" encoding="utf-8"?> -<!-- Copyright (C) 2014 The Android Open Source Project +<!-- + 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 + 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 + 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. + 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. --> <manifest xmlns:android="http://schemas.android.com/apk/res/android" diff --git a/navigationbar/res/drawable-ldrtl/setup_wizard_navbar_ic_back.xml b/navigationbar/res/drawable-ldrtl/setup_wizard_navbar_ic_back.xml index 239504f..b0d243a 100644 --- a/navigationbar/res/drawable-ldrtl/setup_wizard_navbar_ic_back.xml +++ b/navigationbar/res/drawable-ldrtl/setup_wizard_navbar_ic_back.xml @@ -1,20 +1,18 @@ <?xml version="1.0" encoding="utf-8"?> <!-- -/** - * Copyright (c) 2013 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. - */ + 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. --> <vector xmlns:android="http://schemas.android.com/apk/res/android"> <size android:width="24dp" android:height="24dp" /> diff --git a/navigationbar/res/drawable-ldrtl/setup_wizard_navbar_ic_next.xml b/navigationbar/res/drawable-ldrtl/setup_wizard_navbar_ic_next.xml index 2232e8b..335ef8c 100644 --- a/navigationbar/res/drawable-ldrtl/setup_wizard_navbar_ic_next.xml +++ b/navigationbar/res/drawable-ldrtl/setup_wizard_navbar_ic_next.xml @@ -1,20 +1,18 @@ <?xml version="1.0" encoding="utf-8"?> <!-- -/** - * Copyright (c) 2013 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. - */ + 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. --> <vector xmlns:android="http://schemas.android.com/apk/res/android"> <size android:width="24dp" android:height="24dp" /> diff --git a/navigationbar/res/drawable/setup_wizard_navbar_ic_back.xml b/navigationbar/res/drawable/setup_wizard_navbar_ic_back.xml index ac467f4..a759853 100644 --- a/navigationbar/res/drawable/setup_wizard_navbar_ic_back.xml +++ b/navigationbar/res/drawable/setup_wizard_navbar_ic_back.xml @@ -1,20 +1,18 @@ <?xml version="1.0" encoding="utf-8"?> <!-- -/** - * Copyright (c) 2013 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. - */ + 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. --> <vector xmlns:android="http://schemas.android.com/apk/res/android"> <size android:width="24dp" android:height="24dp" /> diff --git a/navigationbar/res/drawable/setup_wizard_navbar_ic_more.xml b/navigationbar/res/drawable/setup_wizard_navbar_ic_more.xml index 5934bb1..eef8b93 100644 --- a/navigationbar/res/drawable/setup_wizard_navbar_ic_more.xml +++ b/navigationbar/res/drawable/setup_wizard_navbar_ic_more.xml @@ -1,20 +1,18 @@ <?xml version="1.0" encoding="utf-8"?> <!-- -/** - * Copyright (c) 2013 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. - */ + 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. --> <vector xmlns:android="http://schemas.android.com/apk/res/android"> <size android:width="24dp" android:height="24dp" /> diff --git a/navigationbar/res/drawable/setup_wizard_navbar_ic_next.xml b/navigationbar/res/drawable/setup_wizard_navbar_ic_next.xml index c74e19f..4c0c6e4 100644 --- a/navigationbar/res/drawable/setup_wizard_navbar_ic_next.xml +++ b/navigationbar/res/drawable/setup_wizard_navbar_ic_next.xml @@ -1,20 +1,18 @@ <?xml version="1.0" encoding="utf-8"?> <!-- -/** - * Copyright (c) 2013 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. - */ + 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. --> <vector xmlns:android="http://schemas.android.com/apk/res/android"> <size android:width="24dp" android:height="24dp" /> diff --git a/navigationbar/res/layout/setup_wizard_navbar_layout.xml b/navigationbar/res/layout/setup_wizard_navbar_layout.xml index 627e7d4..6bdb02d 100644 --- a/navigationbar/res/layout/setup_wizard_navbar_layout.xml +++ b/navigationbar/res/layout/setup_wizard_navbar_layout.xml @@ -1,22 +1,19 @@ <?xml version="1.0" encoding="utf-8"?> <!-- -/** - * Copyright (c) 2010 Google Inc. - * - * 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. - */ ---> + 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. +--> <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" style="@style/setup_wizard_navbar_style" > diff --git a/navigationbar/src/com/android/setupwizard/navigationbar/SetupWizardNavBar.java b/navigationbar/src/com/android/setupwizard/navigationbar/SetupWizardNavBar.java index 3cab520..3d58354 100644 --- a/navigationbar/src/com/android/setupwizard/navigationbar/SetupWizardNavBar.java +++ b/navigationbar/src/com/android/setupwizard/navigationbar/SetupWizardNavBar.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2014 Google Inc. + * 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. @@ -14,7 +14,6 @@ * limitations under the License. */ - package com.android.setupwizard.navigationbar; import android.app.Activity; |