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
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
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
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
Lifu Tang
af79ddb358
Merge "Used BroadcastReceiver to monitor mode changes"
2014-01-31 20:46:49 +00:00
Lifu Tang
72bafff2b8
Used BroadcastReceiver to monitor mode changes
...
- Fix b/10648447
Change-Id: Ic6dc125b6548436e9786e50bc52908c39ea4579a
2014-01-31 12:20:23 -08:00
Amith Yamasani
a265301e09
Merge "Remove unused DebugIntentSender"
2014-01-31 17:00:50 +00:00
Brian Carlstrom
b798cfddae
am 0105c005
: am f2e9be9a
: Merge "packages/apps/Settings: Rename persist.sys.dalvik.vm.lib to allow new default"
...
* commit '0105c0051980430a0ceeb13d71daa2f70efc7e68':
packages/apps/Settings: Rename persist.sys.dalvik.vm.lib to allow new default
2014-01-31 16:41:22 +00:00
Brian Carlstrom
0105c00519
am f2e9be9a
: Merge "packages/apps/Settings: Rename persist.sys.dalvik.vm.lib to allow new default"
...
* commit 'f2e9be9a4bb4c030c9bbcb29990e8b22bab809e4':
packages/apps/Settings: Rename persist.sys.dalvik.vm.lib to allow new default
2014-01-31 13:00:33 +00:00
Brian Carlstrom
57b670e390
packages/apps/Settings: Rename persist.sys.dalvik.vm.lib to allow new default
...
Bug: 12798969
(cherry picked from commit 7a60db234a
)
Change-Id: I3f72b5ce6c17ffa73f15c237d6bfbda85cdd9239
2014-01-30 16:30:00 -08:00
Brian Carlstrom
f2e9be9a4b
Merge "packages/apps/Settings: Rename persist.sys.dalvik.vm.lib to allow new default"
2014-01-30 21:50:53 +00:00
Brian Carlstrom
7a60db234a
packages/apps/Settings: Rename persist.sys.dalvik.vm.lib to allow new default
...
Bug: 12798969
Change-Id: I1937c2ff758214e1c9d369e475ae4efbba4f9dec
2014-01-30 13:17:08 -08:00
Amith Yamasani
26430486e4
Remove unused DebugIntentSender
...
Bug: 12722251
Change-Id: Idb5f7e2fcf4da6826c9fcb2499af9cf9c189dfeb
2014-01-29 16:11:03 -08:00
John Spurlock
e4255d3c3b
am af87ce09
: am 04119285
: am cb8a5354
: am 3f0f02b9
: Merge "\'When to daydream\' dialog does not follow the JB dialog design guide"
...
* commit 'af87ce09915ae1b5cc3c3a46ab9fb241df1be13d':
'When to daydream' dialog does not follow the JB dialog design guide
2014-01-28 15:52:03 +00:00
John Spurlock
af87ce0991
am 04119285
: am cb8a5354
: am 3f0f02b9
: Merge "\'When to daydream\' dialog does not follow the JB dialog design guide"
...
* commit '041192855ed8b025246578d80f0b372bf346a2f1':
'When to daydream' dialog does not follow the JB dialog design guide
2014-01-28 15:48:12 +00:00
John Spurlock
041192855e
am cb8a5354
: am 3f0f02b9
: Merge "\'When to daydream\' dialog does not follow the JB dialog design guide"
...
* commit 'cb8a53541ec142ee5d57f163496583518ddb5c6e':
'When to daydream' dialog does not follow the JB dialog design guide
2014-01-28 15:44:53 +00:00
John Spurlock
cb8a53541e
am 3f0f02b9
: Merge "\'When to daydream\' dialog does not follow the JB dialog design guide"
...
* commit '3f0f02b94e5be6724659f860aef5e637ff61d3aa':
'When to daydream' dialog does not follow the JB dialog design guide
2014-01-28 15:40:45 +00:00
John Spurlock
3f0f02b94e
Merge "'When to daydream' dialog does not follow the JB dialog design guide"
2014-01-28 14:03:41 +00:00
Baligh Uddin
a101937354
Import translations. DO NOT MERGE
...
Change-Id: I675d41b04b76436681f56c81ffa8986dfda5dfaf
Auto-generated-cl: translation import
2014-01-27 12:13:36 -08:00
Dianne Hackborn
f87420af4c
Merge "Update to follow per-version proc stats change."
2014-01-24 23:30:59 +00:00
Dianne Hackborn
627b4e2eb5
Merge "Battery: report calculated power, tweak signal strength colors."
2014-01-24 02:02:08 +00:00
Dianne Hackborn
ab89566e82
Update to follow per-version proc stats change.
...
Change-Id: Iea44f1c7e9bd59a2eeaa1739bbaa5c0bdc349b0b
2014-01-23 17:59:49 -08:00
Baligh Uddin
e22559c5f5
Import translations. DO NOT MERGE
...
Change-Id: Id0ec338a7ae2f850b102eff2f2a5f8df5cc0e493
Auto-generated-cl: translation import
2014-01-23 10:03:30 -08:00