OSDN Git Service
satok [Fri, 4 Feb 2011 03:34:35 +0000 (19:34 -0800)]
Merge "Do not reset IME Subtype in InputMethodConfig fragment"
satok [Thu, 3 Feb 2011 13:27:27 +0000 (22:27 +0900)]
Do not reset IME Subtype in InputMethodConfig fragment
Bug:
3415292
Change-Id: Ic9a27982402c6bfd747960d32cce13f3856545da
Daisuke Miyakawa [Fri, 4 Feb 2011 02:18:31 +0000 (18:18 -0800)]
Remove unnecessary flag.
Bug:
3415073
Change-Id: I01d8c958a495bd7d9376304de1098b473b56a091
Wink Saville [Wed, 2 Feb 2011 21:25:05 +0000 (13:25 -0800)]
am
ec4045fa: am
327147eb: Have SecuritySettings and SoundSettings use getCurrentPhoneType
* commit '
ec4045faba607270c4d29b5016f0156fdd6a7eb4':
Have SecuritySettings and SoundSettings use getCurrentPhoneType
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
Jaikumar Ganesh [Wed, 2 Feb 2011 18:41:32 +0000 (10:41 -0800)]
Merge "Changes for public API of Bluetooth Discoverability."
Jaikumar Ganesh [Wed, 2 Feb 2011 03:58:29 +0000 (19:58 -0800)]
Changes for public API of Bluetooth Discoverability.
1. Apps can ask for any time between 0 and 3600 secs
2. O implies always discoverable
3. Any invalid values will default to the defaul - 120 secs.
Change-Id: Ife1bc803587ba975bb103a5ba7629d4a382cd705
Andy Stadler [Wed, 2 Feb 2011 02:19:42 +0000 (18:19 -0800)]
am
37033e1a: am
9597406a: Restart encryption display after screen power cycle
* commit '
37033e1a8857b125407350e64ef59b2060955d49':
Restart encryption display after screen power cycle
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:29:53 +0000 (17:29 -0800)]
am
5152fb05: am
95ef5575: Prevent NPE in onActivityResult
* commit '
5152fb05d1ac85e51fb88ee3fff2134376214fa2':
Prevent NPE in onActivityResult
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
Jaikumar Ganesh [Wed, 2 Feb 2011 00:26:54 +0000 (16:26 -0800)]
Merge "Allow users to change the length of Bluetooth discoverability to be two minues, five minutes, an hour, or forever discoverable."
Chris Wren [Tue, 1 Feb 2011 23:09:13 +0000 (15:09 -0800)]
Allow users to change the length of Bluetooth discoverability to
be two minues, five minutes, an hour, or forever discoverable.
This addresses the internal bug
2413429:
http://b/issue?id=
2413429
and external issue 6348:
http://code.google.com/p/android/issues/detail?id=6348
Original Author: Chris Wren <crwen@google.com>
Modifications done by: Jaikumar Ganesh<jaikumar@google.com>
Change-Id: Ie12e56ac41aa01a161d263c7525b6e021d4eeb1f
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:21:24 +0000 (16:21 -0800)]
am
9d06aac2: am
1499740c: Preserve wakelock through rotation
* commit '
9d06aac2c0b24ef704f5fa794e5d802a5f478db5':
Preserve wakelock through rotation
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 21:26:14 +0000 (13:26 -0800)]
am
7247e1a1: am
71863f3b: Merge "Use a custom media file for media volume sample." into honeycomb
* commit '
7247e1a10f4878a10fb6667b14be0dae0113dbb3':
Use a custom media file for media volume sample.
Daisuke Miyakawa [Tue, 1 Feb 2011 21:25:21 +0000 (13:25 -0800)]
am
d4eb7c6b: am
649b9f19: Disable left pane of "Input languages" conditionally.
* commit '
d4eb7c6be375d69a9f3b4a2196826a7941137b14':
Disable left pane of "Input languages" conditionally.
Andy Stadler [Tue, 1 Feb 2011 21:24:38 +0000 (13:24 -0800)]
am
b3d50cac: am
13d62049: More CryptKeeper UI work.
* commit '
b3d50cac649c101d1932825749ef686189c6b4f8':
More CryptKeeper UI work.
Daisuke Miyakawa [Tue, 1 Feb 2011 20:46:33 +0000 (12:46 -0800)]
Introduce "add network" again
The button was once disabled due to the issue
3400715.
See also Ic618078bc70a7db35ec22e6382b9486e92630120
Bug:
3403168
Change-Id: If823a0e8218480b89405e5c4fa6d1afe791eb6d5
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
Eric Fischer [Tue, 1 Feb 2011 04:39:12 +0000 (20:39 -0800)]
am
ba275d29: (-s ours) am
ba681faf: Merge "Import revised translations. DO NOT MERGE. Bug
3394542" into honeycomb
* commit '
ba275d29eaf777f85f18a96e3a6dc0b6fe1c4016':
Import revised translations. DO NOT MERGE. Bug
3394542
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 02:15:09 +0000 (18:15 -0800)]
am
4975590f: (-s ours) am
2b78f433: (-s ours) am
93580e22: Import revised translations. DO NOT MERGE
* commit '
4975590f320e3739ae4970b9c72d37e32fef63b2':
Import revised translations. DO NOT MERGE
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:46:43 +0000 (15:46 -0800)]
am
015bf7ae: am
a27868d9: Merge "Fix crash after adding a word to the user dictionary." into honeycomb
* commit '
015bf7ae34d9ef48cc6243c638ba51e598386d80':
Fix crash after adding a word to the user dictionary.
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
Daisuke Miyakawa [Mon, 31 Jan 2011 21:56:04 +0000 (13:56 -0800)]
am
6a452ce1: am
8ad1fb63: Merge "Disable back button on SetupWizard flow." into honeycomb
* commit '
6a452ce148f45cd0c8ac924803a29bb4a92bedbd':
Disable back button on SetupWizard flow.
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
Andy Stadler [Mon, 31 Jan 2011 19:05:50 +0000 (11:05 -0800)]
am
865ca2a2: am
17141200: Final cleanup of "password required" dialog
* commit '
865ca2a2efb4ebec3b6ddc89401f8544515cd43a':
Final cleanup of "password required" dialog
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:13:07 +0000 (20:13 -0800)]
am
89ebb843: am
88866927: Merge "Updating Settings icons in side menu Bug:
3362749" into honeycomb
* commit '
89ebb843be7a8c509cb0efbb5bf2812bb2dcb97f':
Updating Settings icons in side menu Bug:
3362749
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:30:13 +0000 (17:30 -0800)]
am
d19b76f6: am
f534db8a: Merge "Improvements to enable encryption steps" into honeycomb
* commit '
d19b76f6062665ce8e0f80276ee3076262f7c4b0':
Improvements to enable encryption steps
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:48:10 +0000 (16:48 -0800)]
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:55:37 +0000 (12:55 -0800)]
am
666fbc3b: Reconcile gingerbread-plus-aosp and honeycomb
* commit '
666fbc3b39aabfb2ff5cfe54acb33f07572f17dd':
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:34:12 +0000 (14:34 -0800)]
am
9685108e: am
6db0f05a: Deprecating old Settings icon completely Updating to new Settings launcher icon Bug:
3362749
* commit '
9685108ea050577d099e0c02ffb223b8cff3b7df':
Deprecating old Settings icon completely Updating to new Settings launcher icon Bug:
3362749
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:06:31 +0000 (12:06 -0800)]
am
bb627e40: am
a93196f1: Take care of null in Wifi setup.
* commit '
bb627e40cf7c174eb701eca8825e087355ba5eee':
Take care of null in Wifi setup.
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:17:12 +0000 (10:17 -0800)]
am
6c15162b: am
abeff000: Change sleep policy strings
* commit '
6c15162b7dd22e43852b1af3a38102a07f721f1c':
Change sleep policy strings
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:18:11 +0000 (09:18 -0800)]
am
8c152471: (-s ours) am
abdfaed8: (-s ours) am
5a2bb8c0: Import revised translations. DO NOT MERGE
* commit '
8c152471853613730429fa9104ad9ff61efa91ec':
Import revised translations. DO NOT MERGE
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:35:39 +0000 (08:35 -0800)]
am
f3ee2680: (-s ours) am
0cd5e21a: (-s ours) am
95112e5b: Import revised translations. DO NOT MERGE
* commit '
f3ee2680bc6a8dfd8b1cf09e2306fdc74476bd21':
Import revised translations. DO NOT MERGE
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:33:57 +0000 (02:33 -0800)]
am
2188a5e7: am
27682b0a: Merge "Clear mDialogFragment when it\'s detached" into honeycomb
* commit '
2188a5e7e5e8c070e0cc6913e0ded0d35288fbb8':
Clear mDialogFragment when it's detached
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:45:12 +0000 (18:45 -0800)]
am
1acf3d16: am
a0098bd3: Merge "bug:
3402846 fix settings->storage" into honeycomb
* commit '
1acf3d16298ac6a9c807db71d1a0f8908b9bed3d':
bug:
3402846 fix settings->storage
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:32:45 +0000 (17:32 -0800)]
am
c3bc1104: am
7bdf0e73: Move sleep policy to main settings page
* commit '
c3bc1104666ca4b54b849a5642ce7bc963a8e065':
Move sleep policy to main settings page
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:28:57 +0000 (16:28 -0800)]
am
e4df0b3e: am
46f4b754: Merge "Enlarge texts and fit the other elements" into honeycomb
* commit '
e4df0b3ec87ddcb6d480ffff5c954d9eee7bef74':
Enlarge texts and fit the other elements
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:18:20 +0000 (15:18 -0800)]
am
72badf79: (-s ours) am
335387da: Merge "Import revised translations. DO NOT MERGE" into honeycomb
* commit '
72badf79b4e86b6815e81d0e0dc2140799691fcf':
Import revised translations. DO NOT MERGE
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:25:37 +0000 (14:25 -0800)]
am
e3b22331: am
e1f883a3: Merge "Don\'t display extra A2DP profile icon for OPP." into honeycomb
* commit '
e3b223310787a3603dce40c776e55e4a911c6025':
Don't display extra A2DP profile icon for OPP.
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
OSDN Git Service
