OSDN Git Service
Daisuke Miyakawa [Tue, 15 May 2012 18:29:55 +0000 (11:29 -0700)]
am
16d91c19: Modify menu layout for sound setting
* commit '
16d91c19dcabea63f38757ab5cafb56c29ad22e8':
Modify menu layout for sound setting
Amith Yamasani [Tue, 15 May 2012 02:33:32 +0000 (19:33 -0700)]
am
97bbb533: Merge "Fix up-navigation for different levels of Settings screens." into jb-dev
* commit '
97bbb5332414be257678476cf037e396c0b88c17':
Fix up-navigation for different levels of Settings screens.
Eric Fischer [Tue, 15 May 2012 02:33:21 +0000 (19:33 -0700)]
am
25043553: Fix "boumds" typo.
* commit '
250435536042ffad592cbbbd995efa816b76d1ae':
Fix "boumds" typo.
Dianne Hackborn [Tue, 15 May 2012 02:32:40 +0000 (19:32 -0700)]
am
e5050b1b: Merge "Implement issue #
6477793: Add "restore" button to manage apps" into jb-dev
* commit '
e5050b1be72c5552bfc9c734d5a0e89f215bed62':
Implement issue #
6477793: Add "restore" button to manage apps
Daisuke Miyakawa [Sat, 12 May 2012 00:54:42 +0000 (17:54 -0700)]
Modify menu layout for sound setting
- Move notification setting to "System" section
- Modify strings for category titles
- Change strings' names too to reflect their contents
-- sound_category_calls_and_notification_title
-> sound_category_call_ringtone_vibrate_title
-- soud_category_feedback_title
-> sound_category_system_title
Bug:
6036529
Change-Id: I7aaa83571ae3d69212e9debaec4f3b4ec60a281c
Amith Yamasani [Mon, 14 May 2012 18:58:24 +0000 (11:58 -0700)]
Merge "Fix up-navigation for different levels of Settings screens." into jb-dev
Amith Yamasani [Fri, 11 May 2012 22:22:04 +0000 (15:22 -0700)]
Fix up-navigation for different levels of Settings screens.
No up affordance for 2-pane screens since there's already
a fragment breadcrumb for navigating up.
Bug:
6452961
Change-Id: Iad9a5c2d0b68cc8f2aec7d5ed8e2ab14d023d48c
Eric Fischer [Mon, 14 May 2012 17:40:43 +0000 (10:40 -0700)]
Fix "boumds" typo.
Change-Id: Ideec0c8688c9ee9677039038825b5473aaaed7ba
Dianne Hackborn [Sun, 13 May 2012 22:25:14 +0000 (15:25 -0700)]
Merge "Implement issue #
6477793: Add "restore" button to manage apps" into jb-dev
Dianne Hackborn [Sun, 13 May 2012 22:19:57 +0000 (15:19 -0700)]
Implement issue #
6477793: Add "restore" button to manage apps
Added!
Change-Id: I1b4ffdd24a1c5878ae3acf3970f9364304eb5250
Jeff Brown [Sat, 12 May 2012 02:35:21 +0000 (19:35 -0700)]
am
cefc41fd: Merge "Update references to PowerManager constants that have moved." into jb-dev
* commit '
cefc41fd9705d3d3c5cbc47d1dd854a618bcf313':
Update references to PowerManager constants that have moved.
Jeff Brown [Sat, 12 May 2012 02:33:09 +0000 (19:33 -0700)]
Merge "Update references to PowerManager constants that have moved." into jb-dev
Jeff Brown [Sat, 12 May 2012 01:39:30 +0000 (18:39 -0700)]
Update references to PowerManager constants that have moved.
Bug:
6435382
Change-Id: Ieea857644dc0cf758e0ff4fd595c6a0115457df0
Kenny Root [Fri, 11 May 2012 22:52:08 +0000 (15:52 -0700)]
am
72a84b78: Merge "WiFi: only send engine setting when key_id is set" into jb-dev
* commit '
72a84b78d08d41d6e76767744d03d928e0aa26e1':
WiFi: only send engine setting when key_id is set
Kenny Root [Fri, 11 May 2012 22:49:31 +0000 (15:49 -0700)]
Merge "WiFi: only send engine setting when key_id is set" into jb-dev
Eric Fischer [Fri, 11 May 2012 22:38:39 +0000 (15:38 -0700)]
am
411e7724: Merge "Import translations. DO NOT MERGE" into jb-dev
* commit '
411e7724c67a19d257b19c3a349ac7c3cf0eae3a':
Import translations. DO NOT MERGE
Eric Fischer [Fri, 11 May 2012 22:37:09 +0000 (15:37 -0700)]
Merge "Import translations. DO NOT MERGE" into jb-dev
Eric Fischer [Fri, 11 May 2012 22:10:41 +0000 (15:10 -0700)]
Import translations. DO NOT MERGE
Change-Id: I94d8cef2d5740b708313cc1f94b169824a3ea06e
Amith Yamasani [Fri, 11 May 2012 19:54:52 +0000 (12:54 -0700)]
am
233aa98b: Merge "Add a tablet-specific string to describe NFC checkbox." into jb-dev
* commit '
233aa98b05fbbd908f57fce8157f2f828253ce50':
Add a tablet-specific string to describe NFC checkbox.
Amith Yamasani [Fri, 11 May 2012 19:52:52 +0000 (12:52 -0700)]
Merge "Add a tablet-specific string to describe NFC checkbox." into jb-dev
Kenny Root [Fri, 11 May 2012 19:41:46 +0000 (12:41 -0700)]
am
6a665664: Strip off phase2 prefix when setting spinner
* commit '
6a6656641c58fd4396c011639dbc02a58636294f':
Strip off phase2 prefix when setting spinner
Kenny Root [Fri, 11 May 2012 17:02:36 +0000 (10:02 -0700)]
Strip off phase2 prefix when setting spinner
The writing and reading code for phase2 settings were asymmetric so the
phase2 spinner would always be set as "None". This change strips off the
prefix to set the spinner.
Bug:
6482316
Change-Id: Iaaa1088ec22625f1b8e3974c8a9610cccf0dda90
Amith Yamasani [Fri, 11 May 2012 17:16:11 +0000 (10:16 -0700)]
Add a tablet-specific string to describe NFC checkbox.
Bug:
6480832
Change-Id: I94e7baeba52528819ace8db7750ff2b7e114938a
Kenny Root [Fri, 11 May 2012 16:08:23 +0000 (09:08 -0700)]
WiFi: only send engine setting when key_id is set
For EAP methods that don't need a key, don't set the engine settings or
else wpa_supplicant will have an error. Instead, look to see whether
key_id is set and use that to indicate when the engine should be
set.
Additionally, don't require keystore when key_id is not null but is
still an empty string.
Bug:
6480500
Change-Id: I137de47dfcbbd3da24d693701e249e15d7528228
satok [Fri, 11 May 2012 10:31:28 +0000 (03:31 -0700)]
am
e508dc25: Fix the crash during opning the illegal settings of the spell checker
* commit '
e508dc25f2d3168f37fe5963fc99b0a034a3a298':
Fix the crash during opning the illegal settings of the spell checker
satok [Fri, 11 May 2012 09:37:39 +0000 (18:37 +0900)]
Fix the crash during opning the illegal settings of the spell checker
Bug:
5591245
Change-Id: I4ff61a59b0622c74b34bc50a00fc9773c04a6395
Amith Yamasani [Thu, 10 May 2012 22:56:32 +0000 (15:56 -0700)]
am
ee10cecc: Merge "Use Spinner instead of Tabs, so that a 4th entry doesn\'t disappear off the screen." into jb-dev
* commit '
ee10ceccde8155016af557e96c9ac6a6e2bb477d':
Use Spinner instead of Tabs, so that a 4th entry doesn't disappear off the screen.
Amith Yamasani [Thu, 10 May 2012 22:53:47 +0000 (15:53 -0700)]
Merge "Use Spinner instead of Tabs, so that a 4th entry doesn't disappear off the screen." into jb-dev
Eric Fischer [Thu, 10 May 2012 22:43:03 +0000 (15:43 -0700)]
am
2f3b5314: Merge "Import translations. DO NOT MERGE" into jb-dev
* commit '
2f3b5314333b36e1fbc058a70a7ec89cec7f96d4':
Import translations. DO NOT MERGE
Eric Fischer [Thu, 10 May 2012 22:40:45 +0000 (15:40 -0700)]
Merge "Import translations. DO NOT MERGE" into jb-dev
Amith Yamasani [Thu, 3 May 2012 19:46:53 +0000 (12:46 -0700)]
Use Spinner instead of Tabs, so that a 4th entry doesn't disappear off the screen.
This is for the 3 to 4 lists that you can switch between in the Settings->Apps
screen.
Bug:
6375122
Change-Id: I8a4e46b8aa3e06bc79edb5f65400462060fe5a29
Russell Brenner [Thu, 10 May 2012 21:45:42 +0000 (14:45 -0700)]
am
37088515: Change title to "Select Wi-Fi"
* commit '
37088515bf8d8d57aae03a27427fd3450d7d65f9':
Change title to "Select Wi-Fi"
Eric Fischer [Thu, 10 May 2012 21:30:18 +0000 (14:30 -0700)]
Import translations. DO NOT MERGE
Change-Id: Ie7165c02d6c1dff54464cdaa4121cc7364db0891
Russell Brenner [Thu, 10 May 2012 16:47:55 +0000 (09:47 -0700)]
Change title to "Select Wi-Fi"
Bug:
6471984
Change-Id: I91f9d49e61a4a6e0ee177a7a6304613324357426
Jean Chalard [Thu, 10 May 2012 16:26:35 +0000 (09:26 -0700)]
am
7dabe458: Fix breadcrumbs for user dictionary settings on tablets.
* commit '
7dabe4583c2bb12ed1d072139399f6bca8067994':
Fix breadcrumbs for user dictionary settings on tablets.
Jean Chalard [Thu, 10 May 2012 16:26:32 +0000 (09:26 -0700)]
am
eed02dd2: Fix a bug with adding a word
* commit '
eed02dd2d51a876894f9f10023b1418ea6a45d8e':
Fix a bug with adding a word
Jean Chalard [Thu, 10 May 2012 16:26:31 +0000 (09:26 -0700)]
am
27154387: Implement the "more locales" feature.
* commit '
271543876d3ecccdb5547554778e91c9e7dd87ba':
Implement the "more locales" feature.
Jean Chalard [Thu, 10 May 2012 16:26:28 +0000 (09:26 -0700)]
am
eb995c79: Merge "Fix a bug with a duplicate entry" into jb-dev
* commit '
eb995c7939d6c471d41e606fd3d886ba72fc1851':
Fix a bug with a duplicate entry
Jean Chalard [Thu, 10 May 2012 16:26:27 +0000 (09:26 -0700)]
am
cfed94a6: Merge "Implement the delete button for user words" into jb-dev
* commit '
cfed94a65607fe9bb3387104c5368df31d73d04e':
Implement the delete button for user words
Russell Brenner [Thu, 10 May 2012 16:26:24 +0000 (09:26 -0700)]
am
7ff82ad4: Merge "Include Add Network button for Setup Wizard" into jb-dev
* commit '
7ff82ad4e06c8cf0339cc0bce0b54df9a2993a4f':
Include Add Network button for Setup Wizard
Russell Brenner [Thu, 10 May 2012 16:26:22 +0000 (09:26 -0700)]
am
33806e72: Merge "Change title to "Wi-Fi network"" into jb-dev
* commit '
33806e72b03c763333723c0d4df50de9140a6e09':
Change title to "Wi-Fi network"
Dianne Hackborn [Thu, 10 May 2012 16:25:51 +0000 (09:25 -0700)]
am
622fc7aa: Remove auto-brightness adjustment setting.
* commit '
622fc7aa5f1cf1a3840fb3777e731c6dc5f28d62':
Remove auto-brightness adjustment setting.
Dianne Hackborn [Thu, 10 May 2012 16:24:09 +0000 (09:24 -0700)]
am
87ca7017: Tweak development settings to report system property changes.
* commit '
87ca70172cc25ed2195d310b71d9c652a0757b88':
Tweak development settings to report system property changes.
Jean Chalard [Thu, 10 May 2012 09:08:07 +0000 (18:08 +0900)]
Fix breadcrumbs for user dictionary settings on tablets.
Bug:
6026080
Change-Id: I1c0fa796c8f60e0c0f406e277d9e29fc09a44742
Jean Chalard [Thu, 10 May 2012 06:08:17 +0000 (15:08 +0900)]
Fix a bug with adding a word
It was possible to insert a word without a shortcut while the same
word used to be present with a shortcut. This change fixes that.
Bug:
6026080
Change-Id: I3be98bf450aad8e2eb38336e8f77aedab39d5797
Jean Chalard [Thu, 10 May 2012 04:05:17 +0000 (13:05 +0900)]
Implement the "more locales" feature.
Bug:
6026080
Change-Id: I051a734321793e9130dc2cc77d4e7f670d2ce93d
Jean Chalard [Thu, 10 May 2012 07:29:21 +0000 (00:29 -0700)]
Merge "Fix a bug with a duplicate entry" into jb-dev
Jean Chalard [Thu, 10 May 2012 07:28:15 +0000 (00:28 -0700)]
Merge "Implement the delete button for user words" into jb-dev
Russell Brenner [Thu, 10 May 2012 05:53:59 +0000 (22:53 -0700)]
Merge "Include Add Network button for Setup Wizard" into jb-dev
Russell Brenner [Thu, 10 May 2012 05:48:38 +0000 (22:48 -0700)]
Merge "Change title to "Wi-Fi network"" into jb-dev
Russell Brenner [Thu, 10 May 2012 01:42:09 +0000 (18:42 -0700)]
Include Add Network button for Setup Wizard
To allow first-time users to set up on networks with hidden SSID,
include this button on the action bar. Temporarily using
placeholder text until artwork is available.
Bug:
6446220
Change-Id: I437ad3f37b42b93f7a0c6838cbb0c5090073e32d
Jean Chalard [Wed, 9 May 2012 11:30:02 +0000 (20:30 +0900)]
Fix a bug with a duplicate entry
When going to the "all languages" dictionary and opening an
entry, the "all languages" entry would be listed twice.
Change-Id: Ie8cd7e9e824e95c05899b956905af6590b8929bc
Jean Chalard [Wed, 9 May 2012 11:15:06 +0000 (20:15 +0900)]
Implement the delete button for user words
Bug:
6026080
Change-Id: I43345874edb0a1b51dfcac9c99e74c345eeef7e6
Russell Brenner [Thu, 10 May 2012 01:15:20 +0000 (18:15 -0700)]
Change title to "Wi-Fi network"
Bug:
6471984
Change-Id: I1b4a1b838f1751bf128978a17e1e01618cd3a26d
Dianne Hackborn [Wed, 9 May 2012 23:32:55 +0000 (16:32 -0700)]
Remove auto-brightness adjustment setting.
Not yet ready for release.
Change-Id: I4668e890080d63a29aeeeab4daad6a6466ae36af
Dianne Hackborn [Wed, 9 May 2012 21:03:26 +0000 (14:03 -0700)]
Tweak development settings to report system property changes.
Uses the new IBinder hack to tell all registered system services
about the property change. This should get most processes of
interest... some of them many times over, even.
This implementation does the broadcast for every debug property
change, though currently the only ones handling it are the
trace and layout bounds debugging properties.
Change-Id: Ibe3a10a40184751b8b2ed00021a224182d8f3f30
Amith Yamasani [Wed, 9 May 2012 20:32:43 +0000 (13:32 -0700)]
am
48c72676: Merge "Apps tabs align to title on 2-pane settings." into jb-dev
* commit '
48c72676b3717fc1f46c6e0ca9c4842ca6f588e1':
Apps tabs align to title on 2-pane settings.
Amith Yamasani [Wed, 9 May 2012 20:30:48 +0000 (13:30 -0700)]
Merge "Apps tabs align to title on 2-pane settings." into jb-dev
Amith Yamasani [Wed, 9 May 2012 16:43:33 +0000 (09:43 -0700)]
Apps tabs align to title on 2-pane settings.
Pad the lists in Apps screen.
Pad the color bar to align with the list.
Bug:
6449489
Change-Id: I28c39e2aae04a1fe36c6b7dc447ae19da575edaf
Daisuke Miyakawa [Wed, 9 May 2012 17:17:53 +0000 (10:17 -0700)]
am
fc363380: Merge "Introduce new "vibrate when ringing"" into jb-dev
* commit '
fc363380c2637d1737c4fb2ed8baf78e2a3ae59d':
Introduce new "vibrate when ringing"
Daisuke Miyakawa [Wed, 9 May 2012 17:16:14 +0000 (10:16 -0700)]
Merge "Introduce new "vibrate when ringing"" into jb-dev
Andrew Flynn [Wed, 9 May 2012 17:12:59 +0000 (10:12 -0700)]
am
decaba2c: Merge "Allow WiFi picker to exit after a valid connection is made" into jb-dev
* commit '
decaba2c674ec9c31283d9137654da35cfd13238':
Allow WiFi picker to exit after a valid connection is made
Andrew Flynn [Wed, 9 May 2012 17:10:34 +0000 (10:10 -0700)]
Merge "Allow WiFi picker to exit after a valid connection is made" into jb-dev
Vikram Aggarwal [Wed, 9 May 2012 16:22:55 +0000 (09:22 -0700)]
am
3d5688c7: Merge "Delay audio notification on user interaction" into jb-dev
* commit '
3d5688c7c8bb3b0c6ff9768decc88302882a44dc':
Delay audio notification on user interaction
Vikram Aggarwal [Wed, 9 May 2012 16:20:51 +0000 (09:20 -0700)]
Merge "Delay audio notification on user interaction" into jb-dev
Jean Chalard [Wed, 9 May 2012 11:38:21 +0000 (04:38 -0700)]
am
657beac9: Rework the de-duplication scheme for shortcuts.
* commit '
657beac9bb27d8c40b5193ecd49ec2c8d46f72bb':
Rework the de-duplication scheme for shortcuts.
Jean Chalard [Wed, 9 May 2012 11:06:10 +0000 (04:06 -0700)]
am
1571c0a3: Pass the shortcut to the user dictionary provider.
* commit '
1571c0a377f4aa94ef424da326a52fad638b3e54':
Pass the shortcut to the user dictionary provider.
Jean Chalard [Wed, 9 May 2012 10:51:20 +0000 (19:51 +0900)]
Rework the de-duplication scheme for shortcuts.
Bug:
4646172
Change-Id: I88966f3e910f51711ce49336fb9134d0953930de
Jean Chalard [Wed, 9 May 2012 09:39:36 +0000 (18:39 +0900)]
Pass the shortcut to the user dictionary provider.
Bug:
6026080
Change-Id: I87b7c8b1ae89856f393871e6d3440b43efc22a29
Jean Chalard [Wed, 9 May 2012 10:31:26 +0000 (03:31 -0700)]
am
99e509cc: Rework the list interface
* commit '
99e509cc4c2057dcfba1745ae7584fc1f4047aca':
Rework the list interface
Jean Chalard [Wed, 9 May 2012 08:47:17 +0000 (17:47 +0900)]
Rework the list interface
Display the shortcut in the list, and remove the cross button.
Bug:
6026080
Change-Id: I7f594f07a84e4df3ad5b8160129d92d1a4b0fc28
Jean Chalard [Wed, 9 May 2012 09:16:05 +0000 (02:16 -0700)]
Jean Chalard [Wed, 9 May 2012 09:14:17 +0000 (02:14 -0700)]
am
5642fdbf: Improve encapsulation
* commit '
5642fdbf43f06f3773076e3390a6bef120adfc80':
Improve encapsulation
Jean Chalard [Wed, 9 May 2012 09:14:17 +0000 (02:14 -0700)]
am
ac499c34: Remove the useless parts in the \'add word\' dialog.
* commit '
ac499c34fe99740760f729ec24f487a99028fd08':
Remove the useless parts in the 'add word' dialog.
Jean Chalard [Wed, 9 May 2012 09:12:31 +0000 (02:12 -0700)]
am
a0868ffd: Move the spinner code to the fragment.
* commit '
a0868ffd5ddcb1fa23c5b6e4b1043e40611bbd34':
Move the spinner code to the fragment.
Jean Chalard [Wed, 9 May 2012 09:01:49 +0000 (02:01 -0700)]
am
f54622e4: Cut a helper method to increase encapsulation.
* commit '
f54622e46c9164e4ab46c09c9c3ff173828d5940':
Cut a helper method to increase encapsulation.
Jean Chalard [Tue, 8 May 2012 11:39:46 +0000 (20:39 +0900)]
Small cleanup
Change-Id: Id8e8352b725d2259c70690a1a7dfe29fab9b6eb0
Jean Chalard [Tue, 8 May 2012 11:33:54 +0000 (20:33 +0900)]
Improve encapsulation
Change-Id: I30d28c3a62cc5de3432f04b6469eca077ee3eff6
Jean Chalard [Tue, 8 May 2012 11:25:00 +0000 (20:25 +0900)]
Remove the useless parts in the 'add word' dialog.
Bug:
6026080
Change-Id: Ic2bf6dcfc2abfe5fc07759530042299cc6a0b503
Jean Chalard [Tue, 8 May 2012 11:08:39 +0000 (20:08 +0900)]
Move the spinner code to the fragment.
Bug:
6026080
Change-Id: I49e1aa1839266ca169982b6a4800ee9923451be5
Jean Chalard [Tue, 8 May 2012 10:59:15 +0000 (19:59 +0900)]
Cut a helper method to increase encapsulation.
Change-Id: Ie47503a99d455f7266e281914e92ed680b993551
Dianne Hackborn [Wed, 9 May 2012 08:49:48 +0000 (01:49 -0700)]
am
821a4d8c: Merge "Settings to control traces." into jb-dev
* commit '
821a4d8c34e9a60f2f349ff63436c2ea0379ce9c':
Settings to control traces.
Carlos Valdivia [Wed, 9 May 2012 08:49:25 +0000 (01:49 -0700)]
am
a1f57c79: Merge "Occlude syncs without provider info." into jb-dev
* commit '
a1f57c7970f7ed2ee8fec7b4967a63ace17a0d61':
Occlude syncs without provider info.
Kenny Root [Wed, 9 May 2012 08:49:12 +0000 (01:49 -0700)]
am
db558415: Merge "Allow movement of forward-locked apps to SD" into jb-dev
* commit '
db5584158180bbb5af9a07f0c5f505388807f13c':
Allow movement of forward-locked apps to SD
Kenny Root [Wed, 9 May 2012 08:49:11 +0000 (01:49 -0700)]
am
267d43e6: Merge "Revert "Make verifier device id information visible"" into jb-dev
* commit '
267d43e6b75bcc1b60d4e72e54eec7619cac30dd':
Revert "Make verifier device id information visible"
Amith Yamasani [Wed, 9 May 2012 08:49:04 +0000 (01:49 -0700)]
am
e647fc62: Merge "Appease the monkey gods." into jb-dev
* commit '
e647fc62481e93aa6cb10e758dbb1acdbf950c8d':
Appease the monkey gods.
Eric Laurent [Wed, 9 May 2012 08:48:35 +0000 (01:48 -0700)]
am
98d262df: Merge "Changes for new vibration policy." into jb-dev
* commit '
98d262df0d0b6eb76b9ddbfb75cc5076a08301db':
Changes for new vibration policy.
Andrew Flynn [Wed, 9 May 2012 08:48:35 +0000 (01:48 -0700)]
am
a4139dc0: Merge "Hide Back button when requesting intent says to" into jb-dev
* commit '
a4139dc0e5db8eead3bbb4f68167e86a2a6402a5':
Hide Back button when requesting intent says to
Amith Yamasani [Wed, 9 May 2012 08:47:46 +0000 (01:47 -0700)]
am
95a893be: Merge "Avoid split action bar on phones." into jb-dev
* commit '
95a893bebb37844c481c8ca08d10f9bdee1aafd6':
Avoid split action bar on phones.
Jean Chalard [Wed, 9 May 2012 08:46:21 +0000 (01:46 -0700)]
am
fbffd0c9: Move the word commit code to UserDictionaryAddWordContent.
* commit '
fbffd0c98203c63af85a3fc6d85660b21c211bfe':
Move the word commit code to UserDictionaryAddWordContent.
Jean Chalard [Wed, 9 May 2012 08:46:21 +0000 (01:46 -0700)]
am
be3f0faf: Factor some code
* commit '
be3f0faf526d628b578b1af6d975c19cfdf8637b':
Factor some code
Jean Chalard [Wed, 9 May 2012 08:46:19 +0000 (01:46 -0700)]
am
be07e49a: Implement the "add word" screen according to new spec
* commit '
be07e49a9292b653b923cbfa64dc5c42972ded41':
Implement the "add word" screen according to new spec
Jean Chalard [Wed, 9 May 2012 08:46:06 +0000 (01:46 -0700)]
am
b9f837dd: Fix a janky transition
* commit '
b9f837dd1da22f41c72e0cdc1454a486dbc6c448':
Fix a janky transition
Amith Yamasani [Wed, 9 May 2012 08:45:27 +0000 (01:45 -0700)]
am
184ae2c3: Merge "Reduce the amount of I/O done on the UI thread." into jb-dev
* commit '
184ae2c3f2339fdbf7c5e538855c0e1afbf58e9e':
Reduce the amount of I/O done on the UI thread.
Irfan Sheriff [Wed, 9 May 2012 08:44:58 +0000 (01:44 -0700)]
am
63f7f5cd: Merge "Remove poor connection UI with watchdog disabled" into jb-dev
* commit '
63f7f5cda5481f613cf4fc32bf3c3531d731fa59':
Remove poor connection UI with watchdog disabled
Irfan Sheriff [Wed, 9 May 2012 08:44:40 +0000 (01:44 -0700)]
am
2bcca59f: Merge "Remove NSD checkbox" into jb-dev
* commit '
2bcca59f30a69b862808a5778fb1f07909b747d9':
Remove NSD checkbox
Dianne Hackborn [Wed, 9 May 2012 01:55:30 +0000 (18:55 -0700)]
Merge "Settings to control traces." into jb-dev
Daisuke Miyakawa [Tue, 8 May 2012 19:26:23 +0000 (12:26 -0700)]
Introduce new "vibrate when ringing"
We once removed "vibrate and ring" option with
I7168ed140266a7c754fb3d7209cf12e73041c306, while we still need
vibration setting which only affects Phone app.
This depends on I850d27629a75615647883fdaa2933f337c4824d1
See also I3a4ed2bd5e4bde05dfb97c7bb20b9284d1c6f13f for Phone app
side change.
Bug:
6036529
Change-Id: Idb0453e187f8025565d6744cd774613531e7cb8b
Carlos Valdivia [Wed, 9 May 2012 00:28:44 +0000 (17:28 -0700)]
Merge "Occlude syncs without provider info." into jb-dev
Kenny Root [Tue, 8 May 2012 23:56:00 +0000 (16:56 -0700)]
Merge "Allow movement of forward-locked apps to SD" into jb-dev