OSDN Git Service
Fabrice Di Meglio [Thu, 13 Jan 2011 19:01:15 +0000 (11:01 -0800)]
Merge "Fix bug #
2987804 (Provide a better UI for selecting the Backup account)" into honeycomb
Eric Fischer [Thu, 13 Jan 2011 18:58:08 +0000 (10:58 -0800)]
Merge "Import revised translations." into honeycomb
Jason parks [Thu, 13 Jan 2011 15:42:16 +0000 (07:42 -0800)]
Merge "Move the CryptKeeper to Settings." into honeycomb
Tadashi G. Takaoka [Thu, 13 Jan 2011 02:39:33 +0000 (11:39 +0900)]
Add CHAR LIMIT to input method string resources
Bug:
3329495
Bug:
3174702
Change-Id: I2b87166a08d911e76e4b660b0933396c14817b20
Eric Fischer [Thu, 13 Jan 2011 01:05:49 +0000 (17:05 -0800)]
Import revised translations.
Change-Id: I989beece90deec6abb2542697d06caf88ae2f4a9
Joe Onorato [Wed, 12 Jan 2011 23:36:40 +0000 (15:36 -0800)]
Merge "Get rid of the silent mode pref on xlarge." into honeycomb
Joe Onorato [Wed, 12 Jan 2011 23:35:47 +0000 (15:35 -0800)]
Get rid of the silent mode pref on xlarge.
Bug:
3344695
Change-Id: I55ccfd2b22ca4aa407646de54a8dd1dfe637c9bd
Daisuke Miyakawa [Wed, 12 Jan 2011 23:30:25 +0000 (15:30 -0800)]
Merge "Set appropriate margin to dividers in SetupWizard" into honeycomb
Daisuke Miyakawa [Wed, 12 Jan 2011 23:25:20 +0000 (15:25 -0800)]
Set appropriate margin to dividers in SetupWizard
Bug:
3346105
Change-Id: I4a8367d54d2c62257618ad9e8415bcd1c3419802
Amith Yamasani [Wed, 12 Jan 2011 22:44:01 +0000 (14:44 -0800)]
Merge "Remove popup indicator for dialog style preferences." into honeycomb
Amith Yamasani [Wed, 12 Jan 2011 22:18:58 +0000 (14:18 -0800)]
Remove popup indicator for dialog style preferences.
Bug:
3341160
This is for some custom settings that needed dialog style indicators.
Change-Id: Ied9d88c890e764bc0ae50e0299daff50a6b432aa
Jason parks [Wed, 12 Jan 2011 22:03:31 +0000 (16:03 -0600)]
Move the CryptKeeper to Settings.
Change-Id: I59e46366e1911ae7fd37f07719f1e7ba0825733c
Fabrice Di Meglio [Mon, 10 Jan 2011 03:56:51 +0000 (19:56 -0800)]
Fix bug #
2987804 (Provide a better UI for selecting the Backup account)
- make the "Backup account" toggle follow the state of "Back up my data"
- reset Backup account in preferences if needed
Change-Id: Ifdffb9d268a062f6f5ec617bca82699cc46e2b3a
Daisuke Miyakawa [Wed, 12 Jan 2011 19:02:04 +0000 (11:02 -0800)]
Merge "Show password field when authentication failed." into honeycomb
Daisuke Miyakawa [Sun, 9 Jan 2011 19:55:45 +0000 (11:55 -0800)]
Show password field when authentication failed.
- add onAuthenticationFailure() method to prepare
appropriate UIs.
- set "edit" boolean to true so that users can modify
password when re-seleting a network.
- keep mStatusText shown for simplicity. It has been hidden
during "editing" phase, but we don't need to do that any more
- modify Connect button handling so that the button
hides/appears at appropriate time
- manage visibility state of some fields so that
we can "reset" the status when authentication failed
- show keyboard again when password field re-appears
Bug:
3330109
Change-Id: I1cdf0573280ab46882117e21501a43a447e50b40
Amith Yamasani [Wed, 12 Jan 2011 17:14:27 +0000 (09:14 -0800)]
Merge "Remove extra button bar." into honeycomb
Amith Yamasani [Tue, 11 Jan 2011 17:09:26 +0000 (09:09 -0800)]
Remove extra button bar.
Bug:
3058024
Change-Id: Ib3c2620869729f8916178ea0c0e899635b470a8f
satok [Wed, 12 Jan 2011 09:18:06 +0000 (01:18 -0800)]
Merge "Automatically turn on "Use system language" when no subtypes become selected Bug:
3327257" into honeycomb
Jake Hamby [Wed, 12 Jan 2011 03:27:17 +0000 (19:27 -0800)]
Only show "Allow incoming file transfer" option if device supports OPP
In the Bluetooth profiles settings screen for a device, the "Allow
incoming file transfer" item should only be shown if the device
supports the Object Push Profile.
Bug:
3297633
Change-Id: I4bbe66ef901feef9dd8a3916fb9827120c1fdfc0
Jake Hamby [Wed, 12 Jan 2011 02:44:57 +0000 (18:44 -0800)]
Merge "Allow multiple simultaneous connections for BT input devices." into honeycomb
Eric Fischer [Wed, 12 Jan 2011 01:39:47 +0000 (17:39 -0800)]
Merge "Update large-screen translations." into honeycomb
Irfan Sheriff [Wed, 12 Jan 2011 01:26:41 +0000 (17:26 -0800)]
Merge "Change wifi sleep policy" into honeycomb
Roy West [Wed, 12 Jan 2011 01:17:46 +0000 (17:17 -0800)]
First part of fix to bug3094381 typos.
Change-Id: Ie2ef07473ae88c023aa9158d12b73dc833043767
Eric Fischer [Wed, 12 Jan 2011 01:01:53 +0000 (17:01 -0800)]
Update large-screen translations.
Change-Id: I618d7e146195a9ce2c5a1f7fc5656b174fd9fcef
Irfan Sheriff [Tue, 11 Jan 2011 23:39:16 +0000 (15:39 -0800)]
Change wifi sleep policy
Keep wifi sleep policy as never when charged as long as
user has not changed the settings
Bug:
3038345
Change-Id: I37548984698dd3dd407785544d7b418439ed95d0
Roy West [Tue, 11 Jan 2011 23:36:29 +0000 (15:36 -0800)]
Fix bug
3342149, edit lock screen settings text.
Change-Id: Ic6691b5ebce1c074143dbe49b0486f693e4236f6
Jeff Brown [Tue, 11 Jan 2011 23:09:05 +0000 (15:09 -0800)]
Merge "Disable quicklaunch settings preference." into honeycomb
Amith Yamasani [Tue, 11 Jan 2011 22:18:44 +0000 (14:18 -0800)]
Fix build breakage. Order of product="" is important.
Change-Id: I3232966b90879118e287de77450d736daa58a169
Jim Miller [Tue, 11 Jan 2011 21:50:40 +0000 (13:50 -0800)]
Merge "Fix
3298889: Show continue button on PIN and password screens" into honeycomb
Jake Hamby [Tue, 11 Jan 2011 21:49:17 +0000 (13:49 -0800)]
Merge "Don't throw exception on unexpected BT device addition." into honeycomb
Jake Hamby [Tue, 11 Jan 2011 21:27:50 +0000 (13:27 -0800)]
Don't throw exception on unexpected BT device addition.
Fix for reported bug where settings app crashes while trying to share
a picture. Bug report showed IllegalStateException thrown with message
"Got onDeviceAdded, but cachedDevice already exists." Changed code to
print an error message to the log and ignore the unexpected event,
rather than throwing an uncaught exception that crashes the app.
Bug:
2192884
Change-Id: I016be6a1616b317b2289768d18ae9f069a49445e
Amith Yamasani [Tue, 11 Jan 2011 21:19:24 +0000 (13:19 -0800)]
Merge "Remove phone number status conditionally for devices without voice." into honeycomb
Amith Yamasani [Sun, 9 Jan 2011 21:44:56 +0000 (13:44 -0800)]
Remove phone number status conditionally for devices without voice.
Bug:
3041861
Change-Id: I36fb6c584c24b995da0ac4e3b41d860f3a6f5396
Daisuke Miyakawa [Tue, 11 Jan 2011 19:20:45 +0000 (11:20 -0800)]
Modify layout for wifi and datetime setup
Change-Id: I8410a98246d81606ab728cfe4e9c700dd5ef2c7e
Daisuke Miyakawa [Tue, 11 Jan 2011 02:26:43 +0000 (18:26 -0800)]
Modify layout for Wi-Fi Setup
Bug:
3330109
Change-Id: I09a3965cb150d1004ef03d6bc3170ad79526c47f
satok [Tue, 11 Jan 2011 14:19:01 +0000 (23:19 +0900)]
Automatically turn on "Use system language" when no subtypes become selected
Bug:
3327257
Change-Id: I99a8c2769957963db99fa72be6cc76cc9cd97abf
Jim Miller [Tue, 11 Jan 2011 02:24:11 +0000 (18:24 -0800)]
Fix
3298889: Show continue button on PIN and password screens
This fixes the above bug by allowing the PIN and password
screens to shrink to reveal the continue/cancel buttons
when the IME is shown.
This also fixes a minor resource bug where the title was
showing "confirm your password/pin" instead of "choose your password/pin".
Change-Id: I610c6018085e0c4ef1b6dc384566d06d1211f8ea
Jim Miller [Mon, 10 Jan 2011 02:00:28 +0000 (18:00 -0800)]
Fix
3333490,
3250193: Update LockScreen settings
This updates LockScreen to conform to the latest UI design.
Change-Id: Ie88a26db7912ddb4331804e347189cc084c481f4
Jake Hamby [Tue, 11 Jan 2011 01:02:26 +0000 (17:02 -0800)]
Allow multiple simultaneous connections for BT input devices.
Move responsibility for disconnecting devices before connecting a new
profile from CachedBluetoothDevice to LocalBluetoothProfileManager.
The ProfileManager subclasses of LocalBluetoothProfileManager will
handle disconnecting the previously connected device, if necessary,
as part of connect(). The HID profile allows multiple simultaneous
connected devices, while the other supported profiles do not.
Bug:
3333975
Change-Id: Id51b26e64f7c3ee7d54af3a03ca82a669f305b52
Jeff Brown [Mon, 10 Jan 2011 22:03:06 +0000 (14:03 -0800)]
Disable quicklaunch settings preference.
Bug:
3290450
Change-Id: Ib1a8926d7b18b8821395b06c9cdc7763e774c847
Joe Onorato [Mon, 10 Jan 2011 20:55:57 +0000 (12:55 -0800)]
Partially revert "Conditionally remove Dock settings shortcut and Power control widget."
This reverts commit
580c80f853747741ae74fbb6f670315077586208.
So it turns out we won't have the ability to control the enabled flag from
Configuration changes because the dependency is actually in the package manager.
I'm reverting this change and going to do another one that just turns them
off for all configurations, because honeycomb is just for tablets.
Change-Id: I16b7b1e2d59a3a917448ce0361e3ce0fdd062a86
Mathew Inwood [Mon, 10 Jan 2011 16:32:32 +0000 (16:32 +0000)]
Fix capitalization in 'Google Search'.
Bug:
3093036
Change-Id: Iddd5de0ba2b40f2088cce2c5a30a0a9cafaf6aaf
Jim Miller [Sat, 8 Jan 2011 00:55:33 +0000 (16:55 -0800)]
Fix
3333434: Rename "Display" to "Screen" and make dynamic
This changes the setting "Display" to "Screen" and updates
the timeout summary to reflect the current setting.
Change-Id: Id8209d445f65a0908ae8093a8f5f7f951f333053
Jim Miller [Fri, 7 Jan 2011 05:52:09 +0000 (21:52 -0800)]
Fix
3281395: Fix duplicate title in LockScreen Settings. [DO NOT MERGE]
Manual merge of Change-Id: I3c53d1864e521f4245b94d39664266891a728615
Change-Id: I59eedd81af226949ac0df10390ae0642e1812c5a
Amith Yamasani [Fri, 7 Jan 2011 20:52:21 +0000 (12:52 -0800)]
Conditionally remove Dock settings shortcut and Power control widget.
Bug:
3258028
Bug:
3248740
Change-Id: Id37787cc9562cde13048e8dfba957599219d94b5
Fabrice Di Meglio [Thu, 6 Jan 2011 21:46:43 +0000 (13:46 -0800)]
Fix for bug #
3325868 (add accounts should not use the settings activity as part of its flow)
- suppress non needed AccountSyncSettingsInAddAccount class
Change-Id: I27ba9ea2d45a5e2c9ec1d2ed6033f6d68e100a3f
Vasu Nori [Fri, 7 Jan 2011 23:41:11 +0000 (15:41 -0800)]
Merge "bug:
3276501 set CHAR_LIMIT for i18n purposes" into honeycomb
Amith Yamasani [Fri, 7 Jan 2011 23:35:31 +0000 (15:35 -0800)]
Merge "Use a resizable dialog for wifi configuration." into honeycomb
Amith Yamasani [Fri, 7 Jan 2011 23:31:35 +0000 (15:31 -0800)]
Use a resizable dialog for wifi configuration.
Bug:
3175152
Use a custom theme that allows the dialog to resize.
Change-Id: I004b91c58d0d1810df50f9bdee9430698f51f8ab
Amith Yamasani [Fri, 7 Jan 2011 23:24:47 +0000 (15:24 -0800)]
Merge "Don't add wifi entries twice, when returning from another activity." into honeycomb
Vasu Nori [Fri, 7 Jan 2011 22:48:46 +0000 (14:48 -0800)]
bug:
3276501 set CHAR_LIMIT for i18n purposes
Change-Id: I0e230f3f935d3a657bff5e2092ff20ca8d0f8e95
Amith Yamasani [Fri, 7 Jan 2011 21:07:24 +0000 (13:07 -0800)]
Don't add wifi entries twice, when returning from another activity.
Bug:
3209730
Change-Id: I7408a56fc10359e508be5a1d27492da2227335ce
Eric Fischer [Fri, 7 Jan 2011 20:58:37 +0000 (12:58 -0800)]
Merge "Import some unabbreviated translations for large screens." into honeycomb
Jake Hamby [Fri, 7 Jan 2011 18:54:05 +0000 (10:54 -0800)]
Merge "Don't auto connect reverse tethering after pairing." into honeycomb
Jake Hamby [Fri, 7 Jan 2011 18:53:52 +0000 (10:53 -0800)]
Merge "Use holographic style for BT pairing dialogs." into honeycomb
Svetoslav Ganov [Fri, 7 Jan 2011 17:25:48 +0000 (09:25 -0800)]
Merge "
3328848 Script injection property is enabled when accessibility is disabled" into honeycomb
Jake Hamby [Fri, 7 Jan 2011 05:01:30 +0000 (21:01 -0800)]
Don't auto connect reverse tethering after pairing.
Added boolean param to connect() method in CachedBluetoothDevice
to specify whether to connect PAN profile. This is set to true when
the user clicks on a device in the paired devices list, but false
when auto connecting profiles after pairing and other circumstances.
Bug:
3330207
Change-Id: I6d8d50abb65a8cb24f87ad93c01693923991b6ef
Jake Hamby [Fri, 7 Jan 2011 04:19:01 +0000 (20:19 -0800)]
Use holographic style for BT pairing dialogs.
Use holographic style for BT pairing dialogs.
Bug:
3321504
Change-Id: I111b3112318eff86d44dc81909a5220661e33e79
Eric Fischer [Fri, 7 Jan 2011 01:47:49 +0000 (17:47 -0800)]
Import some unabbreviated translations for large screens.
Change-Id: I87158f97c12d779d749c8c05c6b2436bb349bacc
Svetoslav Ganov [Fri, 7 Jan 2011 00:01:46 +0000 (16:01 -0800)]
3328848 Script injection property is enabled when accessibility is disabled
Change-Id: I23da008eea88f3e96a7de4823a6f6ff9d8e21ee0
Jaikumar Ganesh [Thu, 6 Jan 2011 22:26:57 +0000 (14:26 -0800)]
Merge "Add new pairing dialog for keyboard pairings." into honeycomb
Jaikumar Ganesh [Wed, 5 Jan 2011 21:56:17 +0000 (13:56 -0800)]
Add new pairing dialog for keyboard pairings.
Change-Id: I672a3d874a7876fca6bd38091444dc9c5fb3a2f1
Daisuke Miyakawa [Wed, 5 Jan 2011 03:20:30 +0000 (19:20 -0800)]
Remove unnecessary codes around WifiSettings.
Bug:
3321110
Change-Id: Iaac35a507b8e46e2d4702f0e5cda7b515a57db67
Jim Miller [Thu, 6 Jan 2011 03:46:05 +0000 (19:46 -0800)]
Merge "Fix
3315401: Prevent pattern confirmation screen from asking twice"
Jim Miller [Thu, 6 Jan 2011 01:41:31 +0000 (17:41 -0800)]
Fix
3315401: Prevent pattern confirmation screen from asking twice
This fixes a bug where changing from PIN to pattern caused
the lock pattern tutorial to ask for the PIN twice and ultimately
crash due to ConfirmLockPattern getting into the wrong state.
Change-Id: Ia3b3186dcd56f2b47a09f54d7636436ee80aa13c
Patrick Dubroy [Wed, 5 Jan 2011 23:43:21 +0000 (15:43 -0800)]
Merge "fix
3185231: Dragging app to info button doesn't work"
Patrick Dubroy [Wed, 5 Jan 2011 23:28:21 +0000 (15:28 -0800)]
fix
3185231: Dragging app to info button doesn't work
When dragging an app from all apps to the info button, it
is currently showing an empty dialog.
Amith Yamasani [Wed, 5 Jan 2011 17:55:44 +0000 (09:55 -0800)]
Merge "Recheck the storage sizes when Storage settings is resumed."
Amith Yamasani [Wed, 5 Jan 2011 17:09:23 +0000 (09:09 -0800)]
Recheck the storage sizes when Storage settings is resumed.
Bug:
3312629
When the Storage fragment is displayed, invalidate the measurement
object so that it recomputes the used space on all partitions.
Joe Onorato [Wed, 5 Jan 2011 02:55:24 +0000 (18:55 -0800)]
Merge "Add the CHAR LIMIT annotation"
Joe Onorato [Tue, 4 Jan 2011 18:28:32 +0000 (10:28 -0800)]
Add the CHAR LIMIT annotation
Bug:
3196825
Change-Id: I64e8b757162000c69dfb61261112185dab651ed0
Chung-yih Wang [Wed, 5 Jan 2011 02:21:01 +0000 (10:21 +0800)]
Fix the NPE bug due to the process/activity restart.
The active profile and its state were not stored if the setting process
was killed due to the resource. Here we add the state persistence
mechanism to fix this bug.
bug:
3293236
Change-Id: I8b8068972237bde06ca4b3f73ecc48c02c4f0833
Eric Fischer [Tue, 4 Jan 2011 22:48:25 +0000 (14:48 -0800)]
Merge changes Ia9338cf2,I5ef641b5
* changes:
Import revised translations.
Remove unreferenced layout that used two deleted strings.
Jaikumar Ganesh [Tue, 4 Jan 2011 21:41:29 +0000 (13:41 -0800)]
Merge "Listen to Input device connection state intents."
Jaikumar Ganesh [Tue, 4 Jan 2011 20:27:46 +0000 (12:27 -0800)]
Listen to Input device connection state intents.
Change-Id: I99addef820438c9c34bfccf2877578b06e14a00c
Daisuke Miyakawa [Tue, 4 Jan 2011 19:44:09 +0000 (11:44 -0800)]
Add missing id.
If29bb34fce04eab5adc9b5180b70dbfd718cc709 added
proxy_settings_title, which should be available in Setup Wizard
flow.
Bug:
3321533
Change-Id: I4c2590dc728dde573502b91e5ef5b7bd8323bc97
Amith Yamasani [Tue, 4 Jan 2011 18:47:07 +0000 (10:47 -0800)]
Merge "Save and restore brightness on orientation changes."
Amith Yamasani [Mon, 3 Jan 2011 23:15:41 +0000 (15:15 -0800)]
Save and restore brightness on orientation changes.
Bug:
2524213
Robert Greenwalt [Thu, 30 Dec 2010 00:26:35 +0000 (16:26 -0800)]
Merge "Hide http proxy UI"
Robert Greenwalt [Wed, 29 Dec 2010 00:11:12 +0000 (16:11 -0800)]
Hide http proxy UI
We don't have support in the media code so rather than confuse the users
with some apps using proxies and some not we'll just turn it off for all
for now.
bug:
3283883
Change-Id: If29bb34fce04eab5adc9b5180b70dbfd718cc709
Amith Yamasani [Wed, 29 Dec 2010 20:31:33 +0000 (12:31 -0800)]
Merge "Unregister the listener in onStop() instead of onDestroy()"
Amith Yamasani [Wed, 29 Dec 2010 20:29:23 +0000 (12:29 -0800)]
Unregister the listener in onStop() instead of onDestroy()
Bug:
3259661
Daisuke Miyakawa [Tue, 28 Dec 2010 21:48:50 +0000 (13:48 -0800)]
Hide CalendarView in SetupWizard
Bug:
3271797
Change-Id: Ie8f63504a9360e19817040284a95dc7112f1c6c6
Daisuke Miyakawa [Tue, 28 Dec 2010 20:11:34 +0000 (12:11 -0800)]
Merge "Refresh layouts for SetupWizard."
Daisuke Miyakawa [Tue, 28 Dec 2010 20:06:08 +0000 (12:06 -0800)]
Refresh layouts for SetupWizard.
- DateTimeSettingsSetupWizardXL
- WifiSettingsForSetupWizardXL
Bug:
3308677,
3137755
Change-Id: Ifdf67aa7521de7ef0286fea2b15ce693fbf5d5ce
Jean-Baptiste Queru [Tue, 28 Dec 2010 20:04:44 +0000 (12:04 -0800)]
am
9a10fb0b: am
e8531ff6: Merge "Changed the text input type of APN name to plain text"
* commit '
9a10fb0bbca164a5cf453b19522e369188b50c85':
Changed the text input type of APN name to plain text
Jean-Baptiste Queru [Tue, 28 Dec 2010 20:02:44 +0000 (12:02 -0800)]
am
e8531ff6: Merge "Changed the text input type of APN name to plain text"
* commit '
e8531ff6a03a0542b7b1531ddd469befed9bab85':
Changed the text input type of APN name to plain text
Jean-Baptiste Queru [Tue, 28 Dec 2010 19:52:15 +0000 (11:52 -0800)]
Merge "Changed the text input type of APN name to plain text"
Daisuke Miyakawa [Tue, 28 Dec 2010 17:22:24 +0000 (09:22 -0800)]
Check null on Wifi setup screen.
Bug:
3313432
Change-Id: Id475dbca81be9e8f9a7d61cda062095358a725c1
satok [Tue, 21 Dec 2010 14:50:38 +0000 (23:50 +0900)]
Add a preference for selecting subtypes automatically
bug:
3142286
Change-Id: I9129df7671252d7ccc611a2892a4ba96e1dacdaf
Eric Fischer [Thu, 23 Dec 2010 22:18:00 +0000 (14:18 -0800)]
Import revised translations.
Change-Id: Ia9338cf200345ea00eb0179ca06770a9c47c16d8
Eric Fischer [Thu, 23 Dec 2010 21:44:59 +0000 (13:44 -0800)]
Remove unreferenced layout that used two deleted strings.
Change-Id: I5ef641b5c82ba1af5055b42748fc6713d31dd775
Jim Miller [Wed, 22 Dec 2010 06:03:06 +0000 (22:03 -0800)]
Fix
3148496: Update LockPatternTutorial to be one screen.
This combines the two activities ChooseLockPatternExample and
ChooseLockPatternTutorial into one activity and makes use of the
built-in LockPatternView animation to show an example view.
Change-Id: If3a4b236a15a6d99b1c0b5c11e5e923267fa30d3
Jake Hamby [Fri, 17 Dec 2010 02:33:28 +0000 (18:33 -0800)]
Enable reverse tethering in BT settings screen.
- Enable support for reverse tethering in BT settings.
- Add string resource for "Auto connect" preference.
- Remove unused imports and other minor cleanups.
- Add isConnectable() and isAutoConnectable() methods to Profile
enum type and remove isConnectableProfile() method.
Change-Id: Ie606db04028a8278e98231f0671a388671f2f067
Jim Miller [Sat, 18 Dec 2010 02:23:23 +0000 (18:23 -0800)]
Fix
3281395: Use breadcrumb area to display title for LockScreen
Change-Id: Icd631b4c70e7b9f6b9a8c24dd513aed259a22d6a
Amith Yamasani [Mon, 20 Dec 2010 21:13:13 +0000 (13:13 -0800)]
Update capitalization in a string.
Remove an unused string.
Bug:
3267633
Change-Id: Icaf162ab6a39da2ef28ef89ed1245b9f3bae34fd
satok [Mon, 20 Dec 2010 03:35:00 +0000 (19:35 -0800)]
Merge "Fix a null pointer exception when disabledSystemIMEs is null."
satok [Mon, 20 Dec 2010 03:27:55 +0000 (12:27 +0900)]
Fix a null pointer exception when disabledSystemIMEs is null.
Bug:
3298244
Change-Id: Ifb3349def052bd50633b0cfe04e5636e22115245
Kenny Root [Fri, 17 Dec 2010 22:56:10 +0000 (14:56 -0800)]
Merge "Add minTickWidth for the bar chart"
Kenny Root [Fri, 17 Dec 2010 19:57:14 +0000 (11:57 -0800)]
Add minTickWidth for the bar chart
At jsharkey's request.
Change-Id: Ic489e534fe793fc7ec3fd2bedc5bb256be99daec