Commit Graph

13519 Commits

Author SHA1 Message Date
Fabrice Di Meglio
4aca90c2da Merge "Code cleaning for Printing Settings" 2014-02-14 23:50:23 +00:00
Paul Lawrence
b643627651 Merge "Support default, pattern, pin and password encryption types" 2014-02-14 15:25:25 +00:00
Fabrice Di Meglio
5c2d723723 Code cleaning for Printing Settings
- remove non needed code

Change-Id: I18a3992d66721dbeba6870aa2834e1c717640a15
2014-02-13 19:00:38 -08:00
Fabrice Di Meglio
c169ee6fdc Improve titles
- makes titles consistent with what is shown into the Drawer and
defined into the PreferenceScreen files

Change-Id: I6077d947b3afcc63bfbe9c78b973709778064f9b
2014-02-13 18:55:15 -08:00
The Android Automerger
fafb617a3b merge in master-release history after reset to master 2014-02-13 05:50:24 -08:00
Baligh Uddin
ba8b9bec61 Merge "Import translations. DO NOT MERGE" 2014-02-13 05:19:03 +00:00
Fabrice Di Meglio
a7ad619af4 Fix bug #12991557 User taken to previously closed setting option
- 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
2014-02-12 16:37:04 -08:00
Fabrice Di Meglio
de40d9ed2f Merge "Fix title when changing from portrait to landscape configuration" 2014-02-12 22:46:51 +00:00
Baligh Uddin
2b2b4960b8 Import translations. DO NOT MERGE
Change-Id: I42687df26965ff4f23fc5ed2db2e93d300aba609
Auto-generated-cl: translation import
2014-02-12 12:46:26 -08:00
Fabrice Di Meglio
5529d29f6c Fix title when changing from portrait to landscape configuration
- 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
2014-02-12 12:38:07 -08:00
The Android Automerger
fa4ff7df3e merge in master-release history after reset to master 2014-02-12 05:49:54 -08:00
Fabrice Di Meglio
e6c9a5da01 Fix bug #12979102 Menu (Reset to default) and Add icon missing in APNs
- revert the changes on the ApnSettings to be again an Activity...

Change-Id: I7a12e25456f0a0df0f7618183f49fd8db10a5441
2014-02-11 19:03:27 -08:00
Fabrice Di Meglio
710e309951 Fix bug #12978671 RTE while tapping on Access points
- revert back to a PreferenceActivity

Change-Id: Ie79b46908c9d8dcf3c2b77bd0999341c7e72050e
2014-02-11 18:27:38 -08:00
Fabrice Di Meglio
3b6cbdc6a2 Fix bug #12957032 Stability-Sys: Java crash in com.android.settings: 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
2014-02-11 16:26:31 -08:00
Fabrice Di Meglio
6502720566 Code cleaning
- remove duplicate reference to current header (mCurHeader) in favor of mCurrentHeader
- clean onSaveInstanceState()

Change-Id: Ia9322471f0b0d13d51e105c8fd625774d8867fdc
2014-02-11 15:27:00 -08:00
Fabrice Di Meglio
a16bd76d45 Merge "Fix bug #12957032 Stability-Sys: Java crash in com.android.settings: java.lang.NullPointerException: ...Attempt to invoke virtual method 'boolean android.os.Handler.sendEmptyMessage(int)' on a null object reference" 2014-02-11 21:50:18 +00:00
Fabrice Di Meglio
7ce7c40dac Fix bug #12957228 Java crash in com.android.settings: 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
2014-02-11 13:31:39 -08:00
Baligh Uddin
ef2b359b48 Merge "Import translations. DO NOT MERGE" 2014-02-11 21:23:28 +00:00
Fabrice Di Meglio
6ad8e9ed38 There are several painful issues with the initial CL. Doing a revert for now and will rework this.
Revert "Fix bug #12939786 BACK should go back into the Fragments BackStack and finally to Overview ...and then exit the Settings App"

This reverts commit 4cc95a53c2.

