OSDN Git Service
Ben Komalo [Thu, 18 Aug 2011 21:50:26 +0000 (14:50 -0700)]
Stop leaking wakelocks in cryptkeeper.
Also add in logging for certain events, as well as progress update to
help hunt down a stuck-in-progress bug
Bug:
5163155
Change-Id: I2e01a56b012f41f178beba0becfbe8173a1715ee
Justin Ho [Wed, 17 Aug 2011 21:18:05 +0000 (14:18 -0700)]
Merge "Part of effort to remove "failure" messaging to end-users. Bug:
5165745"
Jeff Sharkey [Wed, 17 Aug 2011 21:09:42 +0000 (14:09 -0700)]
Merge "Remove "background data" from accounts settings."
Ben Komalo [Wed, 17 Aug 2011 00:48:42 +0000 (17:48 -0700)]
Fixes to CryptKeeper layout for phones
- prevents crash when trying to show error state
- makes progress screen not look horribly broken
Bug:
5174783
Bug:
4671153
Change-Id: Ia72830e2fdb72f174b3ed01b6fc14be7152d1932
Ben Komalo [Wed, 17 Aug 2011 18:08:15 +0000 (11:08 -0700)]
Merge "Allow CryptKeeper to be started for UI debugging"
Amith Yamasani [Wed, 17 Aug 2011 17:54:31 +0000 (10:54 -0700)]
Merge "Match preference title with dialog title for font size."
Ben Komalo [Wed, 17 Aug 2011 00:48:25 +0000 (17:48 -0700)]
Allow CryptKeeper to be started for UI debugging
Change-Id: I3ca6e00018da39123b470c3960c00c8cd43f9f72
Irfan Sheriff [Wed, 17 Aug 2011 03:48:45 +0000 (20:48 -0700)]
Merge "Changed wifi status lines per UX consult"
Amith Yamasani [Wed, 17 Aug 2011 01:25:40 +0000 (18:25 -0700)]
Match preference title with dialog title for font size.
Bug:
5156411
Change-Id: I4894dbf9fd4fbb70d1ec95c01503f3594b366120
Jeff Sharkey [Wed, 17 Aug 2011 00:28:15 +0000 (17:28 -0700)]
Remove "background data" from accounts settings.
This has been replaced by setting in data usage panel.
Bug:
4979025
Change-Id: I4e3011233aa2522c05b1497abc54fd421f4a25fb
Isaac Levy [Fri, 12 Aug 2011 06:55:04 +0000 (23:55 -0700)]
Changed wifi status lines per UX consult
Change-Id: I656fa2c5c52338b320796a919edb5018e7b68851
Claudia de Veaux [Tue, 16 Aug 2011 23:29:03 +0000 (16:29 -0700)]
Part of effort to remove "failure" messaging to end-users.
Bug:
5165745
Change-Id: I26ba08c783ede59e503deea2f1018af503fa0f33
repo sync [Tue, 16 Aug 2011 21:51:06 +0000 (14:51 -0700)]
Merge "Use updated wifip2pmanager API"
Amith Yamasani [Tue, 16 Aug 2011 20:36:52 +0000 (13:36 -0700)]
Adjust the margins for the volume seekbars.
Bug:
5165547
Change-Id: Ic82c03a4b39895f872bfd8ef4e46c795502f78a4
Jeff Sharkey [Tue, 16 Aug 2011 01:44:17 +0000 (18:44 -0700)]
Merge "Foreground/background network stats pie chart."
Jake Hamby [Mon, 15 Aug 2011 23:02:47 +0000 (16:02 -0700)]
Merge "Bluetooth : fix for Settings crashes while rotating the screen."
Jeff Sharkey [Fri, 12 Aug 2011 01:26:57 +0000 (18:26 -0700)]
Foreground/background network stats pie chart.
Load foreground/background network stats, showing combined in chart
series, and also separated in pie chart. Padding to match spec,
updated action bar tabs, and limit width for wide devices. Also
clear UI options for requesting fragments. Move to action bar
overflow menu instead of custom icon. Show detail chart data outside
current inspection range.
Bug:
5106163,
5143670,
5163064,
5162671,
5148713,
5129036,
5096626
Change-Id: I548fef209e1f714f70ee6bf7098dbdb881692df4
jhtop.kim [Wed, 20 Jul 2011 05:03:07 +0000 (14:03 +0900)]
Bluetooth : fix for Settings crashes while rotating the screen.
- Add some codes preventing setting crash when rotating the screen
when the Rename device or Visibility timeout dialogs are visible.
Change-Id: I5e142a5d869a0d5c91c6ace80093d09178d79558
Signed-off-by: jhtop.kim <jhtop.kim@samsung.com>
Eric Fischer [Mon, 15 Aug 2011 17:22:27 +0000 (10:22 -0700)]
Merge "Import revised translations."
Christopher Tate [Sat, 13 Aug 2011 00:34:54 +0000 (17:34 -0700)]
Merge "Move the desktop backup pw from "Backup and reset" to "Developer" settings"
Christopher Tate [Sat, 13 Aug 2011 00:22:41 +0000 (17:22 -0700)]
Move the desktop backup pw from "Backup and reset" to "Developer" settings
Addresses bug
5136161
Change-Id: Ia26258e0c8b0378184e4bac32a5da47de5da686f
Eric Fischer [Sat, 13 Aug 2011 00:21:28 +0000 (17:21 -0700)]
Import revised translations.
Change-Id: I5792da0377dcc34efd14e0c23db5b85d5a6382ae
Amith Yamasani [Fri, 12 Aug 2011 23:26:54 +0000 (16:26 -0700)]
am
7e1c6cc0: am
d7d6c7ff: am
34d9b03f: Merge "Fix wrong behavior when changing pin code in settings"
* commit '
7e1c6cc0fe3c3520d9d026c0dabbfb6e38113df9':
Fix wrong behavior when changing pin code in settings
Amith Yamasani [Fri, 12 Aug 2011 23:26:49 +0000 (16:26 -0700)]
am
f14f96ef: am
b3f6116e: am
fd73824d: Merge "Fix: Text is cut in Edit word edit box when adding word to dictionary"
* commit '
f14f96efa831e9a81983869d8959e7cef6caba9a':
Fix: Text is cut in Edit word edit box when adding word to dictionary
Amith Yamasani [Fri, 12 Aug 2011 22:43:43 +0000 (15:43 -0700)]
Merge "Potential fix for NPE in AccessibilitySettings."
Gilles Debunne [Fri, 12 Aug 2011 20:53:43 +0000 (13:53 -0700)]
Merge "Format volume option restored"
Amith Yamasani [Fri, 12 Aug 2011 20:16:18 +0000 (13:16 -0700)]
am
d7d6c7ff: am
34d9b03f: Merge "Fix wrong behavior when changing pin code in settings"
* commit '
d7d6c7ffad195e40db69c9ea0401f6717bcaeaf0':
Fix wrong behavior when changing pin code in settings
Amith Yamasani [Fri, 12 Aug 2011 20:16:17 +0000 (13:16 -0700)]
am
b3f6116e: am
fd73824d: Merge "Fix: Text is cut in Edit word edit box when adding word to dictionary"
* commit '
b3f6116e2bd8bfa1b23b724526badaa6b1602a12':
Fix: Text is cut in Edit word edit box when adding word to dictionary
Amith Yamasani [Fri, 12 Aug 2011 18:14:51 +0000 (11:14 -0700)]
Potential fix for NPE in AccessibilitySettings.
Bug:
5093363
Change-Id: I1e6b9bf0fd25b0298606035155bb87e6f64711c4
satok [Fri, 12 Aug 2011 02:45:52 +0000 (11:45 +0900)]
Fix the title of the input method subtype enabler
Bug:
5097548
Change-Id: If01e13bd1ab7ac851b613450018f68f7f42f1e14
Amith Yamasani [Thu, 11 Aug 2011 19:44:55 +0000 (12:44 -0700)]
am
34d9b03f: Merge "Fix wrong behavior when changing pin code in settings"
* commit '
34d9b03f1c6c5bf7d8caa74dc07124a6e67f89d5':
Fix wrong behavior when changing pin code in settings
Amith Yamasani [Thu, 11 Aug 2011 19:33:37 +0000 (12:33 -0700)]
Merge "Fix wrong behavior when changing pin code in settings"
Irfan Sheriff [Thu, 11 Aug 2011 19:33:29 +0000 (12:33 -0700)]
Merge "Wifi state reset when disconnected"
Amith Yamasani [Thu, 11 Aug 2011 19:31:47 +0000 (12:31 -0700)]
am
fd73824d: Merge "Fix: Text is cut in Edit word edit box when adding word to dictionary"
* commit '
fd73824d60ca92e297f354986cad525b947d05dd':
Fix: Text is cut in Edit word edit box when adding word to dictionary
Amith Yamasani [Thu, 11 Aug 2011 19:17:03 +0000 (12:17 -0700)]
Merge "Fix: Text is cut in Edit word edit box when adding word to dictionary"
Amith Yamasani [Thu, 11 Aug 2011 18:30:55 +0000 (11:30 -0700)]
Merge "Fix mute toggle behavior in Volume dialog."
Amith Yamasani [Thu, 11 Aug 2011 00:10:04 +0000 (17:10 -0700)]
Fix mute toggle behavior in Volume dialog.
Adjust some padding and alignment.
Bug:
5128528
Fix highlighted entry when using Battery shortcut.
Bug:
5099767
Change-Id: I830dbb40b0b8a6448d33b2be2c36b9b80ff14bc4
Amith Yamasani [Wed, 10 Aug 2011 21:21:03 +0000 (14:21 -0700)]
Merge "Volumes panel shouldn't depend on Silent mode setting."
Claudia de Veaux [Wed, 10 Aug 2011 19:58:53 +0000 (12:58 -0700)]
Merge "Edit to label for regional date format to "Regional" from "Normal" Bug:
3471626"
Ken Wakasa [Wed, 10 Aug 2011 07:58:53 +0000 (16:58 +0900)]
Prevent crashes when IME's settings activity is missing
bug:
5029444
Change-Id: I5c045123dbca2581f2e7d9f602e7511398b83504
Nick Pelly [Wed, 10 Aug 2011 05:27:01 +0000 (22:27 -0700)]
Merge "Add support for NFC in airplane mode."
Claudia de Veaux [Wed, 10 Aug 2011 01:23:26 +0000 (18:23 -0700)]
Edit to label for regional date format to "Regional" from "Normal"
Bug:
3471626
Change-Id: Ife611299a4ce0ce26d94d6fdd15581102a2e869f
Justin Ho [Tue, 9 Aug 2011 21:29:37 +0000 (14:29 -0700)]
Merge "Updated Settings icons Removed More wifi settings icon Bug:
5084184"
Amith Yamasani [Tue, 9 Aug 2011 17:52:38 +0000 (10:52 -0700)]
Volumes panel shouldn't depend on Silent mode setting.
Otherwise it wont be possible to adjust alarm and music volumes.
Also fixes an inconsistent state when screen is turned off and on.
Bug:
5128528
Bug:
5128850
Change-Id: I3bfae44956de291b086905b9f43ca4ff5c7b9bbf
Justin Ho [Tue, 9 Aug 2011 18:58:47 +0000 (11:58 -0700)]
Updated Settings icons
Removed More wifi settings icon
Bug:
5084184
Change-Id: I4ed948bd24544d512179765eb917f3932f60751b
Jake Hamby [Tue, 9 Aug 2011 20:29:25 +0000 (13:29 -0700)]
Merge "Bluetooth : fix for unexpected discovery summary string changing"
Jake Hamby [Tue, 9 Aug 2011 20:29:12 +0000 (13:29 -0700)]
Merge "Bluetooth : fix for handling back key during pair dialog display"
Claudia de Veaux [Tue, 9 Aug 2011 18:07:13 +0000 (11:07 -0700)]
Merge "Fix for
5088341 Security settings: String changes related to renaming "Timeout" to "Automatically lock". Changed instance of "Timeout" to "Automatically lock", and summary text to be shorter."
Claudia de Veaux [Tue, 9 Aug 2011 16:56:16 +0000 (09:56 -0700)]
Fix for
5088341 Security settings: String changes related to renaming "Timeout" to "Automatically lock". Changed instance of "Timeout" to "Automatically lock", and summary text to be shorter.
Change-Id: I93b380b97ebfb4611fda9315ed8ea770ad3e8fb5
Nick Pelly [Tue, 9 Aug 2011 14:10:16 +0000 (07:10 -0700)]
Add support for NFC in airplane mode.
Also update logic in Settings for new async NfcAdapter.enable() and disable().
Change-Id: Ie1e5407498ac7beb5a4e21daec0ada0e8ae9c388
Dianne Hackborn [Tue, 9 Aug 2011 03:14:59 +0000 (20:14 -0700)]
Merge "Fix issue #
5137681: et_source_broad_Android - GoogleJob..."
Chia-chi Yeh [Tue, 9 Aug 2011 00:45:41 +0000 (17:45 -0700)]
Merge "VpnSettings: fix bugs."
Dianne Hackborn [Tue, 9 Aug 2011 00:23:27 +0000 (17:23 -0700)]
Fix issue #
5137681: et_source_broad_Android - GoogleJob...
...[ 91639 / - ]-GTT _request "0.85" clarification
Whatever that means.
To me it means, "do not translate."
Change-Id: Ieedd1251f3956f72ac7f22095cc82f839736e3bc
jhtop.kim [Thu, 4 Aug 2011 03:09:17 +0000 (12:09 +0900)]
Bluetooth : fix for unexpected discovery summary string changing
- While Visibility timeout setting is never,
the summary string "Visible to all nearby Bluetooth devices" is shown.
but if rotating screen or unpairing, pairing actions make the summary
be changed "Not visible to other Bluetooth devices" or
"Only visible to paired devices"
- call handleModeChanged() to refresh summary state.
Change-Id: I4b324f2a9530e5e4ca4571f3dd47e8992bdae0cb
Signed-off-by: jhtop.kim <jhtop.kim@samsung.com>
jhtop.kim [Thu, 21 Jul 2011 04:06:07 +0000 (13:06 +0900)]
Bluetooth : fix for handling back key during pair dialog display
- Pressing back key when pairing dialog appears infront , device shows "Pairing..."
if we don't have any bonded device in device list.
- when press back key will perform onCancel() operation.
Change-Id: Iacd654efad455f17a5c3bb09f822d9af5a7aed7d
Signed-off-by: jhtop.kim <jhtop.kim@samsung.com>
Eric Fischer [Mon, 8 Aug 2011 22:04:44 +0000 (15:04 -0700)]
Merge "Import revised translations."
Chia-chi Yeh [Mon, 8 Aug 2011 21:33:53 +0000 (14:33 -0700)]
VpnSettings: fix bugs.
1. Support identifier in L2TP/IPSec PSK.
2. Fix profile validation for IPSec Hybrid RSA.
3. Fix crash when the user does not want to initialize keystore.
Change-Id: Id46dbbc84915dfb69f8bab6b540426e7614ab7c6
Claudia de Veaux [Mon, 8 Aug 2011 21:15:28 +0000 (14:15 -0700)]
Merge "Fix for
5088373 Display settings: String changes related to renaming "Timeout" to "Sleep". Changed one instance of "Timeout" to "Sleep" and modified the setting description per bug."
Gilles Debunne [Sat, 6 Aug 2011 00:47:52 +0000 (17:47 -0700)]
Format volume option restored
It was removed independently of the state.
As a result an "Erase USB Storage" option is now available on the Nexus S.
I guess this is WAI.
Change-Id: I8765808924085c10ebf213da7f825db70017d0aa
Jake Hamby [Mon, 8 Aug 2011 21:07:34 +0000 (14:07 -0700)]
Merge "Fix multiple BT settings bugs."
Jim Miller [Mon, 8 Aug 2011 20:21:31 +0000 (13:21 -0700)]
Merge "Fix
5044847: Minor tweaks to SecuritySettings."
Claudia de Veaux [Mon, 8 Aug 2011 19:22:18 +0000 (12:22 -0700)]
Fix for
5088373 Display settings: String changes related to renaming "Timeout" to "Sleep". Changed one instance of "Timeout" to "Sleep" and modified the setting description per bug.
Change-Id: Iab9084851b1fbf6bd1e8d3b730219f91232decb4
Gilles Debunne [Mon, 8 Aug 2011 18:54:27 +0000 (11:54 -0700)]
Wifi state reset when disconnected
https://review.source.android.com/19086
Change-Id: Ie7367f2240b94569fed3120244f1cb268bb09206
Dianne Hackborn [Mon, 8 Aug 2011 04:55:54 +0000 (21:55 -0700)]
Merge "Update to work with the activity manager taking over OOM settings."
Dianne Hackborn [Sun, 7 Aug 2011 23:29:05 +0000 (16:29 -0700)]
Update to work with the activity manager taking over OOM settings.
The values it needs are no longer in properties.
Also fix a few problems: bug with apps being left in the services
list, sorting of internal storage.
Change-Id: Ife9706e004931269c36a7bc37b9dbb016064c2e4
Jim Miller [Sun, 7 Aug 2011 23:06:13 +0000 (16:06 -0700)]
Fix
5044847: Minor tweaks to SecuritySettings.
Fix for
5044847 removes "Press menu for help" which is no longer used on any device.
Fix for
5092312 removes black background from pattern/pin/password settings.
Change-Id: I849ea0296aa9f0e9ace65086f9b154a961959f00
Claudia de Veaux [Sat, 6 Aug 2011 01:24:20 +0000 (18:24 -0700)]
Merge "Fix for Bug
5110980 Settings: "VPN settings" renamed to "VPN". Changed two instances of "VPN settings" to "VPN"."
Dianne Hackborn [Sat, 6 Aug 2011 00:51:48 +0000 (17:51 -0700)]
Use new more efficient API for retrieving pss.
Change-Id: Ibcbcc397c2a7c19acd2de640528392df9bb780bb
Claudia de Veaux [Sat, 6 Aug 2011 00:24:20 +0000 (17:24 -0700)]
Fix for Bug
5110980 Settings: "VPN settings" renamed to "VPN". Changed two instances of "VPN settings" to "VPN".
Change-Id: I631ff361d32e0ee063e7fefde6a130e42e5f4dfd
Eric Fischer [Sat, 6 Aug 2011 00:07:14 +0000 (17:07 -0700)]
Import revised translations.
Change-Id: I5cec26c7b9e6dc27c347bfc830589eda1ad4f4d6
Jeff Sharkey [Fri, 5 Aug 2011 07:14:43 +0000 (00:14 -0700)]
Merge "Data usage app icons and details, chart labels."
Jeff Sharkey [Fri, 5 Aug 2011 04:17:23 +0000 (21:17 -0700)]
Data usage app icons and details, chart labels.
Add app icons into both summary list and details pane. Also show list
of all applications merged under a UID. Draw dates on chart axis, and
avoid flashing policy sweeps when switching networks in detail mode.
Bug:
5087283,
5038812
Change-Id: I1dcd03ca85b517f8726452af8a46b4be9b3d20f1
The Android Open Source Project [Fri, 5 Aug 2011 01:46:20 +0000 (18:46 -0700)]
Reconcile with gingerbread-release gingerbread-mr4-release
Change-Id: I2e05e29384ce13de26514fd1e120c00cd0e39112
Eric Fischer [Thu, 4 Aug 2011 23:13:54 +0000 (16:13 -0700)]
Merge "Import revised translations."
Eric Fischer [Thu, 4 Aug 2011 23:13:03 +0000 (16:13 -0700)]
Import revised translations.
Change-Id: Ifefc82b6cc09d33cf62244bf5e22c5185946d4e0
Jeff Sharkey [Thu, 4 Aug 2011 22:39:27 +0000 (15:39 -0700)]
Merge "Data usage disabled state, smaller parcels."
Mike Cleron [Thu, 4 Aug 2011 22:30:57 +0000 (15:30 -0700)]
Merge "Save and restore wifi dialogs on screen rotation."
Eric Fischer [Thu, 4 Aug 2011 21:26:41 +0000 (14:26 -0700)]
Merge "Remove unused string reference."
Amith Yamasani [Thu, 4 Aug 2011 21:21:06 +0000 (14:21 -0700)]
Remove unused string reference.
Change-Id: I411a924c22c84d1a62e0e42df7429e4d869fe3ed
repo sync [Sat, 30 Jul 2011 07:03:52 +0000 (00:03 -0700)]
Use updated wifip2pmanager API
Change-Id: I03ef9a050b51a8895b89cd5daa93a094dc0b75a1
Amith Yamasani [Wed, 3 Aug 2011 22:06:10 +0000 (15:06 -0700)]
Save and restore wifi dialogs on screen rotation.
Bug:
4981732
Change-Id: If065f9af93af405d954fde044351e473d62ea91b
Chia-chi Yeh [Thu, 4 Aug 2011 20:04:51 +0000 (13:04 -0700)]
Merge "VpnSettings: the field has been renamed."
Eric Fischer [Thu, 4 Aug 2011 18:25:44 +0000 (11:25 -0700)]
Merge "Restore deleted strings that are still in use."
Irfan Sheriff [Thu, 4 Aug 2011 17:29:30 +0000 (10:29 -0700)]
Merge "Fix package path for p2p settings"
Irfan Sheriff [Wed, 3 Aug 2011 22:40:04 +0000 (15:40 -0700)]
Fix package path for p2p settings
Split p2p change to avoid eclipse errors on master
Bug:
5002384
Change-Id: I446d4524b823d42c79daa24d43aa24012743e734
Adam Powell [Thu, 4 Aug 2011 03:12:41 +0000 (20:12 -0700)]
Give Settings back its split action bars
Change-Id: I0b8572fee84833a8495125643542380d7f90aa3e
Jake Hamby [Mon, 1 Aug 2011 23:36:35 +0000 (16:36 -0700)]
Fix multiple BT settings bugs.
- Change Bluetooth profiles screen to match ICS wireframes
- Remove BluetoothProfilePreference.java (no longer used)
- Remove "Pair with this device" summary below every unpaired device
- Remove "Paired but not connected" summary below unconnected paired devices
- Fix auto connection after pairing (reuse existing CachedBluetoothDevice)
- Add "Connected (no phone/media)" summaries based on ICS wireframes
- Fix visibility timeout strings.
- Fix crash when starting Bluetooth from Settings shortcut widget.
Bug:
5064139
Bug:
5064324
Bug:
5080404
Bug:
5093513
Bug:
5104485
Change-Id: Ie87103e183ce414c86cb1831a38ef0178b1b1292
Jeff Sharkey [Thu, 4 Aug 2011 00:16:09 +0000 (17:16 -0700)]
Data usage disabled state, smaller parcels.
Hide policy controls when low-level bandwidth controls are disabled
or when radio is disabled. Only request byte counters from history
to reduce parcel size by about 60%.
Bug:
5096903,
5096752
Change-Id: I407b7a01bf60b7105994052cc6e3262054f51184
Chia-chi Yeh [Wed, 3 Aug 2011 22:44:08 +0000 (15:44 -0700)]
VpnSettings: the field has been renamed.
Change-Id: I1e234e96d0fa4af6f03a5b902073460acffd8e28
Amith Yamasani [Wed, 3 Aug 2011 21:51:28 +0000 (14:51 -0700)]
Merge "Sound settings screen and volumes dialog reconfiguration."
Amith Yamasani [Wed, 3 Aug 2011 20:54:56 +0000 (13:54 -0700)]
Merge "Center button text in the InstalledAppDetails screens."
Amith Yamasani [Wed, 3 Aug 2011 19:08:23 +0000 (12:08 -0700)]
Center button text in the InstalledAppDetails screens.
Bug:
5098457
Change-Id: I2ae0083c9547d17324ebbd667eb85f58da88ec15
Amith Yamasani [Mon, 1 Aug 2011 22:55:06 +0000 (15:55 -0700)]
Sound settings screen and volumes dialog reconfiguration.
Removed the "Notifications use ring volume" checkbox.
Show the current ringtones in the summary area.
Bug:
5032308
Change-Id: I17e63f32c1775dd2097904df1aa6aaf699bd8ae2
Adam Powell [Wed, 3 Aug 2011 01:45:24 +0000 (18:45 -0700)]
Merge "Follow framework API changes"
Christopher Tate [Wed, 3 Aug 2011 00:43:21 +0000 (17:43 -0700)]
Merge "Tweak font-size summary display"
Christopher Tate [Wed, 3 Aug 2011 00:42:57 +0000 (17:42 -0700)]
Merge "Always put 'USB COMPUTER CONNECTION' into the overflow menu"
Dianne Hackborn [Wed, 3 Aug 2011 00:05:52 +0000 (17:05 -0700)]
Merge "Clear bitmaps from canvses after done drawing to them."
Dianne Hackborn [Wed, 3 Aug 2011 00:01:30 +0000 (17:01 -0700)]
Clear bitmaps from canvses after done drawing to them.
Change-Id: I902edf771c66485269289aeeb4d64c56fe899906
Dianne Hackborn [Tue, 2 Aug 2011 23:58:30 +0000 (16:58 -0700)]
Merge "New development setting for ANRs."
Adam Powell [Tue, 2 Aug 2011 23:52:34 +0000 (16:52 -0700)]
Follow framework API changes
Change-Id: Ieb06a35a65d70d7b65f801814a0a46c9acc80445