OSDN Git Service
Eric Fischer [Tue, 22 Feb 2011 22:48:35 +0000 (14:48 -0800)]
am
058f62ba: (-s ours) am
bd044818: Import revised translations. DO NOT MERGE
* commit '
058f62baffb28df42cf0419fd06b776170289c71':
Import revised translations. DO NOT MERGE
Eric Fischer [Fri, 18 Feb 2011 23:22:41 +0000 (15:22 -0800)]
am
bd044818: Import revised translations. DO NOT MERGE
* commit '
bd0448185f32d52e3561e1b10e00e16ec5b4a7cd':
Import revised translations. DO NOT MERGE
Eric Fischer [Wed, 16 Feb 2011 18:37:32 +0000 (10:37 -0800)]
am
2279d3e1: Import revised translations. DO NOT MERGE
* commit '
2279d3e18fce7170fc48710617e2e814db5095fd':
Import revised translations. DO NOT MERGE
Eric Fischer [Wed, 16 Feb 2011 18:22:47 +0000 (10:22 -0800)]
Import revised translations. DO NOT MERGE
Change-Id: I04b8a6b8c000e9c02fc2d8f352a82abcbd873835
Eric Fischer [Tue, 15 Feb 2011 01:25:07 +0000 (17:25 -0800)]
Import revised translations. DO NOT MERGE
Change-Id: I8e7d2652c85f2bd516881e11283af62ee760adb1
Amith Yamasani [Fri, 11 Feb 2011 19:06:23 +0000 (11:06 -0800)]
am
255fa0e9: (-s ours) am
aae04e43: Prevent monkeys from USB tethering. It disconnects the test host. DO NOT MERGE.
* commit '
255fa0e96298da0f2ad1788fb79dfc353c8fc60a':
Prevent monkeys from USB tethering. It disconnects the test host. DO NOT MERGE.
Amith Yamasani [Fri, 11 Feb 2011 19:03:56 +0000 (11:03 -0800)]
am
aae04e43: Prevent monkeys from USB tethering. It disconnects the test host. DO NOT MERGE.
* commit '
aae04e43ec277c095e181933976dfa7bfd044288':
Prevent monkeys from USB tethering. It disconnects the test host. DO NOT MERGE.
Amith Yamasani [Fri, 11 Feb 2011 01:19:11 +0000 (17:19 -0800)]
Prevent monkeys from USB tethering. It disconnects the test host. DO NOT MERGE.
Bug:
3443747
Change-Id: Ied9c842e306e299fec7cd201415e0cfad0d29630
Eric Fischer [Thu, 10 Feb 2011 21:51:31 +0000 (13:51 -0800)]
am
d422079a: (-s ours) am
47d2ecd0: Import revised translations. DO NOT MERGE
* commit '
d422079aebadd598fe2b3f603b982978a615e11e':
Import revised translations. DO NOT MERGE
Eric Fischer [Wed, 9 Feb 2011 18:47:27 +0000 (10:47 -0800)]
am
c5d5334e: Import revised translations. DO NOT MERGE
* commit '
c5d5334e9c55e17c4df98af444c814569b3a77c5':
Import revised translations. DO NOT MERGE
Eric Fischer [Wed, 9 Feb 2011 02:03:05 +0000 (18:03 -0800)]
Import revised translations. DO NOT MERGE
Change-Id: Iadab60dd0e8902911647870d730709279ae8b197
Eric Fischer [Wed, 9 Feb 2011 01:33:14 +0000 (17:33 -0800)]
am
47d2ecd0: Import revised translations. DO NOT MERGE
* commit '
47d2ecd0c4faf758f59f4eb59f515a41091c39e0':
Import revised translations. DO NOT MERGE
Eric Fischer [Tue, 8 Feb 2011 18:45:36 +0000 (10:45 -0800)]
am
805b5add: Import revised translations. DO NOT MERGE
* commit '
805b5add435d2c639363d239cf9abf32cd5a1fdd':
Import revised translations. DO NOT MERGE
Eric Fischer [Tue, 8 Feb 2011 01:30:01 +0000 (17:30 -0800)]
Import revised translations. DO NOT MERGE
Change-Id: I82cf88e26e86820b0dc44d07f62a9bd8ac670ca9
Eric Fischer [Mon, 7 Feb 2011 21:38:01 +0000 (13:38 -0800)]
Import revised translations. DO NOT MERGE
Change-Id: If53b83d77929ba02915eeafd3c614599316cca1e
Jake Hamby [Sat, 5 Feb 2011 01:49:01 +0000 (17:49 -0800)]
am
47cb1753: (-s ours) am
1798fc04: Merge "Fixed a memory leak in the bluetooth settings"
* commit '
47cb175396c8b020eded62d6c2293b777f20932b':
Fixed a memory leak in the bluetooth settings
Jake Hamby [Sat, 5 Feb 2011 00:20:15 +0000 (16:20 -0800)]
am
1798fc04: Merge "Fixed a memory leak in the bluetooth settings"
* commit '
1798fc049eda5f6fd14be3a369eebe81c851abd2':
Fixed a memory leak in the bluetooth settings
Jake Hamby [Sat, 5 Feb 2011 00:12:54 +0000 (16:12 -0800)]
Merge "Fixed a memory leak in the bluetooth settings"
Jim Miller [Fri, 4 Feb 2011 02:42:11 +0000 (18:42 -0800)]
am
78713aed: Fix
3419077: implement new volume control in Settings.
* commit '
78713aed9e23fbf2f89edae87b2ba9e1387104ff':
Fix
3419077: implement new volume control in Settings.
Jim Miller [Thu, 3 Feb 2011 07:29:03 +0000 (23:29 -0800)]
Fix
3419077: implement new volume control in Settings.
Change-Id: Ia4b803315382d59ae231c26187afaceb69397952
Justin Ho [Thu, 3 Feb 2011 23:33:45 +0000 (15:33 -0800)]
am
a9d8046c: Updated icons in settings
* commit '
a9d8046c490a2295d6bda1e5eb4bd49838a5c064':
Updated icons in settings
Justin Ho [Thu, 3 Feb 2011 22:49:24 +0000 (14:49 -0800)]
Updated icons in settings
Change-Id: If5eca6cf91e1c71d53694a0ce2d78485b8729737
Wink Saville [Wed, 2 Feb 2011 21:20:06 +0000 (13:20 -0800)]
am
327147eb: Have SecuritySettings and SoundSettings use getCurrentPhoneType
* commit '
327147eb062a25ecab40d66ea14559070e0ecef3':
Have SecuritySettings and SoundSettings use getCurrentPhoneType
Wink Saville [Wed, 2 Feb 2011 19:30:25 +0000 (11:30 -0800)]
Have SecuritySettings and SoundSettings use getCurrentPhoneType
To preserve proper behavior now that getPhoneType can return
PHONE_TYPE_NONE use getCurrentPhoneType.
bug:
3198435
Change-Id: I39d385b17d746f3c7cdbc3e1869efa5d4e89230c
Andy Stadler [Wed, 2 Feb 2011 02:17:19 +0000 (18:17 -0800)]
am
9597406a: Restart encryption display after screen power cycle
* commit '
9597406aa1b83867b03a47d1a5162969b924f2fc':
Restart encryption display after screen power cycle
Andy Stadler [Wed, 2 Feb 2011 01:35:20 +0000 (17:35 -0800)]
Restart encryption display after screen power cycle
Bug:
3414241
Change-Id: I881fc14c3e0850089b98fcbdbd86c39dde22771c
Andy Stadler [Wed, 2 Feb 2011 01:27:26 +0000 (17:27 -0800)]
am
95ef5575: Prevent NPE in onActivityResult
* commit '
95ef5575a2b70d8c018f99b218353c925a70d418':
Prevent NPE in onActivityResult
Andy Stadler [Wed, 2 Feb 2011 00:22:41 +0000 (16:22 -0800)]
Prevent NPE in onActivityResult
We're returning here in an unexpected condition; Treat all inputs
as suspect and verify before proceeding.
Bug:
3399579
Change-Id: I389bd0528f8bc721afb5a9c4646a2e23fde77f77
Andy Stadler [Wed, 2 Feb 2011 00:17:51 +0000 (16:17 -0800)]
am
1499740c: Preserve wakelock through rotation
* commit '
1499740c13af5fbd5766a87825c3e789b37bab24':
Preserve wakelock through rotation
Andy Stadler [Tue, 1 Feb 2011 23:34:59 +0000 (15:34 -0800)]
Preserve wakelock through rotation
Bug:
3381450
Change-Id: Iea09d050231dfe31848666bdb186a5531d90e7bc
Amith Yamasani [Tue, 1 Feb 2011 13:31:04 +0000 (05:31 -0800)]
am
71863f3b: Merge "Use a custom media file for media volume sample." into honeycomb
* commit '
71863f3b48588cbbcae93bc784ebefbeec47c25f':
Use a custom media file for media volume sample.
Amith Yamasani [Tue, 1 Feb 2011 13:28:41 +0000 (05:28 -0800)]
Merge "Use a custom media file for media volume sample." into honeycomb
Daisuke Miyakawa [Tue, 1 Feb 2011 06:49:16 +0000 (22:49 -0800)]
am
649b9f19: Disable left pane of "Input languages" conditionally.
* commit '
649b9f19e1193547f339239afa32d569f43358fc':
Disable left pane of "Input languages" conditionally.
Daisuke Miyakawa [Mon, 31 Jan 2011 03:43:08 +0000 (19:43 -0800)]
Disable left pane of "Input languages" conditionally.
The screen is available from LatinIME's setting button, in which
we don't want the left pane, while we want the left pane when
launched as part of Settings app.
Bug:
3383738
Change-Id: I62e901e7cc14053742ae35829d82c20e432a358f
Amith Yamasani [Tue, 1 Feb 2011 05:15:54 +0000 (21:15 -0800)]
Use a custom media file for media volume sample.
Bug:
3409194
Intercept volume hard keys and ignore them if not voice capable.
Change-Id: Ieb620f1cfff675ab5a6a8ee69a7dd42355d2932e
Andy Stadler [Tue, 1 Feb 2011 04:01:16 +0000 (20:01 -0800)]
am
13d62049: More CryptKeeper UI work.
* commit '
13d62049f7c96c47356f23eaee7f0997612fdf9f':
More CryptKeeper UI work.
Andy Stadler [Tue, 1 Feb 2011 03:21:37 +0000 (19:21 -0800)]
More CryptKeeper UI work.
* Implemented failure case.
* More pixel perfect
* Remove the animation
* Display the encroid on the blank screen
* Remove the back button.
* Fix portrait mode screens
Bug:
3384231
Bug:
3394103
Bug:
3388721
Bug:
3381450
Bug:
3406278
Bug:
3351832
Change-Id: Ib763c8b577198deb45255acc767bc6d5409efc0c
Eric Fischer [Tue, 1 Feb 2011 02:33:54 +0000 (18:33 -0800)]
am
ba681faf: Merge "Import revised translations. DO NOT MERGE. Bug
3394542" into honeycomb
* commit '
ba681faf73906dcc9c372008855667437b034cc4':
Import revised translations. DO NOT MERGE. Bug
3394542
Eric Fischer [Tue, 1 Feb 2011 01:48:48 +0000 (17:48 -0800)]
am
2b78f433: (-s ours) am
93580e22: Import revised translations. DO NOT MERGE
* commit '
2b78f43322970a9a8bfc215be1ee3656940f1fcd':
Import revised translations. DO NOT MERGE
Eric Fischer [Tue, 1 Feb 2011 01:28:26 +0000 (17:28 -0800)]
Merge "Import revised translations. DO NOT MERGE. Bug
3394542" into honeycomb
Eric Fischer [Tue, 1 Feb 2011 00:15:26 +0000 (16:15 -0800)]
am
93580e22: Import revised translations. DO NOT MERGE
* commit '
93580e222c156e06b348d228bec24d83836af1f2':
Import revised translations. DO NOT MERGE
Amith Yamasani [Mon, 31 Jan 2011 23:22:59 +0000 (15:22 -0800)]
am
a27868d9: Merge "Fix crash after adding a word to the user dictionary." into honeycomb
* commit '
a27868d9bd2953a9c82deb09edddf8192ddc07f9':
Fix crash after adding a word to the user dictionary.
Amith Yamasani [Mon, 31 Jan 2011 23:20:30 +0000 (15:20 -0800)]
Merge "Fix crash after adding a word to the user dictionary." into honeycomb
Eric Fischer [Mon, 31 Jan 2011 20:48:02 +0000 (12:48 -0800)]
Import revised translations. DO NOT MERGE. Bug
3394542
Change-Id: Id6c2e64725cb9177263d9b9249125378fe04b29a
Amith Yamasani [Mon, 31 Jan 2011 20:46:57 +0000 (12:46 -0800)]
Fix crash after adding a word to the user dictionary.
Bug:
3407951
Make sure that the parent fragment is a SettingsPreferenceFragment. Otherwise it's not
necessary to manage the mDialogFragment.
Change-Id: I331a3507fe11a7331ff24ecf64fe8c8c3f613636
Eric Fischer [Mon, 31 Jan 2011 20:25:49 +0000 (12:25 -0800)]
Import revised translations. DO NOT MERGE
Change-Id: I7189d018da1a65d6e37b16353b1133b6a51d0df1
Daisuke Miyakawa [Mon, 31 Jan 2011 19:59:36 +0000 (11:59 -0800)]
am
8ad1fb63: Merge "Disable back button on SetupWizard flow." into honeycomb
* commit '
8ad1fb63403e624f730684db4a3b0ea8aec80b78':
Disable back button on SetupWizard flow.
Daisuke Miyakawa [Mon, 31 Jan 2011 19:55:43 +0000 (11:55 -0800)]
Merge "Disable back button on SetupWizard flow." into honeycomb
Daisuke Miyakawa [Mon, 31 Jan 2011 19:03:09 +0000 (11:03 -0800)]
Disable back button on SetupWizard flow.
Bug:
3383738
Change-Id: Ie06d85ee22482f865a8173a45d0645699427729e
Andy Stadler [Mon, 31 Jan 2011 19:03:45 +0000 (11:03 -0800)]
am
17141200: Final cleanup of "password required" dialog
* commit '
171412000a95ce35fd3461afe7bcc5b7f2f210f4':
Final cleanup of "password required" dialog
Andy Stadler [Mon, 31 Jan 2011 18:15:53 +0000 (10:15 -0800)]
Final cleanup of "password required" dialog
Bug:
3406068
Change-Id: I65c0e8f37236194565cb3a1cf022dfdfdc5c0044
Justin Ho [Mon, 31 Jan 2011 04:10:23 +0000 (20:10 -0800)]
am
88866927: Merge "Updating Settings icons in side menu Bug:
3362749" into honeycomb
* commit '
888669277e2b6220162fe25e368a9cc9c208e501':
Updating Settings icons in side menu Bug:
3362749
Justin Ho [Mon, 31 Jan 2011 04:07:42 +0000 (20:07 -0800)]
Merge "Updating Settings icons in side menu Bug:
3362749" into honeycomb
Justin Ho [Mon, 31 Jan 2011 04:04:46 +0000 (20:04 -0800)]
Updating Settings icons in side menu
Bug:
3362749
Change-Id: I95c2d4a69e05fe5af3b89f4f3ee9e635403b5015
Andy Stadler [Mon, 31 Jan 2011 01:12:38 +0000 (17:12 -0800)]
am
f534db8a: Merge "Improvements to enable encryption steps" into honeycomb
* commit '
f534db8ae4d62b39e5afecb2242c06dadf070e99':
Improvements to enable encryption steps
Andy Stadler [Mon, 31 Jan 2011 01:09:11 +0000 (17:09 -0800)]
Merge "Improvements to enable encryption steps" into honeycomb
Roy West [Mon, 31 Jan 2011 00:45:33 +0000 (16:45 -0800)]
Roy West [Mon, 31 Jan 2011 00:40:55 +0000 (16:40 -0800)]
Fix bug
3405977.
Change-Id: I85c285a1dc07ba6e87ba9103c01a79c50d23bf60
Andy Stadler [Mon, 31 Jan 2011 00:25:38 +0000 (16:25 -0800)]
Improvements to enable encryption steps
* Don't crash when user has pattern lock
* Updated text for final confirmation screen
* Show power & battery level warning text
* Updated layout for both confirmation screens (cleaned up margins,
removed hardcoded text sizes, made settings & confirm consistent).
* Added comments for translators to all cryptkeeper strings
Bug:
3383190
Bug:
3383292
Bug:
3405707
Change-Id: I1adcdd963a549eb6541662ff941d245db5563710
The Android Open Source Project [Sun, 30 Jan 2011 20:42:26 +0000 (12:42 -0800)]
Reconcile gingerbread-plus-aosp and honeycomb
Change-Id: I8f09b42bc0bccc5e1455e6d9372a0488394de35c
The Android Open Source Project [Sun, 30 Jan 2011 20:42:26 +0000 (12:42 -0800)]
Mass merge from gingerbread - do not merge
Change-Id: I2693f4f400c0c56df04ccb571bfd3420c6f0d697
Justin Ho [Sat, 29 Jan 2011 22:32:34 +0000 (14:32 -0800)]
am
6db0f05a: Deprecating old Settings icon completely Updating to new Settings launcher icon Bug:
3362749
* commit '
6db0f05a8df1e8d1d6d4cd7601caad8b5ec8bd75':
Deprecating old Settings icon completely Updating to new Settings launcher icon Bug:
3362749
Justin Ho [Sat, 29 Jan 2011 21:19:05 +0000 (13:19 -0800)]
Deprecating old Settings icon completely
Updating to new Settings launcher icon
Bug:
3362749
Change-Id: I4d33650b68aac3aa9ddd56d2acab614f80266840
Daisuke Miyakawa [Sat, 29 Jan 2011 20:04:06 +0000 (12:04 -0800)]
am
a93196f1: Take care of null in Wifi setup.
* commit '
a93196f1651a0598d6e398f6fb3c2e513a3b7091':
Take care of null in Wifi setup.
Daisuke Miyakawa [Sat, 29 Jan 2011 19:55:24 +0000 (11:55 -0800)]
Take care of null in Wifi setup.
The preference isn't available in Wifi setup launched from
SetupWizard, causing NPE.
Bug:
3404998
Change-Id: Ia0dabea95e5e7424698a269c0851d610fd305309
Eric Fischer [Sat, 29 Jan 2011 19:25:03 +0000 (11:25 -0800)]
am
5a2bb8c0: (-s ours) Import revised translations. DO NOT MERGE
* commit '
5a2bb8c0dc33837696f80d6690d51f031d7884c8':
Import revised translations. DO NOT MERGE
Eric Fischer [Sat, 29 Jan 2011 18:47:04 +0000 (10:47 -0800)]
am
95112e5b: (-s ours) Import revised translations. DO NOT MERGE
* commit '
95112e5b9810b6a70974ace6ee1c017b57e466af':
Import revised translations. DO NOT MERGE
Irfan Sheriff [Sat, 29 Jan 2011 18:14:45 +0000 (10:14 -0800)]
am
abeff000: Change sleep policy strings
* commit '
abeff000fdd0c421ee514effb83c202174209b9d':
Change sleep policy strings
Eric Fischer [Sat, 29 Jan 2011 17:12:45 +0000 (09:12 -0800)]
am
abdfaed8: (-s ours) am
5a2bb8c0: Import revised translations. DO NOT MERGE
* commit '
abdfaed8f4791a5f1776a005dd58c33e595842e8':
Import revised translations. DO NOT MERGE
Irfan Sheriff [Sat, 29 Jan 2011 16:58:23 +0000 (08:58 -0800)]
Change sleep policy strings
Bug:
3404049
Change-Id: I8ad3eae778c1695fc98aaca01ef26677fa8106f1
Eric Fischer [Sat, 29 Jan 2011 16:02:39 +0000 (08:02 -0800)]
am
0cd5e21a: (-s ours) am
95112e5b: Import revised translations. DO NOT MERGE
* commit '
0cd5e21a40fce62738792a45608a9b9391f62d2b':
Import revised translations. DO NOT MERGE
Hung-ying Tyan [Sat, 29 Jan 2011 10:31:34 +0000 (02:31 -0800)]
am
27682b0a: Merge "Clear mDialogFragment when it\'s detached" into honeycomb
* commit '
27682b0aff076e9d4ef6c4651effc9ce47ff6fb6':
Clear mDialogFragment when it's detached
Hung-ying Tyan [Sat, 29 Jan 2011 10:29:15 +0000 (02:29 -0800)]
Merge "Clear mDialogFragment when it's detached" into honeycomb
Vasu Nori [Sat, 29 Jan 2011 02:42:50 +0000 (18:42 -0800)]
am
a0098bd3: Merge "bug:
3402846 fix settings->storage" into honeycomb
* commit '
a0098bd34602acdf129ded0152ffeb07bb64d28d':
bug:
3402846 fix settings->storage
Vasu Nori [Sat, 29 Jan 2011 02:39:38 +0000 (18:39 -0800)]
Merge "bug:
3402846 fix settings->storage" into honeycomb
Irfan Sheriff [Sat, 29 Jan 2011 01:30:59 +0000 (17:30 -0800)]
am
7bdf0e73: Move sleep policy to main settings page
* commit '
7bdf0e73d051f176fbc20451761eb50177d69f91':
Move sleep policy to main settings page
Vasu Nori [Fri, 28 Jan 2011 22:32:45 +0000 (14:32 -0800)]
bug:
3402846 fix settings->storage
Change-Id: Icb9e33cb0336f87f43797330f56e9c8fcbe2dfd0
Irfan Sheriff [Sat, 29 Jan 2011 00:42:33 +0000 (16:42 -0800)]
Move sleep policy to main settings page
Bug:
3404049
Change-Id: I091abd737894a4adb9ebfc08b8e63bc3224b971c
Daisuke Miyakawa [Sat, 29 Jan 2011 00:26:08 +0000 (16:26 -0800)]
am
46f4b754: Merge "Enlarge texts and fit the other elements" into honeycomb
* commit '
46f4b754e1173cfc7065df39311ab5c30f92ed60':
Enlarge texts and fit the other elements
Daisuke Miyakawa [Sat, 29 Jan 2011 00:23:45 +0000 (16:23 -0800)]
Merge "Enlarge texts and fit the other elements" into honeycomb
Eric Fischer [Fri, 28 Jan 2011 23:14:04 +0000 (15:14 -0800)]
am
335387da: Merge "Import revised translations. DO NOT MERGE" into honeycomb
* commit '
335387dafe912d3487ef93aa3250ca3059bdfd48':
Import revised translations. DO NOT MERGE
Eric Fischer [Fri, 28 Jan 2011 23:10:11 +0000 (15:10 -0800)]
Merge "Import revised translations. DO NOT MERGE" into honeycomb
Eric Fischer [Fri, 28 Jan 2011 22:58:24 +0000 (14:58 -0800)]
Import revised translations. DO NOT MERGE
Change-Id: Ifb50963e88a2d7c48440f0be4b411ede41ec0998
Jake Hamby [Fri, 28 Jan 2011 22:23:13 +0000 (14:23 -0800)]
am
e1f883a3: Merge "Don\'t display extra A2DP profile icon for OPP." into honeycomb
* commit '
e1f883a38c13ebb8ac7a66172f30b3b01b4577c0':
Don't display extra A2DP profile icon for OPP.
Daisuke Miyakawa [Thu, 27 Jan 2011 02:37:10 +0000 (18:37 -0800)]
Enlarge texts and fit the other elements
Basically set text size to 18sp and change layouts
along with the new design.
- Add custom list item xml for Wi-Fi security field
rename existing "custom_list_item.xml" to appropriate
name so that we won't be confused with their naming.
- Use the custom xml just in SetupWizard.
Bug:
3364731
Change-Id: I014903277a03c359ea193dd0f0a37c84ade19fa1
Jake Hamby [Fri, 28 Jan 2011 22:21:19 +0000 (14:21 -0800)]
Merge "Don't display extra A2DP profile icon for OPP." into honeycomb
Eric Fischer [Fri, 28 Jan 2011 22:16:07 +0000 (14:16 -0800)]
am
5a2bb8c0: Import revised translations. DO NOT MERGE
* commit '
5a2bb8c0dc33837696f80d6690d51f031d7884c8':
Import revised translations. DO NOT MERGE
Eric Fischer [Fri, 28 Jan 2011 21:21:54 +0000 (13:21 -0800)]
Import revised translations. DO NOT MERGE
Change-Id: Ic85518cac2e5c92d829bc71da778b68259524624
Daisuke Miyakawa [Fri, 28 Jan 2011 20:38:27 +0000 (12:38 -0800)]
am
a7155141: Merge "Disable "add network" button." into honeycomb
* commit '
a71551418cfeeb6da335bbc83fca80de4a82fa07':
Disable "add network" button.
Daisuke Miyakawa [Fri, 28 Jan 2011 20:36:07 +0000 (12:36 -0800)]
Merge "Disable "add network" button." into honeycomb
Daisuke Miyakawa [Fri, 28 Jan 2011 17:53:52 +0000 (09:53 -0800)]
Disable "add network" button.
It has broken UI which possibly get users stuck.
Bug:
3400715
Change-Id: Ic618078bc70a7db35ec22e6382b9486e92630120
satok [Fri, 28 Jan 2011 17:49:34 +0000 (09:49 -0800)]
am
c9cd29dd: Remove invalid call of "clearFocus" in SetupWizard......
* commit '
c9cd29ddb832fd76d96fea080abe8325a8bb1bd2':
Remove invalid call of "clearFocus" in SetupWizard......
Hung-ying Tyan [Fri, 28 Jan 2011 08:17:27 +0000 (16:17 +0800)]
Clear mDialogFragment when it's detached
and re-associate it when it's re-created.
Before this CL, the association is gone when fragment goes through the pause-resume
cycle.
Similarly, restore onDismiss and onCancel listeners in VpnSettings.onCreateDialog(),
restore states in onCreate() instead of onActivityCreated() so that screen rotation
can be handled correctly.
Now that profiles are shared between Settings instances, always handle state change
in VpnSettings.changeState() so that state changed in one instance can be conveyed
to the other and preferences can be correctly enabled/disabled.
In additions, fix some trivial mistakes in VpnSettings.
Bug:
3396394
Change-Id: I242e1ed6c6d410b4dfefb373d8f98266fc9b46d0
satok [Fri, 28 Jan 2011 08:36:27 +0000 (17:36 +0900)]
Remove invalid call of "clearFocus" in SetupWizard......
Bug:
3398097
- Also disabled logging......
- Once you call "clearFocus", onFocusChanged will be called and
EditText will try to show the keyboard again. And while bringing up the keyboard,
the activity is changed and it will end up with the keyboard being shown in the next activity...
Change-Id: If4d3876d4950bb2583c5588f462a94d022d6a7cf
Dianne Hackborn [Fri, 28 Jan 2011 07:20:37 +0000 (23:20 -0800)]
am
a5082305: Merge "Fix issue #
3400255 Dialog fragments crash on rotation in Settings app" into honeycomb
* commit '
a5082305e8c4f3107ec1802b9fd911aba1c288f3':
Fix issue #
3400255 Dialog fragments crash on rotation in Settings app
Dianne Hackborn [Fri, 28 Jan 2011 07:19:13 +0000 (23:19 -0800)]
Merge "Fix issue #
3400255 Dialog fragments crash on rotation in Settings app" into honeycomb
Dianne Hackborn [Fri, 28 Jan 2011 04:39:21 +0000 (20:39 -0800)]
Fix issue #
3400255 Dialog fragments crash on rotation in Settings app
Change-Id: I337c1fb41e3fbedd7982418df497487481bb35d2
Jake Hamby [Fri, 28 Jan 2011 04:32:21 +0000 (20:32 -0800)]
Don't display extra A2DP profile icon for OPP.
The getDrawableResource() method for OppProfileManager was returning
the resource ID for the A2DP icon. This was causing an extra headset
icon to be drawn for devices supporting OPP, when no icon should be
shown for this profile. Changed to return 0.
Bug:
3368197
Change-Id: Idcadaf59fe53301544cda215ca24f15608b2d727
Justin Ho [Fri, 28 Jan 2011 03:08:25 +0000 (19:08 -0800)]
am
3b3af8d3: Merge "Updating Delete and Refresh icons to Honeycomb style" into honeycomb
* commit '
3b3af8d3b0e6f76c355ce5363ed4c582f620cc4e':
Updating Delete and Refresh icons to Honeycomb style
Justin Ho [Fri, 28 Jan 2011 03:06:24 +0000 (19:06 -0800)]
Merge "Updating Delete and Refresh icons to Honeycomb style" into honeycomb
OSDN Git Service