Change-Id: Iaa21d4771d0b004eff3d8e68b91b546a633d8f23
2014-02-11 12:18:34 -08:00
Fabrice Di Meglio
edf696774e Merge "There are several painful issues with the initial CL. Doing a revert for now and will rework this." 2014-02-11 19:52:06 +00:00
Fabrice Di Meglio
10afdb82ac There are several painful issues with the initial CL. Doing a revert for now and will rework this.
Revert "Fix bug #12939786 BACK should go back into the Fragments BackStack and finally to Overview ...and then exit the Settings App"

This reverts commit 4cc95a53c2.

Change-Id: Iaa21d4771d0b004eff3d8e68b91b546a633d8f23
2014-02-11 19:50:56 +00:00
Paul Lawrence
b05f39d186 Support default, pattern, pin and password encryption types
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
2014-02-11 10:27:58 -08:00
The Android Automerger
099c299433 merge in master-release history after reset to master 2014-02-11 05:50:09 -08:00
Fabrice Di Meglio
002b29fafc Fix bug #12957032 Stability-Sys: Java crash in com.android.settings: 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
2014-02-10 17:39:01 -08:00
Fabrice Di Meglio
1ffab228a4 Merge "Fix bug #12939786 BACK should go back into the Fragments BackStack and finally to Overview ...and then exit the Settings App" 2014-02-11 00:33:22 +00:00
Fabrice Di Meglio
768201371d Fix bug #12910315 RTE while entering *#*#INFO#*#* command from Dialer
- revert back to PreferenceActivity

Change-Id: I8724886dd9649d649f7cd4730f738fb47727c056
2014-02-10 16:27:24 -08:00
Fabrice Di Meglio
4cc95a53c2 Fix bug #12939786 BACK should go back into the Fragments BackStack and finally to Overview
...and then exit the Settings App

- fix the way we manage the Fragment BackStack
- revert back ChooseLockGeneric to be a PreferenceActivity

Change-Id: I3c366b4be606e2e211facd0299b9a2de5cc6ea79
2014-02-10 16:07:50 -08:00
Baligh Uddin
780f729f71 Import translations. DO NOT MERGE
Change-Id: I42c05c7a36d32e5f8dc365b67f84591419ec958a
Auto-generated-cl: translation import
2014-02-10 15:09:57 -08:00
The Android Automerger
a1e96fd136 merge in master-release history after reset to master 2014-02-10 05:50:35 -08:00
Fabrice Di Meglio
011c262e0d Fix bug #12910775 Settings crash after tap on Access Point Names under Mobile networks
- ApnSettings is now a fragment so introduce a new ApnSettingsActivity
- ApsSettingsActivity will use the ApnSettings fragment
- move the getListView() call to onActivityCreated(...) as the ListView
needs to be created before this call can be done.
- add also an alias for the old activity name ".ApsSettings"

Change-Id: Id228722d7f34415d4b036282f0845e28546111df
2014-02-07 13:57:59 -08:00
Fabrice Di Meglio
c94122a199 Merge "Fix bug #12919330 RTE in Settings: PhoneFactory probably already running" 2014-02-07 01:58:26 +00:00
Fabrice Di Meglio
1c3e565726 Merge "Fix bug #12910775 Settings crash after tap on Access Point Names under Mobile networks" 2014-02-07 01:56:39 +00:00
Fabrice Di Meglio
3065f75e16 Fix bug #12919330 RTE in Settings: PhoneFactory probably already running
- revert changes from the CL for Drawer implementation.
- we cannot convert those Activities to fragments as they are running in the Phone process

Change-Id: I7e4033bc9b53daa7e7aa6f1fd74576375cde88e9
2014-02-06 17:51:30 -08:00
Fabrice Di Meglio
ca915668af Fix bug #12910775 Settings crash after tap on Access Point Names under Mobile networks
- ApnSettings is now a fragment so introduce a new ApnSettingsActivity
- ApsSettingsActivity will use the ApnSettings fragment
- move the getListView() call to onActivityCreated(...) as the ListView
needs to be created before this call can be done.
- add also an alias for the old activity name ".ApsSettings"

