OSDN Git Service
Baligh Uddin [Tue, 11 Feb 2014 21:23:27 +0000 (21:23 +0000)]
Merge "Import translations. DO NOT MERGE"
Fabrice Di Meglio [Tue, 11 Feb 2014 19:52:06 +0000 (19:52 +0000)]
Merge "There are several painful issues with the initial CL. Doing a revert for now and will rework this."
Fabrice Di Meglio [Tue, 11 Feb 2014 19:50:56 +0000 (19:50 +0000)]
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
4cc95a53c2d9080095c4e1e06f815b8bc7a2cdfe.
Change-Id: Iaa21d4771d0b004eff3d8e68b91b546a633d8f23
Fabrice Di Meglio [Tue, 11 Feb 2014 00:33:22 +0000 (00:33 +0000)]
Merge "Fix bug #
12939786 BACK should go back into the Fragments BackStack and finally to Overview ...and then exit the Settings App"
Fabrice Di Meglio [Tue, 11 Feb 2014 00:22:28 +0000 (16:22 -0800)]
Fix bug #
12910315 RTE while entering *#*#INFO#*#* command from Dialer
- revert back to PreferenceActivity
Change-Id: I8724886dd9649d649f7cd4730f738fb47727c056
Fabrice Di Meglio [Sat, 8 Feb 2014 02:53:14 +0000 (18:53 -0800)]
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
Baligh Uddin [Mon, 10 Feb 2014 23:09:57 +0000 (15:09 -0800)]
Import translations. DO NOT MERGE
Change-Id: I42c05c7a36d32e5f8dc365b67f84591419ec958a
Auto-generated-cl: translation import
Fabrice Di Meglio [Fri, 7 Feb 2014 01:58:26 +0000 (01:58 +0000)]
Merge "Fix bug #
12919330 RTE in Settings: PhoneFactory probably already running"
Fabrice Di Meglio [Fri, 7 Feb 2014 01:56:39 +0000 (01:56 +0000)]
Merge "Fix bug #
12910775 Settings crash after tap on Access Point Names under Mobile networks"
Fabrice Di Meglio [Fri, 7 Feb 2014 01:51:30 +0000 (17:51 -0800)]
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
Fabrice Di Meglio [Thu, 6 Feb 2014 23:46:19 +0000 (15:46 -0800)]
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
Jeff Sharkey [Thu, 6 Feb 2014 22:43:58 +0000 (22:43 +0000)]
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
Jeff Sharkey [Thu, 6 Feb 2014 22:39:13 +0000 (22:39 +0000)]
am
a5b5bfbb: am
5b4350f2: Merge "Fix memory leak in ManageApplication"
* commit '
a5b5bfbbef09b074328c84f9e1980b62dffab480':
Fix memory leak in ManageApplication
Jeff Sharkey [Thu, 6 Feb 2014 22:36:40 +0000 (22:36 +0000)]
am
1f37bff7: Merge "Total and available fields missing in Settings storage menu"
* commit '
1f37bff7d26aeb3d1f16deb4368f8387e2d4530f':
Total and available fields missing in Settings storage menu
Jeff Sharkey [Thu, 6 Feb 2014 22:31:26 +0000 (22:31 +0000)]
am
5b4350f2: Merge "Fix memory leak in ManageApplication"
* commit '
5b4350f22f81662436992504e711e462de7a790f':
Fix memory leak in ManageApplication
Jeff Sharkey [Thu, 6 Feb 2014 22:29:11 +0000 (22:29 +0000)]
Merge "Total and available fields missing in Settings storage menu"
Jeff Sharkey [Thu, 6 Feb 2014 22:25:30 +0000 (22:25 +0000)]
Merge "Fix memory leak in ManageApplication"
Fabrice Di Meglio [Thu, 6 Feb 2014 19:21:59 +0000 (19:21 +0000)]
Merge "Fix bug #
12890909 Settings crashes when tapped on Add Account option in settings"
Fabrice Di Meglio [Thu, 6 Feb 2014 19:20:24 +0000 (11:20 -0800)]
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
John Reck [Thu, 6 Feb 2014 18:49:09 +0000 (18:49 +0000)]
Merge "Remove overdraw count option"
John Reck [Thu, 6 Feb 2014 00:48:21 +0000 (16:48 -0800)]
Remove overdraw count option
Change-Id: Ia9f794d5817b7dd7a193864575d120d004cb552e
Fabrice Di Meglio [Wed, 5 Feb 2014 23:22:33 +0000 (23:22 +0000)]
Merge "Fix bug #
12898564 Settings Crash on Renaming the device."
Fabrice Di Meglio [Wed, 5 Feb 2014 23:13:46 +0000 (15:13 -0800)]
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
Fabrice Di Meglio [Wed, 5 Feb 2014 23:10:54 +0000 (23:10 +0000)]
Merge "Fix bug #
12907897 Some Developer Options are not disabled when putting Developer Options to "OFF""
Fabrice Di Meglio [Wed, 5 Feb 2014 22:57:23 +0000 (14:57 -0800)]
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
Geoff Mendal [Wed, 5 Feb 2014 21:31:25 +0000 (21:31 +0000)]
Merge "Import translations. DO NOT MERGE"
Geoff Mendal [Wed, 5 Feb 2014 21:29:06 +0000 (13:29 -0800)]
Import translations. DO NOT MERGE
Change-Id: Ie839360615ba80cba4a1aee00f74e50d5c4c387f
Auto-generated-cl: translation import
Fabrice Di Meglio [Wed, 5 Feb 2014 21:01:04 +0000 (21:01 +0000)]
Merge "Fix Overview position in Drawer"
Fabrice Di Meglio [Wed, 5 Feb 2014 20:59:29 +0000 (12:59 -0800)]
Fix Overview position in Drawer
- makes "Overview" the first entry in the Drawer (it was still under Wireless and Networks)
Change-Id: Iae425b885ea7b8ee611871a1739117341d1c94c1
Fabrice Di Meglio [Wed, 5 Feb 2014 20:57:06 +0000 (20:57 +0000)]
Merge "Fix bug #
12903673 Stability: 47 ANRs in com.android.settings"
Fabrice Di Meglio [Wed, 5 Feb 2014 20:53:04 +0000 (12:53 -0800)]
Fix bug #
12903673 Stability: 47 ANRs in com.android.settings
- fix the recursive call (probably introduced by some search/replace)
Change-Id: I563a68c2cc141a59ef8bb9dd64cd67a62dbfcd4a
Amith Yamasani [Wed, 5 Feb 2014 20:51:42 +0000 (20:51 +0000)]
Amith Yamasani [Wed, 5 Feb 2014 20:46:37 +0000 (20:46 +0000)]
Amith Yamasani [Wed, 5 Feb 2014 20:43:52 +0000 (20:43 +0000)]
Amith Yamasani [Wed, 5 Feb 2014 20:40:39 +0000 (20:40 +0000)]
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
Amith Yamasani [Wed, 5 Feb 2014 20:37:21 +0000 (20:37 +0000)]
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
Amith Yamasani [Wed, 5 Feb 2014 20:35:24 +0000 (20:35 +0000)]
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
Amith Yamasani [Wed, 5 Feb 2014 20:33:48 +0000 (12:33 -0800)]
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
Amith Yamasani [Wed, 5 Feb 2014 20:30:42 +0000 (12:30 -0800)]
am
0ad77445: am
7c0ada65: am
3f722079: am
1ba09366: am
0fce6123: am
7a2d8bd4: am
49d502a4: am
c7843db0: Remove unused DebugIntentSender
* commit '
0ad774458a627cc4608c717a7efdadf2404d973c':
Remove unused DebugIntentSender
Amith Yamasani [Wed, 5 Feb 2014 19:52:23 +0000 (11:52 -0800)]
am
7c0ada65: am
3f722079: am
1ba09366: am
0fce6123: am
7a2d8bd4: am
49d502a4: am
c7843db0: Remove unused DebugIntentSender
* commit '
7c0ada65542f2c9b3899337b085aace13fcc7142':
Remove unused DebugIntentSender
Amith Yamasani [Wed, 5 Feb 2014 19:27:30 +0000 (11:27 -0800)]
am
3f722079: am
1ba09366: am
0fce6123: am
7a2d8bd4: am
49d502a4: am
c7843db0: Remove unused DebugIntentSender
* commit '
3f72207985a5a636d14800d0b8094c28220a8e00':
Remove unused DebugIntentSender
Amith Yamasani [Wed, 5 Feb 2014 19:22:46 +0000 (11:22 -0800)]
am
1ba09366: am
0fce6123: am
7a2d8bd4: am
49d502a4: am
c7843db0: Remove unused DebugIntentSender
* commit '
1ba09366ccc174d71572ddbe0b80814982d2ae9b':
Remove unused DebugIntentSender
Amith Yamasani [Wed, 5 Feb 2014 19:19:03 +0000 (11:19 -0800)]
am
0fce6123: am
7a2d8bd4: am
49d502a4: am
c7843db0: Remove unused DebugIntentSender
* commit '
0fce6123bddf505d1dab3d7a7daff05a0832c007':
Remove unused DebugIntentSender
Amith Yamasani [Wed, 5 Feb 2014 19:15:01 +0000 (11:15 -0800)]
am
7a2d8bd4: am
49d502a4: am
c7843db0: Remove unused DebugIntentSender
* commit '
7a2d8bd4b008efabd57e258f782e8bb59b5a09df':
Remove unused DebugIntentSender
Amith Yamasani [Wed, 5 Feb 2014 19:09:40 +0000 (11:09 -0800)]
am
49d502a4: am
c7843db0: Remove unused DebugIntentSender
* commit '
49d502a45d9b7536d38210590c99d8c99a43e4d9':
Remove unused DebugIntentSender
Amith Yamasani [Wed, 5 Feb 2014 19:04:25 +0000 (11:04 -0800)]
am
c7843db0: Remove unused DebugIntentSender
* commit '
c7843db06c736ed8b8635f2b5d52fdd891fbf69b':
Remove unused DebugIntentSender
Fabrice Di Meglio [Tue, 4 Feb 2014 23:59:10 +0000 (23:59 +0000)]
Merge "Fix bug #
12893337 Crash while set up SIM card lock"
Amith Yamasani [Thu, 30 Jan 2014 00:11:03 +0000 (16:11 -0800)]
Remove unused DebugIntentSender
Bug:
12722251
Change-Id: Idb5f7e2fcf4da6826c9fcb2499af9cf9c189dfeb
(cherry picked from commit
26430486e4082c89e31a9489e4309566bda2fec8)
Fabrice Di Meglio [Tue, 4 Feb 2014 23:42:47 +0000 (15:42 -0800)]
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
Fabrice Di Meglio [Tue, 4 Feb 2014 22:20:28 +0000 (14:20 -0800)]
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
Fabrice Di Meglio [Tue, 4 Feb 2014 22:09:26 +0000 (22:09 +0000)]
Merge "Fix bug #
12890909 Tablets: Settings crashes when tapped on Add Account option in settings"
Fabrice Di Meglio [Tue, 4 Feb 2014 22:01:39 +0000 (14:01 -0800)]
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
Fabrice Di Meglio [Tue, 4 Feb 2014 20:41:30 +0000 (12:41 -0800)]
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
Geoff Mendal [Tue, 4 Feb 2014 02:33:25 +0000 (02:33 +0000)]
Merge "Import translations. DO NOT MERGE"
Fabrice Di Meglio [Sat, 18 Jan 2014 03:17:58 +0000 (19:17 -0800)]
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
Geoff Mendal [Mon, 3 Feb 2014 23:31:45 +0000 (15:31 -0800)]
Import translations. DO NOT MERGE
Change-Id: Ic0d6d1818b69a76e523b68dede2b6256b0f16e12
Auto-generated-cl: translation import
Lifu Tang [Fri, 31 Jan 2014 20:46:49 +0000 (20:46 +0000)]
Merge "Used BroadcastReceiver to monitor mode changes"
Lifu Tang [Fri, 31 Jan 2014 02:05:40 +0000 (18:05 -0800)]
Used BroadcastReceiver to monitor mode changes
- Fix b/
10648447
Change-Id: Ic6dc125b6548436e9786e50bc52908c39ea4579a
Amith Yamasani [Fri, 31 Jan 2014 17:00:50 +0000 (17:00 +0000)]
Merge "Remove unused DebugIntentSender"
Brian Carlstrom [Fri, 31 Jan 2014 16:41:22 +0000 (16:41 +0000)]
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
Brian Carlstrom [Fri, 31 Jan 2014 13:00:33 +0000 (13:00 +0000)]
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
Brian Carlstrom [Thu, 30 Jan 2014 21:14:02 +0000 (13:14 -0800)]
packages/apps/Settings: Rename persist.sys.dalvik.vm.lib to allow new default
Bug:
12798969
(cherry picked from commit
7a60db234a367832381edd82235ec6ad5169d926)
Change-Id: I3f72b5ce6c17ffa73f15c237d6bfbda85cdd9239
Brian Carlstrom [Thu, 30 Jan 2014 21:50:52 +0000 (21:50 +0000)]
Merge "packages/apps/Settings: Rename persist.sys.dalvik.vm.lib to allow new default"
Brian Carlstrom [Thu, 30 Jan 2014 21:14:02 +0000 (13:14 -0800)]
packages/apps/Settings: Rename persist.sys.dalvik.vm.lib to allow new default
Bug:
12798969
Change-Id: I1937c2ff758214e1c9d369e475ae4efbba4f9dec
Amith Yamasani [Thu, 30 Jan 2014 00:11:03 +0000 (16:11 -0800)]
Remove unused DebugIntentSender
Bug:
12722251
Change-Id: Idb5f7e2fcf4da6826c9fcb2499af9cf9c189dfeb
John Spurlock [Tue, 28 Jan 2014 15:52:03 +0000 (15:52 +0000)]
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
John Spurlock [Tue, 28 Jan 2014 15:48:12 +0000 (15:48 +0000)]
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
John Spurlock [Tue, 28 Jan 2014 15:44:53 +0000 (15:44 +0000)]
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
John Spurlock [Tue, 28 Jan 2014 15:40:45 +0000 (15:40 +0000)]
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
John Spurlock [Tue, 28 Jan 2014 14:03:41 +0000 (14:03 +0000)]
Merge "'When to daydream' dialog does not follow the JB dialog design guide"
Baligh Uddin [Mon, 27 Jan 2014 20:13:36 +0000 (12:13 -0800)]
Import translations. DO NOT MERGE
Change-Id: I675d41b04b76436681f56c81ffa8986dfda5dfaf
Auto-generated-cl: translation import
Dianne Hackborn [Fri, 24 Jan 2014 23:30:58 +0000 (23:30 +0000)]
Merge "Update to follow per-version proc stats change."
Dianne Hackborn [Fri, 24 Jan 2014 02:02:08 +0000 (02:02 +0000)]
Merge "Battery: report calculated power, tweak signal strength colors."
Dianne Hackborn [Fri, 24 Jan 2014 01:59:49 +0000 (17:59 -0800)]
Update to follow per-version proc stats change.
Change-Id: Iea44f1c7e9bd59a2eeaa1739bbaa5c0bdc349b0b
Baligh Uddin [Thu, 23 Jan 2014 18:03:30 +0000 (10:03 -0800)]
Import translations. DO NOT MERGE
Change-Id: Id0ec338a7ae2f850b102eff2f2a5f8df5cc0e493
Auto-generated-cl: translation import
Per Allard [Tue, 25 Jun 2013 07:54:13 +0000 (09:54 +0200)]
'When to daydream' dialog does not follow the JB dialog design guide
The dialog is a single selection popup and according to the
dialogs design guide the popup should close when the user
has make his/her choice, but in this case it does not.
Change-Id: Iac6bc19146a88236d3253d2d846212ce09b4925b
Dianne Hackborn [Wed, 22 Jan 2014 22:18:39 +0000 (14:18 -0800)]
Battery: report calculated power, tweak signal strength colors.
BatteryHistoryHelper now computes the total power to be the total
including the unaccounted, so we don't go > 100%. However for the
unaccounted/over-counted details, we want to report the actual
computed amount. Use a new API to do this.
Also tweak the signal strength colors so that the "no signal" state
is stronger, by being reddish instead of bright yellow.
Change-Id: I6af9fbcce8c3324883db0184f7ac215cb41b6230
Wei Wang [Thu, 16 Jan 2014 23:26:57 +0000 (23:26 +0000)]
Merge "Fix misspell of "otherdevices""
Wei Wang [Thu, 16 Jan 2014 22:09:14 +0000 (14:09 -0800)]
Fix misspell of "otherdevices"
Bug:
12569650
Change-Id: I2c75ddfed22ded6a15291956c0c167acf6d67b0b
Dianne Hackborn [Thu, 16 Jan 2014 01:39:21 +0000 (01:39 +0000)]
Merge "Switch to BatteryStatsHelper implementation in the framework."
Geoff Mendal [Thu, 16 Jan 2014 00:59:04 +0000 (00:59 +0000)]
Merge "Import translations. DO NOT MERGE"
Dianne Hackborn [Thu, 16 Jan 2014 00:24:05 +0000 (16:24 -0800)]
Switch to BatteryStatsHelper implementation in the framework.
Change-Id: I3ad051e029885af70a6bd14a1351b32860ba565d
Fabrice Di Meglio [Thu, 16 Jan 2014 00:06:45 +0000 (00:06 +0000)]
Merge "More code cleaning (missing items)"
Geoff Mendal [Wed, 15 Jan 2014 21:20:24 +0000 (13:20 -0800)]
Import translations. DO NOT MERGE
Change-Id: I7aa8da8f75c22a70283b7125d993c3e38164cf4e
Auto-generated-cl: translation import
Selim Gurun [Wed, 15 Jan 2014 19:46:24 +0000 (19:46 +0000)]
Merge "Display certificate chain"
Wei Wang [Wed, 15 Jan 2014 07:33:32 +0000 (23:33 -0800)]
Merge commit '
f4f8d9f3' into manualmerge
Conflicts:
res/values/strings.xml
Change-Id: Ifbcd6ef2447dbb95aab0ed1971f63a16ecf8035c
Wei Wang [Wed, 15 Jan 2014 06:33:21 +0000 (22:33 -0800)]
Merge commit '
fc8d2556' into manualmerge
Conflicts:
res/values/strings.xml
Change-Id: Ia2a4480d13f5afae7ecef321dadf5c4686907d99
Wei Wang [Tue, 19 Nov 2013 09:32:10 +0000 (01:32 -0800)]
BLE peripheral mode (4/4): Settings change for advertising preference.
Change-Id: I5721f136267fe25e55f764bb4a6c53acd45b318b
Wei Wang [Wed, 13 Nov 2013 01:27:03 +0000 (17:27 -0800)]
Add ble settings strings.
Change-Id: If8685aac2f36f56a534f3ba47b1cc60fed88a8a3
Wei Wang [Wed, 15 Jan 2014 01:43:36 +0000 (01:43 +0000)]
Merge "BLE peripheral mode (4/4): Settings change for advertising preference."
Fabrice Di Meglio [Wed, 15 Jan 2014 00:32:10 +0000 (16:32 -0800)]
More code cleaning (missing items)
- corrected the missed "switch_" variable naming
- optimize imports more
Change-Id: I8501c99d65e91f26fc56f589e02a1fd1be3d81a3
Fabrice Di Meglio [Tue, 14 Jan 2014 22:23:50 +0000 (22:23 +0000)]
Merge "More code cleaning"
Fabrice Di Meglio [Tue, 14 Jan 2014 21:57:44 +0000 (13:57 -0800)]
More code cleaning
- remove some dead code
- better variable naming
- add debug log for exception
- clean some unused imports
Change-Id: Iec4239a7e75f29d860f286ab089e748e8a672281
Jun Su [Thu, 18 Jul 2013 09:43:26 +0000 (17:43 +0800)]
Fix memory leak in ManageApplication
ApplicationsAdapter new a Session member and make it has a reference to
it self. If we don't release it explicitly, the cross reference will
cause memory leak.
Change-Id: Iecce35ae1d56d98cee6347e84d3a3ff57f3b15a5
Dianne Hackborn [Tue, 14 Jan 2014 01:52:12 +0000 (01:52 +0000)]
Merge "Add "unaccounted" item to battery use UI."
Wei Wang [Tue, 19 Nov 2013 09:32:10 +0000 (01:32 -0800)]
BLE peripheral mode (4/4): Settings change for advertising preference.
Change-Id: I5721f136267fe25e55f764bb4a6c53acd45b318b
Dianne Hackborn [Tue, 14 Jan 2014 01:40:50 +0000 (17:40 -0800)]
Add "unaccounted" item to battery use UI.
Kind-of informative.
Change-Id: I10d2ee1ad8fe598a1ce1989df6628da11b82d906
Andres Morales [Tue, 14 Jan 2014 00:26:37 +0000 (00:26 +0000)]
Merge "Reduce timeout of dismissing pairing dialog on success"
Geoff Mendal [Mon, 13 Jan 2014 22:04:01 +0000 (14:04 -0800)]
Import translations. DO NOT MERGE
Change-Id: I0637da71be16cac3c7f383840b4ad293e13dcf0e
Auto-generated-cl: translation import
Jeff Sharkey [Fri, 10 Jan 2014 23:16:22 +0000 (23:16 +0000)]
am
ba646e3a: am
0cd68e04: am
859909fe: am
b5377a71: Merge "Fix null pointer exceptions in NetworkPolicyEditor"
* commit '
ba646e3af11db80936ad9f8df20deb7a318ed46a':
Fix null pointer exceptions in NetworkPolicyEditor
OSDN Git Service
