Eric Fischer
8639a46a22
Import revised translations. DO NOT MERGE
...
Change-Id: I3149acfebf3136ad06124721ee7e6c3615c5d20b
2011-02-25 10:51:03 -08:00
Amith Yamasani
5d6f0a16bb
Merge "Remove / re-word some settings for WiFi-only devices." into honeycomb
2011-02-24 14:23:16 -08:00
Eric Fischer
73c3d6bc24
Import revised translations. DO NOT MERGE
...
Change-Id: I8eb20d2d26afec12263438f7e7d0358139a5d000
2011-02-24 11:03:37 -08:00
Amith Yamasani
0f85c48d6c
Remove / re-word some settings for WiFi-only devices.
...
Bug: 3468248
1. Remove Wireless->Mobile networks
2. Remove Wireless->Tethering and WiFi hotspot
3. Remove Wireless->Wi-Fi Settings->Wi-Fi disconnect policy
4. Re-word Network location summary text to not include "mobile network"
Change-Id: I84a551a1b63591974731029b0d4b90a85e43a716
2011-02-24 10:53:29 -08:00
Eric Fischer
2279d3e18f
Import revised translations. DO NOT MERGE
...
Change-Id: I04b8a6b8c000e9c02fc2d8f352a82abcbd873835
2011-02-16 10:22:47 -08:00
Eric Fischer
c5d5334e9c
Import revised translations. DO NOT MERGE
...
Change-Id: Iadab60dd0e8902911647870d730709279ae8b197
2011-02-08 18:03:05 -08:00
Eric Fischer
805b5add43
Import revised translations. DO NOT MERGE
...
Change-Id: I82cf88e26e86820b0dc44d07f62a9bd8ac670ca9
2011-02-07 17:30:01 -08:00
Jim Miller
78713aed9e
Fix 3419077: implement new volume control in Settings.
...
Change-Id: Ia4b803315382d59ae231c26187afaceb69397952
2011-02-03 18:20:23 -08:00
Justin Ho
a9d8046c49
Updated icons in settings
...
Change-Id: If5eca6cf91e1c71d53694a0ce2d78485b8729737
2011-02-03 14:49:24 -08:00
Wink Saville
327147eb06
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
2011-02-02 11:30:25 -08:00
Andy Stadler
9597406aa1
Restart encryption display after screen power cycle
...
Bug: 3414241
Change-Id: I881fc14c3e0850089b98fcbdbd86c39dde22771c
2011-02-01 17:35:20 -08:00
Andy Stadler
95ef5575a2
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
2011-02-01 16:22:41 -08:00
Andy Stadler
1499740c13
Preserve wakelock through rotation
...
Bug: 3381450
Change-Id: Iea09d050231dfe31848666bdb186a5531d90e7bc
2011-02-01 15:34:59 -08:00
Amith Yamasani
71863f3b48
Merge "Use a custom media file for media volume sample." into honeycomb
2011-02-01 05:28:41 -08:00
Daisuke Miyakawa
649b9f19e1
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
2011-01-31 22:12:01 -08:00
Amith Yamasani
424953d55b
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
2011-01-31 21:20:22 -08:00
Andy Stadler
13d62049f7
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
2011-01-31 19:21:37 -08:00
Eric Fischer
ba681faf73
Merge "Import revised translations. DO NOT MERGE. Bug 3394542" into honeycomb
2011-01-31 17:28:26 -08:00
Amith Yamasani
a27868d9bd
Merge "Fix crash after adding a word to the user dictionary." into honeycomb
2011-01-31 15:20:30 -08:00
Eric Fischer
c16a1641f9
Import revised translations. DO NOT MERGE. Bug 3394542
...
Change-Id: Id6c2e64725cb9177263d9b9249125378fe04b29a
2011-01-31 12:48:02 -08:00
Amith Yamasani
8875edede1
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
2011-01-31 12:46:57 -08:00
Daisuke Miyakawa
8ad1fb6340
Merge "Disable back button on SetupWizard flow." into honeycomb
2011-01-31 11:55:43 -08:00
Daisuke Miyakawa
62fb701ea9
Disable back button on SetupWizard flow.
...
Bug: 3383738
Change-Id: Ie06d85ee22482f865a8173a45d0645699427729e
2011-01-31 11:05:05 -08:00
Andy Stadler
171412000a
Final cleanup of "password required" dialog
...
Bug: 3406068
Change-Id: I65c0e8f37236194565cb3a1cf022dfdfdc5c0044
2011-01-31 10:15:53 -08:00
Justin Ho
888669277e
Merge "Updating Settings icons in side menu Bug: 3362749" into honeycomb
2011-01-30 20:07:42 -08:00
Justin Ho
2019c8db03
Updating Settings icons in side menu
...
Bug: 3362749
Change-Id: I95c2d4a69e05fe5af3b89f4f3ee9e635403b5015
2011-01-30 20:04:46 -08:00
Andy Stadler
f534db8ae4
Merge "Improvements to enable encryption steps" into honeycomb
2011-01-30 17:09:11 -08:00
Roy West
66f32a8680
Fix bug 3405977.
...
Change-Id: I85c285a1dc07ba6e87ba9103c01a79c50d23bf60
2011-01-30 16:40:55 -08:00
Andy Stadler
8dbcb888ec
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
2011-01-30 16:25:38 -08:00
The Android Open Source Project
51985c04dd
Mass merge from gingerbread - do not merge
...
Change-Id: I2693f4f400c0c56df04ccb571bfd3420c6f0d697
2011-01-30 12:42:26 -08:00
Justin Ho
6db0f05a8d
Deprecating old Settings icon completely
...
Updating to new Settings launcher icon
Bug: 3362749
Change-Id: I4d33650b68aac3aa9ddd56d2acab614f80266840
2011-01-29 13:19:05 -08:00
Daisuke Miyakawa
a93196f165
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
2011-01-29 11:55:24 -08:00
Eric Fischer
29c03671f2
am 5a2bb8c0
: (-s ours) Import revised translations. DO NOT MERGE
...
* commit '5a2bb8c0dc33837696f80d6690d51f031d7884c8':
Import revised translations. DO NOT MERGE
2011-01-29 11:25:03 -08:00
Eric Fischer
22b0e7aa8b
am 95112e5b
: (-s ours) Import revised translations. DO NOT MERGE
...
* commit '95112e5b9810b6a70974ace6ee1c017b57e466af':
Import revised translations. DO NOT MERGE
2011-01-29 10:47:04 -08:00
Irfan Sheriff
abeff000fd
Change sleep policy strings
...
Bug: 3404049
Change-Id: I8ad3eae778c1695fc98aaca01ef26677fa8106f1
2011-01-29 09:10:13 -08:00
Hung-ying Tyan
27682b0aff
Merge "Clear mDialogFragment when it's detached" into honeycomb
2011-01-29 02:29:15 -08:00
Vasu Nori
a0098bd346
Merge "bug:3402846 fix settings->storage" into honeycomb
2011-01-28 18:39:38 -08:00
Vasu Nori
a3314e2bdb
bug:3402846 fix settings->storage
...
Change-Id: Icb9e33cb0336f87f43797330f56e9c8fcbe2dfd0
2011-01-28 17:14:38 -08:00
Irfan Sheriff
7bdf0e73d0
Move sleep policy to main settings page
...
Bug: 3404049
Change-Id: I091abd737894a4adb9ebfc08b8e63bc3224b971c
2011-01-28 17:00:37 -08:00
Daisuke Miyakawa
46f4b754e1
Merge "Enlarge texts and fit the other elements" into honeycomb
2011-01-28 16:23:45 -08:00
Eric Fischer
335387dafe
Merge "Import revised translations. DO NOT MERGE" into honeycomb
2011-01-28 15:10:11 -08:00
Eric Fischer
2eb1edc446
Import revised translations. DO NOT MERGE
...
Change-Id: Ifb50963e88a2d7c48440f0be4b411ede41ec0998
2011-01-28 14:58:24 -08:00
Daisuke Miyakawa
7893447987
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
2011-01-28 14:22:48 -08:00
Jake Hamby
e1f883a38c
Merge "Don't display extra A2DP profile icon for OPP." into honeycomb
2011-01-28 14:21:19 -08:00
Eric Fischer
5a2bb8c0dc
Import revised translations. DO NOT MERGE
...
Change-Id: Ic85518cac2e5c92d829bc71da778b68259524624
2011-01-28 13:21:54 -08:00
Daisuke Miyakawa
a71551418c
Merge "Disable "add network" button." into honeycomb
2011-01-28 12:36:07 -08:00
Daisuke Miyakawa
6ca5354727
Disable "add network" button.
...
It has broken UI which possibly get users stuck.
Bug: 3400715
Change-Id: Ic618078bc70a7db35ec22e6382b9486e92630120
2011-01-28 12:08:02 -08:00
Hung-ying Tyan
18eb39d085
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
2011-01-28 23:39:45 +08:00
satok
c9cd29ddb8
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
2011-01-28 18:03:47 +09:00
Dianne Hackborn
a5082305e8
Merge "Fix issue #3400255 Dialog fragments crash on rotation in Settings app" into honeycomb
2011-01-27 23:19:13 -08:00