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
Fabrice Di Meglio
5caff93723
Merge "Fix bug #12907897 Some Developer Options are not disabled when putting Developer Options to "OFF""
2014-02-05 23:10:55 +00:00
Fabrice Di Meglio
1b5edd535f
Fix bug #12907897 Some Developer Options are not disabled when putting Developer Options to "OFF"
...
Was related to "Process Stats" and "Revoke USB debugging informations"
- add the corresponding prefs to the list that enable/disable them
Change-Id: I706c3f5463a23fdfcfd3aae4b48b3cc07f1d823d
2014-02-05 14:57:23 -08:00
Geoff Mendal
44c62f4b04
Merge "Import translations. DO NOT MERGE"
2014-02-05 21:31:25 +00:00
Geoff Mendal
48cbcc3f6f
Import translations. DO NOT MERGE
...
Change-Id: Ie839360615ba80cba4a1aee00f74e50d5c4c387f
Auto-generated-cl: translation import
2014-02-05 13:29:06 -08:00
Fabrice Di Meglio
d3ee9a4541
Merge "Fix Overview position in Drawer"
2014-02-05 21:01:05 +00:00
Fabrice Di Meglio
c27b7d45e9
Fix Overview position in Drawer
...
- makes "Overview" the first entry in the Drawer (it was still under Wireless and Networks)
Change-Id: Iae425b885ea7b8ee611871a1739117341d1c94c1
2014-02-05 12:59:29 -08:00
Fabrice Di Meglio
cc28e4675c
Merge "Fix bug #12903673 Stability: 47 ANRs in com.android.settings"
2014-02-05 20:57:06 +00:00
Fabrice Di Meglio
73f4101383
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 12:53:04 -08:00
Amith Yamasani
126c30a3de
am 8052091f: am aea431f2: am f6971ee1: am 454df35e: am 3c4603ef: am 8f948217: am c68a6bde: am 0ad77445: am 7c0ada65: am 3f722079: am 1ba09366: am 0fce6123: am 7a2d8bd4: am 49d502a4: am c7843db0: Remove unused DebugIntentSender
...
* commit '8052091f46b7c91ea43c99511b5e7775bdeac14e':
Remove unused DebugIntentSender
2014-02-05 20:51:42 +00:00
Amith Yamasani
8052091f46
am aea431f2: am f6971ee1: am 454df35e: am 3c4603ef: am 8f948217: am c68a6bde: am 0ad77445: am 7c0ada65: am 3f722079: am 1ba09366: am 0fce6123: am 7a2d8bd4: am 49d502a4: am c7843db0: Remove unused DebugIntentSender
...
* commit 'aea431f24bc19cc24530cee4db01033f8503a67d':
Remove unused DebugIntentSender
2014-02-05 20:46:37 +00:00
Amith Yamasani
aea431f24b
am f6971ee1: am 454df35e: am 3c4603ef: am 8f948217: am c68a6bde: am 0ad77445: am 7c0ada65: am 3f722079: am 1ba09366: am 0fce6123: am 7a2d8bd4: am 49d502a4: am c7843db0: Remove unused DebugIntentSender
...
* commit 'f6971ee1d52a0e258fa60306b07cb8348d88baf8':
Remove unused DebugIntentSender
2014-02-05 20:43:52 +00:00
Amith Yamasani
f6971ee1d5
am 454df35e: am 3c4603ef: am 8f948217: am c68a6bde: am 0ad77445: am 7c0ada65: am 3f722079: am 1ba09366: am 0fce6123: am 7a2d8bd4: am 49d502a4: am c7843db0: Remove unused DebugIntentSender
...
* commit '454df35ee323ec9ca21b0c1ed982eba263df70e3':
Remove unused DebugIntentSender
2014-02-05 20:40:39 +00:00
Amith Yamasani
454df35ee3
am 3c4603ef: am 8f948217: am c68a6bde: am 0ad77445: am 7c0ada65: am 3f722079: am 1ba09366: am 0fce6123: am 7a2d8bd4: am 49d502a4: am c7843db0: Remove unused DebugIntentSender
...
* commit '3c4603ef1c19510bd4a58aee19935e084603c69b':
Remove unused DebugIntentSender
2014-02-05 20:37:21 +00:00
Amith Yamasani
3c4603ef1c
am 8f948217: am c68a6bde: am 0ad77445: am 7c0ada65: am 3f722079: am 1ba09366: am 0fce6123: am 7a2d8bd4: am 49d502a4: am c7843db0: Remove unused DebugIntentSender
...
* commit '8f9482170835059c11cffa9c554191306db49fbd':
Remove unused DebugIntentSender
2014-02-05 20:35:24 +00:00
Amith Yamasani
8f94821708
am c68a6bde: am 0ad77445: am 7c0ada65: am 3f722079: am 1ba09366: am 0fce6123: am 7a2d8bd4: am 49d502a4: am c7843db0: Remove unused DebugIntentSender
...
* commit 'c68a6bde44203cae70c50f6194cce22c9be5c48e':
Remove unused DebugIntentSender
2014-02-05 12:33:48 -08:00
Amith Yamasani
c68a6bde44
am 0ad77445: am 7c0ada65: am 3f722079: am 1ba09366: am 0fce6123: am 7a2d8bd4: am 49d502a4: am c7843db0: Remove unused DebugIntentSender
...
* commit '0ad774458a627cc4608c717a7efdadf2404d973c':
Remove unused DebugIntentSender
2014-02-05 12:30:42 -08:00
Amith Yamasani
0ad774458a
am 7c0ada65: am 3f722079: am 1ba09366: am 0fce6123: am 7a2d8bd4: am 49d502a4: am c7843db0: Remove unused DebugIntentSender
...
* commit '7c0ada65542f2c9b3899337b085aace13fcc7142':
Remove unused DebugIntentSender
2014-02-05 11:52:23 -08:00
Amith Yamasani
7c0ada6554
am 3f722079: am 1ba09366: am 0fce6123: am 7a2d8bd4: am 49d502a4: am c7843db0: Remove unused DebugIntentSender
...
* commit '3f72207985a5a636d14800d0b8094c28220a8e00':
Remove unused DebugIntentSender
2014-02-05 11:27:30 -08:00
Amith Yamasani
3f72207985
am 1ba09366: am 0fce6123: am 7a2d8bd4: am 49d502a4: am c7843db0: Remove unused DebugIntentSender
...
* commit '1ba09366ccc174d71572ddbe0b80814982d2ae9b':
Remove unused DebugIntentSender
2014-02-05 11:22:46 -08:00
Amith Yamasani
1ba09366cc
am 0fce6123: am 7a2d8bd4: am 49d502a4: am c7843db0: Remove unused DebugIntentSender
...
* commit '0fce6123bddf505d1dab3d7a7daff05a0832c007':
Remove unused DebugIntentSender
2014-02-05 11:19:03 -08:00
Amith Yamasani
0fce6123bd
am 7a2d8bd4: am 49d502a4: am c7843db0: Remove unused DebugIntentSender
...
* commit '7a2d8bd4b008efabd57e258f782e8bb59b5a09df':
Remove unused DebugIntentSender
2014-02-05 11:15:01 -08:00
Amith Yamasani
7a2d8bd4b0
am 49d502a4: am c7843db0: Remove unused DebugIntentSender
...
* commit '49d502a45d9b7536d38210590c99d8c99a43e4d9':
Remove unused DebugIntentSender
2014-02-05 11:09:40 -08:00
Amith Yamasani
49d502a45d
am c7843db0: Remove unused DebugIntentSender
...
* commit 'c7843db06c736ed8b8635f2b5d52fdd891fbf69b':
Remove unused DebugIntentSender
2014-02-05 11:04:25 -08:00
The Android Automerger
2fc8a36486
merge in master-release history after reset to master
2014-02-05 05:51:05 -08:00
Fabrice Di Meglio
0cff0e4a51
Merge "Fix bug #12893337 Crash while set up SIM card lock"
2014-02-04 23:59:11 +00:00
Amith Yamasani
c7843db06c
Remove unused DebugIntentSender
...
Bug: 12722251
Change-Id: Idb5f7e2fcf4da6826c9fcb2499af9cf9c189dfeb
(cherry picked from commit 26430486e4
2014-02-04 23:48:05 +00:00
Fabrice Di Meglio
74abdfd3e6
Fix bug #12893337 Crash while set up SIM card lock
...
- remove Intent declaration in favor of a Fragment
- make PhoneFactory.getDefaultPhone() call work again
Change-Id: Ie1cb6894b0c00361c451af1f8542c905213a3c97
2014-02-04 15:42:47 -08:00
Fabrice Di Meglio
b608b8a434
Fix bug #12895706 BT settings crash with java.lang.ClassCastException: com.android.settings.Settings cannot be cast to android.preference.PreferenceActivity
...
- remove the PreferenceActivity related code as we are no more using PreferenceActivity (and Settings is a derive of
SettingsActivity)
Change-Id: I3c650c03cd205d9c06679974ae4d832ced25459b
2014-02-04 15:15:26 -08:00
Fabrice Di Meglio
3513cda38c
Fix bug #12890909 Tablets: Settings crashes when tapped on Add Account option in settings
...
- remove android:theme="@android:style/Theme.Holo.DialogWhenLarge" for
com.android.settings.Settings$ChooseAccountActivity
Change-Id: Ife94e93e057029a71fe4a276f7ef9b98c9561b87
2014-02-04 15:15:26 -08:00
Fabrice Di Meglio
6a2d0ca9f4
Fix bug #12890490 Crash in Settings observed after tap on Preferred Engine settings and Cloud print option
...
- when setting the Fragment's title use the CharSequence when the titleRes ID is "0"
Change-Id: I54e5379172632acfc967b5ea401ba90f73b41748
2014-02-04 15:15:26 -08:00
Fabrice Di Meglio
90e9e6cd30
Fix bug #12895706 BT settings crash with java.lang.ClassCastException: com.android.settings.Settings cannot be cast to android.preference.PreferenceActivity
...
- remove the PreferenceActivity related code as we are no more using PreferenceActivity (and Settings is a derive of
SettingsActivity)
Change-Id: I3c650c03cd205d9c06679974ae4d832ced25459b
2014-02-04 14:38:59 -08:00
Fabrice Di Meglio
fd34453dd1
Merge "Fix bug #12890909 Tablets: Settings crashes when tapped on Add Account option in settings"
2014-02-04 22:09:26 +00:00
Fabrice Di Meglio
b1b935b0a3
Fix bug #12890909 Tablets: Settings crashes when tapped on Add Account option in settings
...
- remove android:theme="@android:style/Theme.Holo.DialogWhenLarge" for
com.android.settings.Settings$ChooseAccountActivity
Change-Id: Ife94e93e057029a71fe4a276f7ef9b98c9561b87
2014-02-04 14:01:39 -08:00
Fabrice Di Meglio
dc77b738a7
Fix bug #12890490 Crash in Settings observed after tap on Preferred Engine settings and Cloud print option
...
- when setting the Fragment's title use the CharSequence when the titleRes ID is "0"
Change-Id: I54e5379172632acfc967b5ea401ba90f73b41748
2014-02-04 12:41:30 -08:00
The Android Automerger
a4407777d8
merge in master-release history after reset to master
2014-02-04 05:50:19 -08:00
Geoff Mendal
b75d7275c1
Merge "Import translations. DO NOT MERGE"
2014-02-04 02:33:26 +00:00
Fabrice Di Meglio
263bcc8b73
Use Drawer in Settings app
...
- get rid of PreferenceActivity as much as we can and use fragments instead
- add Drawer widget
- add Dashboard high level entry into the Drawer (but this is work in progress and would be done in another CL)
- add bypass of fragment's Header validation when launched from the Drawer but *force* validation if external
call thru an Intent
Be aware that WifiPickerActivity should remain for now a PreferenceActivity. It is used by SetupWizard and should
not trigger running the SettingsActivity's header building code. SetupWizard is a Home during the provisionnig process
and then deactivate itself as a Home but would make the Home header to appear in the Drawer (because momentarily we
would have two Home).
Also, verified that:
- the WiFi settings still work when called from SetupWizard
- when you have multiple Launchers, the Home header will appear in the list of Headers in the Drawer
Change-Id: I407a5e0fdd843ad7615d3d511c416a44e3d97c90
2014-02-03 16:36:46 -08:00
Geoff Mendal
0be91620ad
Import translations. DO NOT MERGE
...
Change-Id: Ic0d6d1818b69a76e523b68dede2b6256b0f16e12
Auto-generated-cl: translation import
2014-02-03 15:31:45 -08:00
The Android Automerger
cd7ded405b
merge in master-release history after reset to master
2014-02-03 05:50:27 -08:00
