summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge "Fix crash caused by failed TTS CheckVoiceData."Przemyslaw Szczepaniak2014-02-241-3/+13
|\
| * Fix crash caused by failed TTS CheckVoiceData.Przemyslaw Szczepaniak2014-02-211-3/+13
| | | | | | | | | | Bug: 13112824 Change-Id: Idb46e499fc7982eb92b6ed1a88d7a0725896b4ef
* | am c3e8fd25: am e0388230: am 14136c7c: Merge "Settings: Fix the memory leak ↵Jeff Sharkey2014-02-211-0/+6
|\ \ | |/ |/| | | | | | | | | in Settings" * commit 'c3e8fd25997a70155497358d077e6c8fec6fe981': Settings: Fix the memory leak in Settings
| * am e0388230: am 14136c7c: Merge "Settings: Fix the memory leak in Settings"Jeff Sharkey2014-02-211-0/+6
| |\ | | | | | | | | | | | | * commit 'e0388230768168af31c26507b5889985daa93169': Settings: Fix the memory leak in Settings
| | * am 14136c7c: Merge "Settings: Fix the memory leak in Settings"Jeff Sharkey2014-02-211-0/+6
| | |\ | | | | | | | | | | | | | | | | * commit '14136c7cdfee7525a97cfee6eec038994668b6a5': Settings: Fix the memory leak in Settings
| | | * Merge "Settings: Fix the memory leak in Settings"Jeff Sharkey2014-02-211-0/+6
| | | |\
| | | | * Settings: Fix the memory leak in SettingsZhijun Peng2012-10-191-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixed the memory leak in both InstalledAppDetails Change-Id: I3520b3c1fe1bf98e3baec2ee989eb215164a7cf2 Signed-off-by: Zhijun Peng <pengzhj@marvell.com>
* | | | | Merge "Fix bug #13058470 Cannot add account -- Settings app crashes"Fabrice Di Meglio2014-02-215-22/+17
|\ \ \ \ \
| * | | | | Fix bug #13058470 Cannot add account -- Settings app crashesFabrice Di Meglio2014-02-205-22/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - revert back to an Activity instead of a fragment. This is a straight reverse of the changes introduced for trying to have a Fragment. Basically ChooseAccountActivity was previously an Activity for choosing an account type. If the list of account types was containing only one item, then the ChooseAccountActivity was just a pass thru and was falling back to the only account authority available. In the current reported bug, this was happening by disabling the Email app and thus having only the GoogleAuthenticator as an Authority. Then in the onCreate() the ChooseAccountFragment was seeing that there was only one account authenticator and issuing a BACK button press. Too bad, this was done into a non finished Fragment transaction and leading to a crash. All in all, we NEED to have an Activity and cannot use a Fragment in that case. Change-Id: I4a867a25fe9580929ec50a6775105adac1f88c52
* | | | | | am 8db86bc9: (-s ours) am 1bb55f55: (-s ours) am a9d878ef: (-s ours) am ↵Baligh Uddin2014-02-200-0/+0
|\ \ \ \ \ \ | | |/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | af03def3: (-s ours) am 63a354ee: (-s ours) am d83484db: (-s ours) Import translations. DO NOT MERGE * commit '8db86bc9bc7265d067da92c22e54be98e42b833f': Import translations. DO NOT MERGE
| * | | | | am 1bb55f55: (-s ours) am a9d878ef: (-s ours) am af03def3: (-s ours) am ↵Baligh Uddin2014-02-200-0/+0
| |\ \ \ \ \ | | | |/ / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | 63a354ee: (-s ours) am d83484db: (-s ours) Import translations. DO NOT MERGE * commit '1bb55f555fce1e83bcdc9d154dc6ff714b2a029b': Import translations. DO NOT MERGE
| | * | | | am a9d878ef: (-s ours) am af03def3: (-s ours) am 63a354ee: (-s ours) am ↵Baligh Uddin2014-02-200-0/+0
| | |\ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | d83484db: (-s ours) Import translations. DO NOT MERGE * commit 'a9d878ef67f54c878cef0868767ed8e9a5b8c063': Import translations. DO NOT MERGE
| | * | | | am af03def3: (-s ours) am 63a354ee: (-s ours) am d83484db: (-s ours) Import ↵Baligh Uddin2014-02-200-0/+0
| | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | translations. DO NOT MERGE * commit 'af03def380ca594838ef6caff4f8c23dc78e821c': Import translations. DO NOT MERGE
| | | * \ \ \ am 63a354ee: (-s ours) am d83484db: (-s ours) Import translations. DO NOT MERGEBaligh Uddin2014-02-200-0/+0
| | | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '63a354ee094f3e71773cbdd29359b5c28df2b9f0': Import translations. DO NOT MERGE
| | | | * \ \ \ am d83484db: (-s ours) Import translations. DO NOT MERGEBaligh Uddin2014-02-200-0/+0
| | | | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'd83484dba0749e01cf80a85cd0d2648a79f9fdf4': Import translations. DO NOT MERGE
| | | | | * | | | Import translations. DO NOT MERGEBaligh Uddin2014-02-2023-62/+62
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I96d7cdea504fe320dc1768f1e0dbae23d5901fbd Auto-generated-cl: translation import
* | | | | | | | | Import translations. DO NOT MERGEBaligh Uddin2014-02-2056-56/+61
| |_|_|_|_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Idd6939c2d6ea42d687057848503456b4829bb0d6 Auto-generated-cl: translation import
* | | | | | | | Merge "Fix bug #13084552 Correct list of accounts are not shown when tapping ↵Fabrice Di Meglio2014-02-191-2/+4
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | ...on type of accounts(corporate,google etc.,) in Settings under Accounts section"
| * | | | | | | | Fix bug #13084552 Correct list of accounts are not shown when tappingFabrice Di Meglio2014-02-191-2/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ...on type of accounts(corporate,google etc.,) in Settings under Accounts section - allow Account Type (corporate and the others...) entries to work. Basically as they are sharing the same fragment we could only hit it only once (and the first hit was winning). Change-Id: I16683fc7342564a8ed1a4853a576166ab4d91df9
* | | | | | | | | Merge "Fix bug #12993929 Screen orientation change replaces wifi password ↵Fabrice Di Meglio2014-02-191-11/+9
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | dialog with Add network dialog"
| * | | | | | | | | Fix bug #12993929 Screen orientation change replaces wifi password dialog ↵Fabrice Di Meglio2014-02-181-11/+9
| |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | with Add network dialog - use the correct Fragment manager: it should be the child's one Change-Id: I286b276bc6c5180b7c0e458d8562938671d493c8
* | | | | | | | | Merge "Fix bug #13027956 For restricted user launching Settings app from all ↵Fabrice Di Meglio2014-02-191-1/+2
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | apps drawer ...by default opens wifi setting screen"
| * | | | | | | | | Fix bug #13027956 For restricted user launching Settings app from all apps ↵Fabrice Di Meglio2014-02-181-1/+2
| |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | drawer ...by default opens wifi setting screen - add the Dashboard to the list of restricted fragments Change-Id: I7787ed7c9f2a53ea1047b6ab860ded50e4e5d840
* | | | | | | | | Update verify apps summary stringrich cannings2014-02-181-1/+1
|/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 12836511 Change-Id: I7c198efc03b403f2dfede47648487875bc9b2f82
* | | | | | | | Update verify apps summary stringrich cannings2014-02-181-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 12836511 Change-Id: Ibce824bcef3e3c9a3f9ea69ed4b8425663bbdb12
* | | | | | | | Merge "Improve titles"Fabrice Di Meglio2014-02-186-6/+6
|\ \ \ \ \ \ \ \
| * | | | | | | | Improve titlesFabrice Di Meglio2014-02-136-6/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - makes titles consistent with what is shown into the Drawer and defined into the PreferenceScreen files Change-Id: I6077d947b3afcc63bfbe9c78b973709778064f9b
* | | | | | | | | Merge "Import translations. DO NOT MERGE"Baligh Uddin2014-02-183-5/+5
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Import translations. DO NOT MERGEBaligh Uddin2014-02-173-5/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ifc5a92d261269d729bb216c2acda566ba8091eec Auto-generated-cl: translation import
* | | | | | | | | | Set caption preview font size in dipsAlan Viverette2014-02-172-4/+7
|/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I9844b6f927b557b46f23c6211b5be47647002ab8
* | | | | | | | | Merge "Crash in Settings observed while changing the device orientation ↵Fabrice Di Meglio2014-02-143-9/+12
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | after renamed tablet"
| * | | | | | | | | Crash in Settings observed while changing the device orientation after ↵Fabrice Di Meglio2014-02-143-9/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | renamed tablet There was a fundamental flow in the BT code. Basically BluetoothSettings is using a singleton BluetoothDiscoverableEnabler. BluetoothDiscoverableEnabler is keeping (thru its constructor) a reference on a Context for registering/unregistering some broadcast receiver. BUMMER! When you change orientation (or more generally the device Configuration), your Context is no more the same! Hence the crash as we were trying to unregister a Receiver on a Context that is no more valid. Fix that issue by passing an updated Context to the BluetoothDiscoverableEnabler.resume() API. Bug #12991455 Change-Id: I77db15d2b59b6dd973907e26f9e6bb022202a8b5
* | | | | | | | | | Merge "Code cleaning for Printing Settings"Fabrice Di Meglio2014-02-141-8/+0
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / |/| | | | | | | | |
| * | | | | | | | | Code cleaning for Printing SettingsFabrice Di Meglio2014-02-131-8/+0
| |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - remove non needed code Change-Id: I18a3992d66721dbeba6870aa2834e1c717640a15
* | | | | | | | | Merge "Support default, pattern, pin and password encryption types"Paul Lawrence2014-02-146-44/+241
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Support default, pattern, pin and password encryption typesPaul Lawrence2014-02-116-44/+241
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use plumbing provided by dependant change to bring up correct dialog at boot time. Needs matching framework changes from https://googleplex-android-review.googlesource.com/#/c/412885/ Bug: 8769627 Change-Id: Ib04a2875e051a7cccca035fadb25978dfec22491
* | | | | | | | | | Merge "Import translations. DO NOT MERGE"Baligh Uddin2014-02-133-4/+4
|\ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / |/| | | | | | | | |
| * | | | | | | | | Import translations. DO NOT MERGEBaligh Uddin2014-02-123-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I42687df26965ff4f23fc5ed2db2e93d300aba609 Auto-generated-cl: translation import
* | | | | | | | | | Fix bug #12991557 User taken to previously closed setting optionFabrice Di Meglio2014-02-121-41/+45
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - fix behavior when we are closing the Drawer. Now will not trigger twice the same action - fix selection in the Drawer for "Add Account": it basically should never be selected as it is more like a button - fix also Titles stack when launching an Intent - remove some dead code Change-Id: I196ad9fcd0599703f2abb902b088fbda9b4690a0
* | | | | | | | | | Merge "Fix title when changing from portrait to landscape configuration"Fabrice Di Meglio2014-02-121-10/+53
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Fix title when changing from portrait to landscape configurationFabrice Di Meglio2014-02-121-10/+53
| |/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - save the titles stack during onSaveInstanceState(...) - set it back when creating the activity if there is a savedInstanceState and restore the title to the last item in the stack Change-Id: Ic6c2714f5474275c9f55cc4d6c70d14f6a8cd993
* | | | | | | | | | Fix bug #12979102 Menu (Reset to default) and Add icon missing in APNsFabrice Di Meglio2014-02-114-40/+26
|/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - revert the changes on the ApnSettings to be again an Activity... Change-Id: I7a12e25456f0a0df0f7618183f49fd8db10a5441
* | | | | | | | | Fix bug #12978671 RTE while tapping on Access pointsFabrice Di Meglio2014-02-111-14/+43
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - revert back to a PreferenceActivity Change-Id: Ie79b46908c9d8dcf3c2b77bd0999341c7e72050e
* | | | | | | | | Code cleaningFabrice Di Meglio2014-02-111-40/+28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - remove duplicate reference to current header (mCurHeader) in favor of mCurrentHeader - clean onSaveInstanceState() Change-Id: Ia9322471f0b0d13d51e105c8fd625774d8867fdc
* | | | | | | | | Merge "Fix bug #12957032 Stability-Sys: Java crash in com.android.settings: ↵Fabrice Di Meglio2014-02-111-11/+10
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | java.lang.NullPointerException: ...Attempt to invoke virtual method 'boolean android.os.Handler.sendEmptyMessage(int)' on a null object reference"
| * | | | | | | | | Fix bug #12957032 Stability-Sys: Java crash in com.android.settings: ↵Fabrice Di Meglio2014-02-101-11/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | java.lang.NullPointerException: ...Attempt to invoke virtual method 'boolean android.os.Handler.sendEmptyMessage(int)' on a null object reference - prevent NPE by checking the nullity of the Handler reference - remove dead code - rename mHandler to sHandler as it is a static Change-Id: I7f4101f860f24b0cd49a4656971e9b54e55c1286
* | | | | | | | | | Fix bug #12957228 Java crash in com.android.settings: ↵Fabrice Di Meglio2014-02-111-1/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | java.lang.IllegalStateException: ...Can not perform this action after onSaveInstanceState - prevent a click on the Drawer's Headers when the App is paused / finished - register / unregister the DrawerListener when needed Change-Id: Ia270ef27b23c66d55565bbb73d4f6a6531b742d2
* | | | | | | | | | Merge "Import translations. DO NOT MERGE"Baligh Uddin2014-02-1168-101/+27
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Import translations. DO NOT MERGEBaligh Uddin2014-02-1068-101/+27
| | |/ / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I42c05c7a36d32e5f8dc365b67f84591419ec958a Auto-generated-cl: translation import
* | | | | | | | | | Merge "There are several painful issues with the initial CL. Doing a revert ↵Fabrice Di Meglio2014-02-113-125/+152
|\ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / |/| | | | | | | | | | | | | | | | | | | for now and will rework this."