diff options
22 files changed, 44 insertions, 23 deletions
diff --git a/core/res/res/drawable-hdpi/btn_dropdown_disabled.9.png b/core/res/res/drawable-hdpi/btn_dropdown_disabled.9.png Binary files differnew file mode 100644 index 0000000..c6503c7 --- /dev/null +++ b/core/res/res/drawable-hdpi/btn_dropdown_disabled.9.png diff --git a/core/res/res/drawable-hdpi/btn_dropdown_disabled_focused.9.png b/core/res/res/drawable-hdpi/btn_dropdown_disabled_focused.9.png Binary files differnew file mode 100644 index 0000000..152de8b --- /dev/null +++ b/core/res/res/drawable-hdpi/btn_dropdown_disabled_focused.9.png diff --git a/core/res/res/drawable-mdpi/btn_dropdown_disabled.9.png b/core/res/res/drawable-mdpi/btn_dropdown_disabled.9.png Binary files differnew file mode 100644 index 0000000..f7464c7 --- /dev/null +++ b/core/res/res/drawable-mdpi/btn_dropdown_disabled.9.png diff --git a/core/res/res/drawable-mdpi/btn_dropdown_disabled_focused.9.png b/core/res/res/drawable-mdpi/btn_dropdown_disabled_focused.9.png Binary files differnew file mode 100644 index 0000000..ffe219f --- /dev/null +++ b/core/res/res/drawable-mdpi/btn_dropdown_disabled_focused.9.png diff --git a/core/res/res/drawable/btn_dropdown.xml b/core/res/res/drawable/btn_dropdown.xml index 8ec8ece..34a0504 100644 --- a/core/res/res/drawable/btn_dropdown.xml +++ b/core/res/res/drawable/btn_dropdown.xml @@ -15,10 +15,24 @@ --> <selector xmlns:android="http://schemas.android.com/apk/res/android"> - <item android:state_window_focused="false" android:drawable="@drawable/btn_dropdown_normal" /> - <item android:state_pressed="true" android:drawable="@drawable/btn_dropdown_pressed" /> - <item android:state_focused="true" android:state_pressed="false" + <item + android:state_window_focused="false" android:state_enabled="true" + android:drawable="@drawable/btn_dropdown_normal" /> + <item + android:state_window_focused="false" android:state_enabled="false" + android:drawable="@drawable/btn_dropdown_disabled" /> + <item + android:state_pressed="true" + android:drawable="@drawable/btn_dropdown_pressed" /> + <item + android:state_focused="true" android:state_enabled="true" android:drawable="@drawable/btn_dropdown_selected" /> - <item android:drawable="@drawable/btn_dropdown_normal" /> + <item + android:state_enabled="true" + android:drawable="@drawable/btn_dropdown_normal" /> + <item + android:state_focused="true" + android:drawable="@drawable/btn_dropdown_disabled_focused" /> + <item + android:drawable="@drawable/btn_dropdown_disabled" /> </selector> - diff --git a/services/java/com/android/server/MountService.java b/services/java/com/android/server/MountService.java index 39ee314..2dc12f6 100644 --- a/services/java/com/android/server/MountService.java +++ b/services/java/com/android/server/MountService.java @@ -1003,7 +1003,11 @@ class MountService extends IMountService.Stub warnOnNotMounted(); synchronized (mAsecMountSet) { - if (mAsecMountSet.contains(oldId)) { + /* + * Because a mounted container has active internal state which cannot be + * changed while active, we must ensure both ids are not currently mounted. + */ + if (mAsecMountSet.contains(oldId) || mAsecMountSet.contains(newId)) { return StorageResultCode.OperationFailedStorageMounted; } } diff --git a/tests/AndroidTests/src/com/android/unit_tests/AsecTests.java b/tests/AndroidTests/src/com/android/unit_tests/AsecTests.java index 3bbb447..d5d23266 100755 --- a/tests/AndroidTests/src/com/android/unit_tests/AsecTests.java +++ b/tests/AndroidTests/src/com/android/unit_tests/AsecTests.java @@ -300,7 +300,7 @@ public class AsecTests extends AndroidTestCase { } } - public void testRenameMountedContainer() { + public void testRenameSrcMountedContainer() { try { Assert.assertEquals(StorageResultCode.OperationSucceeded, createContainer("testRenameContainer.1", 4, "none")); @@ -312,12 +312,15 @@ public class AsecTests extends AndroidTestCase { } } - public void testRenameToExistingContainer() { + public void testRenameDstMountedContainer() { try { Assert.assertEquals(StorageResultCode.OperationSucceeded, createContainer("testRenameContainer.1", 4, "none")); Assert.assertEquals(StorageResultCode.OperationSucceeded, + unmountContainer("testRenameContainer.1", false)); + + Assert.assertEquals(StorageResultCode.OperationSucceeded, createContainer("testRenameContainer.2", 4, "none")); Assert.assertEquals(StorageResultCode.OperationFailedStorageMounted, diff --git a/tests/LocationTracker/res/layout/entrylist_item.xml b/tests/LocationTracker/res/layout/entrylist_item.xml index 8187677..d2a8033 100644 --- a/tests/LocationTracker/res/layout/entrylist_item.xml +++ b/tests/LocationTracker/res/layout/entrylist_item.xml @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="utf-8"?> <!-- /* - * Copyright (C) 2006-2008 Google Inc. + * Copyright (C) 2006-2008 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. diff --git a/tests/LocationTracker/res/menu/menu.xml b/tests/LocationTracker/res/menu/menu.xml index 94c589a..05d13fd 100644 --- a/tests/LocationTracker/res/menu/menu.xml +++ b/tests/LocationTracker/res/menu/menu.xml @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="utf-8"?> <!-- /** -* Copyright (c) 2008 Google Inc. +* Copyright (c) 2008 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. diff --git a/tests/LocationTracker/res/values/strings.xml b/tests/LocationTracker/res/values/strings.xml index bb3ea86..ea6bf2d 100644 --- a/tests/LocationTracker/res/values/strings.xml +++ b/tests/LocationTracker/res/values/strings.xml @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="utf-8"?> <!-- /* -* Copyright (C) 2008 Google Inc. +* Copyright (C) 2008 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. diff --git a/tests/LocationTracker/res/xml/preferences.xml b/tests/LocationTracker/res/xml/preferences.xml index b57837f..61d4817 100755 --- a/tests/LocationTracker/res/xml/preferences.xml +++ b/tests/LocationTracker/res/xml/preferences.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="utf-8"?> -<!-- Copyright (C) 2008 Google Inc. +<!-- Copyright (C) 2008 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. diff --git a/tests/LocationTracker/src/com/android/locationtracker/SettingsActivity.java b/tests/LocationTracker/src/com/android/locationtracker/SettingsActivity.java index c5b2432..cb77118 100755 --- a/tests/LocationTracker/src/com/android/locationtracker/SettingsActivity.java +++ b/tests/LocationTracker/src/com/android/locationtracker/SettingsActivity.java @@ -1,5 +1,5 @@ /*
- * Copyright (C) 2008 Google Inc.
+ * Copyright (C) 2008 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.
diff --git a/tests/LocationTracker/src/com/android/locationtracker/TrackerActivity.java b/tests/LocationTracker/src/com/android/locationtracker/TrackerActivity.java index 92e7803..98d0a50 100644 --- a/tests/LocationTracker/src/com/android/locationtracker/TrackerActivity.java +++ b/tests/LocationTracker/src/com/android/locationtracker/TrackerActivity.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2008 Google Inc. + * Copyright (C) 2008 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. diff --git a/tests/LocationTracker/src/com/android/locationtracker/TrackerService.java b/tests/LocationTracker/src/com/android/locationtracker/TrackerService.java index 4206da7..5b75653 100644 --- a/tests/LocationTracker/src/com/android/locationtracker/TrackerService.java +++ b/tests/LocationTracker/src/com/android/locationtracker/TrackerService.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2008 Google Inc. + * Copyright (C) 2008 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. diff --git a/tests/LocationTracker/src/com/android/locationtracker/data/CSVFormatter.java b/tests/LocationTracker/src/com/android/locationtracker/data/CSVFormatter.java index 22ddf45..672ce28 100644 --- a/tests/LocationTracker/src/com/android/locationtracker/data/CSVFormatter.java +++ b/tests/LocationTracker/src/com/android/locationtracker/data/CSVFormatter.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2008 Google Inc. + * Copyright (C) 2008 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. diff --git a/tests/LocationTracker/src/com/android/locationtracker/data/DateUtils.java b/tests/LocationTracker/src/com/android/locationtracker/data/DateUtils.java index 1691f27..13226bd 100644 --- a/tests/LocationTracker/src/com/android/locationtracker/data/DateUtils.java +++ b/tests/LocationTracker/src/com/android/locationtracker/data/DateUtils.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2008 Google Inc. + * Copyright (C) 2008 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. diff --git a/tests/LocationTracker/src/com/android/locationtracker/data/IFormatter.java b/tests/LocationTracker/src/com/android/locationtracker/data/IFormatter.java index d413191..af0b5ed 100644 --- a/tests/LocationTracker/src/com/android/locationtracker/data/IFormatter.java +++ b/tests/LocationTracker/src/com/android/locationtracker/data/IFormatter.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2008 Google Inc. + * Copyright (C) 2008 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. diff --git a/tests/LocationTracker/src/com/android/locationtracker/data/KMLFormatter.java b/tests/LocationTracker/src/com/android/locationtracker/data/KMLFormatter.java index ef4bbbb..a5e1816 100644 --- a/tests/LocationTracker/src/com/android/locationtracker/data/KMLFormatter.java +++ b/tests/LocationTracker/src/com/android/locationtracker/data/KMLFormatter.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2008 Google Inc. + * Copyright (C) 2008 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 diff --git a/tests/LocationTracker/src/com/android/locationtracker/data/TrackerDataHelper.java b/tests/LocationTracker/src/com/android/locationtracker/data/TrackerDataHelper.java index ad25126..a3838df 100644 --- a/tests/LocationTracker/src/com/android/locationtracker/data/TrackerDataHelper.java +++ b/tests/LocationTracker/src/com/android/locationtracker/data/TrackerDataHelper.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2008 Google Inc. + * Copyright (C) 2008 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 diff --git a/tests/LocationTracker/src/com/android/locationtracker/data/TrackerEntry.java b/tests/LocationTracker/src/com/android/locationtracker/data/TrackerEntry.java index 8c961d1..b2741f6 100644 --- a/tests/LocationTracker/src/com/android/locationtracker/data/TrackerEntry.java +++ b/tests/LocationTracker/src/com/android/locationtracker/data/TrackerEntry.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2008 Google Inc. + * Copyright (C) 2008 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 diff --git a/tests/LocationTracker/src/com/android/locationtracker/data/TrackerListHelper.java b/tests/LocationTracker/src/com/android/locationtracker/data/TrackerListHelper.java index 0247ef0..55d4d1e 100644 --- a/tests/LocationTracker/src/com/android/locationtracker/data/TrackerListHelper.java +++ b/tests/LocationTracker/src/com/android/locationtracker/data/TrackerListHelper.java @@ -1,5 +1,5 @@ /*
- * Copyright (C) 2008 Google Inc.
+ * Copyright (C) 2008 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
diff --git a/tests/LocationTracker/src/com/android/locationtracker/data/TrackerProvider.java b/tests/LocationTracker/src/com/android/locationtracker/data/TrackerProvider.java index ea849e0..88f24c3 100644 --- a/tests/LocationTracker/src/com/android/locationtracker/data/TrackerProvider.java +++ b/tests/LocationTracker/src/com/android/locationtracker/data/TrackerProvider.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2008 Google Inc. + * Copyright (C) 2008 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 |