Change-Id: Id228722d7f34415d4b036282f0845e28546111df
2014-02-06 17:23:03 -08:00
Jeff Sharkey
4d6fe13707 am abe6b835: am 1f37bff7: Merge "Total and available fields missing in Settings storage menu"
* commit 'abe6b83559d17111d067dfdef22d07cb50c302c0':
  Total and available fields missing in Settings storage menu
2014-02-06 22:43:58 +00:00
Jeff Sharkey
b5ba7e2435 am a5b5bfbb: am 5b4350f2: Merge "Fix memory leak in ManageApplication"
* commit 'a5b5bfbbef09b074328c84f9e1980b62dffab480':
  Fix memory leak in ManageApplication
2014-02-06 22:39:13 +00:00
Jeff Sharkey
abe6b83559 am 1f37bff7: Merge "Total and available fields missing in Settings storage menu"
* commit '1f37bff7d26aeb3d1f16deb4368f8387e2d4530f':
  Total and available fields missing in Settings storage menu
2014-02-06 22:36:40 +00:00
Jeff Sharkey
a5b5bfbbef am 5b4350f2: Merge "Fix memory leak in ManageApplication"
* commit '5b4350f22f81662436992504e711e462de7a790f':
  Fix memory leak in ManageApplication
2014-02-06 22:31:26 +00:00
Jeff Sharkey
1f37bff7d2 Merge "Total and available fields missing in Settings storage menu" 2014-02-06 22:29:11 +00:00
Jeff Sharkey
5b4350f22f Merge "Fix memory leak in ManageApplication" 2014-02-06 22:25:30 +00:00
Fabrice Di Meglio
c4776b90fc Fix bug #12890909 Settings crashes when tapped on Add Account option in settings
Follow up from the previous CL that was trying to fix it.

- remove the dialog theme android:theme="@android:style/Theme.Holo.Dialog" as
a Dialog does not support a Drawwer

Change-Id: I8b3fe89c157f0b454464c04a4acd4f32049bde71
2014-02-06 11:43:06 -08:00
Fabrice Di Meglio
d3aee23cb6 Merge "Fix bug #12890909 Settings crashes when tapped on Add Account option in settings" 2014-02-06 19:21:59 +00:00
Fabrice Di Meglio
a55f66a8e7 Fix bug #12890909 Settings crashes when tapped on Add Account option in settings
Follow up from the previous CL that was trying to fix it.

- remove the dialog theme android:theme="@android:style/Theme.Holo.Dialog" as
a Dialog does not support a Drawwer

Change-Id: I8b3fe89c157f0b454464c04a4acd4f32049bde71
2014-02-06 11:20:24 -08:00
John Reck
1b7bf5eaae Merge "Remove overdraw count option" 2014-02-06 18:49:09 +00:00
The Android Automerger
a26ff479d1 merge in master-release history after reset to master 2014-02-06 05:50:48 -08:00
John Reck
a097c22662 Remove overdraw count option
Change-Id: Ia9f794d5817b7dd7a193864575d120d004cb552e
2014-02-05 16:48:21 -08:00
Fabrice Di Meglio
6f77c70877 Fix bug #12898564 Settings Crash on Renaming the device.
- remove the call to PreferencesActivity as we are no more using the PreferencesActivity

Also set correct activity title with the new selected BT name for the device.

Change-Id: I03497187e0410ff2bba87bdb04a197938d1ea967
2014-02-05 15:29:07 -08:00
Fabrice Di Meglio
49d98bb566 Fix bug #12903673 Stability: 47 ANRs in com.android.settings
- fix the recursive call (probably introduced by some search/replace)

Change-Id: I563a68c2cc141a59ef8bb9dd64cd67a62dbfcd4a
2014-02-05 15:29:07 -08:00
Fabrice Di Meglio
00c7ce15f6 Merge "Fix bug #12898564 Settings Crash on Renaming the device." 2014-02-05 23:22:33 +00:00
Fabrice Di Meglio
3b52963edf Fix bug #12898564 Settings Crash on Renaming the device.
- remove the call to PreferencesActivity as we are no more using the PreferencesActivity

Also set correct activity title with the new selected BT name for the device.

Change-Id: I03497187e0410ff2bba87bdb04a197938d1ea967
2014-02-05 15:18:18 -08:00