Jim Miller
78713aed9e
Fix 3419077: implement new volume control in Settings.
...
Change-Id: Ia4b803315382d59ae231c26187afaceb69397952
2011-02-03 18:20:23 -08:00
Wink Saville
5ac151ccec
am ec4045fa
: am 327147eb
: Have SecuritySettings and SoundSettings use getCurrentPhoneType
...
* commit 'ec4045faba607270c4d29b5016f0156fdd6a7eb4':
Have SecuritySettings and SoundSettings use getCurrentPhoneType
2011-02-02 13:25:05 -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
Jaikumar Ganesh
c514edc7d4
Merge "Changes for public API of Bluetooth Discoverability."
2011-02-02 10:41:32 -08:00
Jaikumar Ganesh
d955af8461
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
2011-02-01 19:58:29 -08:00
Andy Stadler
5afd91ea27
am 37033e1a
: am 9597406a
: Restart encryption display after screen power cycle
...
* commit '37033e1a8857b125407350e64ef59b2060955d49':
Restart encryption display after screen power cycle
2011-02-01 18:19:42 -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
fe9535517c
am 5152fb05
: am 95ef5575
: Prevent NPE in onActivityResult
...
* commit '5152fb05d1ac85e51fb88ee3fff2134376214fa2':
Prevent NPE in onActivityResult
2011-02-01 17:29:53 -08:00
Jaikumar Ganesh
523cf81e18
Merge "Allow users to change the length of Bluetooth discoverability to be two minues, five minutes, an hour, or forever discoverable."
2011-02-01 16:26:54 -08:00
Chris Wren
1b0489cb3e
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
2011-02-01 16:25:44 -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
c9c8178bbb
am 9d06aac2
: am 1499740c
: Preserve wakelock through rotation
...
* commit '9d06aac2c0b24ef704f5fa794e5d802a5f478db5':
Preserve wakelock through rotation
2011-02-01 16:21:24 -08:00
Andy Stadler
1499740c13
Preserve wakelock through rotation
...
Bug: 3381450
Change-Id: Iea09d050231dfe31848666bdb186a5531d90e7bc
2011-02-01 15:34:59 -08:00
Amith Yamasani
6700e4c811
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.
2011-02-01 13:26:14 -08:00
Daisuke Miyakawa
d18f0b8616
am d4eb7c6b
: am 649b9f19
: Disable left pane of "Input languages" conditionally.
...
* commit 'd4eb7c6be375d69a9f3b4a2196826a7941137b14':
Disable left pane of "Input languages" conditionally.
2011-02-01 13:25:21 -08:00
Andy Stadler
f741743c28
am b3d50cac
: am 13d62049
: More CryptKeeper UI work.
...
* commit 'b3d50cac649c101d1932825749ef686189c6b4f8':
More CryptKeeper UI work.
2011-02-01 13:24:38 -08:00
Daisuke Miyakawa
fe7d04fee2
Introduce "add network" again
...
The button was once disabled due to the issue 3400715.
See also Ic618078bc70a7db35ec22e6382b9486e92630120
Bug: 3403168
Change-Id: If823a0e8218480b89405e5c4fa6d1afe791eb6d5
2011-02-01 12:46:33 -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
Amith Yamasani
ad39c70c2c
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.
2011-01-31 15:46:43 -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
Daisuke Miyakawa
8e7aff2c41
am 6a452ce1
: am 8ad1fb63
: Merge "Disable back button on SetupWizard flow." into honeycomb
...
* commit '6a452ce148f45cd0c8ac924803a29bb4a92bedbd':
Disable back button on SetupWizard flow.
2011-01-31 13:56:04 -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
Andy Stadler
69ba9331ad
am 865ca2a2
: am 17141200
: Final cleanup of "password required" dialog
...
* commit '865ca2a2efb4ebec3b6ddc89401f8544515cd43a':
Final cleanup of "password required" dialog
2011-01-31 11:05:50 -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
Andy Stadler
a946934cc3
am d19b76f6
: am f534db8a
: Merge "Improvements to enable encryption steps" into honeycomb
...
* commit 'd19b76f6062665ce8e0f80276ee3076262f7c4b0':
Improvements to enable encryption steps
2011-01-30 17:30:13 -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
Daisuke Miyakawa
3fb48a588a
am bb627e40
: am a93196f1
: Take care of null in Wifi setup.
...
* commit 'bb627e40cf7c174eb701eca8825e087355ba5eee':
Take care of null in Wifi setup.
2011-01-29 12:06:31 -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
Hung-ying Tyan
9bb922dd58
am 2188a5e7
: am 27682b0a
: Merge "Clear mDialogFragment when it\'s detached" into honeycomb
...
* commit '2188a5e7e5e8c070e0cc6913e0ded0d35288fbb8':
Clear mDialogFragment when it's detached
2011-01-29 02:33:57 -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
f3e7f5097d
am 1acf3d16
: am a0098bd3
: Merge "bug:3402846 fix settings->storage" into honeycomb
...
* commit '1acf3d16298ac6a9c807db71d1a0f8908b9bed3d':
bug:3402846 fix settings->storage
2011-01-28 18:45:12 -08:00
Vasu Nori
a0098bd346
Merge "bug:3402846 fix settings->storage" into honeycomb
2011-01-28 18:39:38 -08:00
Irfan Sheriff
785961e574
am c3bc1104
: am 7bdf0e73
: Move sleep policy to main settings page
...
* commit 'c3bc1104666ca4b54b849a5642ce7bc963a8e065':
Move sleep policy to main settings page
2011-01-28 17:32:45 -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
22e57a880f
am e4df0b3e
: am 46f4b754
: Merge "Enlarge texts and fit the other elements" into honeycomb
...
* commit 'e4df0b3ec87ddcb6d480ffff5c954d9eee7bef74':
Enlarge texts and fit the other elements
2011-01-28 16:28:57 -08:00
Daisuke Miyakawa
46f4b754e1
Merge "Enlarge texts and fit the other elements" into honeycomb
2011-01-28 16:23:45 -08:00
Jake Hamby
12f608479f
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.
2011-01-28 14:25:37 -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
Daisuke Miyakawa
defb07d3da
am b03c6276
: am a7155141
: Merge "Disable "add network" button." into honeycomb
...
* commit 'b03c6276248475212d98e0ebae34dbf534f2c714':
Disable "add network" button.
2011-01-28 12:39:58 -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
satok
efa39c573e
am 0f28e832
: am c9cd29dd
: Remove invalid call of "clearFocus" in SetupWizard......
...
* commit '0f28e83298a13328f7cd6147187a56c2a30b3e3f':
Remove invalid call of "clearFocus" in SetupWizard......
2011-01-28 09:50:59 -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