Commit Graph

600 Commits

Author SHA1 Message Date
Doug Zongker
e18897bc22 am 26c433c1: am 489c7bff: show Build.SERIAL in settings > about > status
* commit '26c433c1c64416aed4736bb5a76b0ac4585958a1':
  show Build.SERIAL in settings > about > status
2011-02-25 17:30:55 -08:00
Doug Zongker
489c7bff5c show Build.SERIAL in settings > about > status
For wifi-only devices, this may be the only way we have to identify
the device.

Change-Id: I70c09e4cdb101282e5d085bcab3f57c890bc7a98
Bug: 3490911
2011-02-25 15:01:50 -08:00
Vasu Nori
587aebad8a Merge "replace some ugly code with not-too-ugly code.." 2011-02-24 23:37:38 -08:00
Vasu Nori
8128ff8cbe replace some ugly code with not-too-ugly code..
replaced this kind of code
   string + " " + number + "out of" + " " + number
with this
   String.format("%1$d out of %2$d", number, number);

Change-Id: If1cc296da48dd6823e9081a55b6eab2e3fcee552
2011-02-24 23:32:08 -08:00
Amith Yamasani
a377470486 am 88de52da: am 5d6f0a16: Merge "Remove / re-word some settings for WiFi-only devices." into honeycomb
* commit '88de52da15ed94d6eb70ae75e0df2ddbce923eb0':
  Remove / re-word some settings for WiFi-only devices.
2011-02-24 20:31:58 -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
Amith Yamasani
7456f67bb9 Display -> Screen
Bug: 3337458

Change occurences of Display to Screen.

Change-Id: I39ae963d4797c21a5742e4eb81de743b02cd09c2
2011-02-22 14:44:18 -08:00
Vasu Nori
e00489a835 Merge "display amount of storage on /sdcard by downloads, music etc" 2011-02-18 12:06:41 -08:00
Vasu Nori
21809740f2 display amount of storage on /sdcard by downloads, music etc
when music storage usage is clicked on, show music app
when downloads storage usage is clicked on, show download app
when pic/videos storage usage is clicked on, show gallery app

Change-Id: Ia1c341013e550acb537e6f8a4f4558030888cc45
2011-02-18 12:05:13 -08:00
Roy West
642b89d0f4 Fix double-space in string.
Change-Id: I6d1cf8a100ab6c56330f736d4a1582ba95e6d8e1
2011-02-17 21:41:46 -08:00
Roy West
0178b15fcc Fix bug 3463538.
Change-Id: I29c08eace1ba14f7d5cbad55cffbb2b024f518da
2011-02-17 21:34:50 -08:00
Roy West
92f94eb9ea Fix 3468005.
Change-Id: Idb8ceebbda8025dab13f2c5253d2d04c7eb1b710
2011-02-17 20:01:07 -08:00
Irfan Sheriff
c1a322854d Add support for WPA for soft Ap
Bug: 2771935
Change-Id: I2c02b4e686a65e0748f4a4afd27dc49602d6dd98
2011-02-17 00:39:59 -08:00
Jim Miller
204b1b2630 Merge "Fix 3384928: Update "disabled" strings for lock methods" 2011-02-15 14:33:47 -08:00
Jim Miller
64aafdcfac Fix 3384928: Update "disabled" strings for lock methods
This updates the disabled strings to give the user an idea
why the given methods are disabled.  It's either because
the DevicePolicyAdmin disabled it ("administrator") or
because the device is encrypted.

Change-Id: I0e99742a838037d069f686ed98f9622754bafe13
2011-02-14 18:41:29 -08:00
Jim Miller
9afb14de3b Fix 3444669: Fix message string for max password length
Change-Id: I5828dc0127b0296d87bdc0c9e251fd9c9a92bd0d
2011-02-14 17:58:10 -08:00
Irfan Sheriff
d9c7dcf0e4 Re-enable wifi proxy UI
- Add text to warn users about support
- Move proxy above IP settings based on UI recommendations

Bug: 3328410
Change-Id: I3b5aafd32b16adfcd2fadb572ebb2694afdeccbb
2011-02-10 10:21:54 -08:00
Lorenzo Colitti
a7e587fc8d Support configuring the protocol in APN settings.
Change-Id: I435061a631bdb2f58935af607abf8cd7c5d252ba
2011-02-04 13:17:15 -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
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
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
Andy Stadler
171412000a Final cleanup of "password required" dialog
Bug: 3406068
Change-Id: I65c0e8f37236194565cb3a1cf022dfdfdc5c0044
2011-01-31 10:15:53 -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
Irfan Sheriff
abeff000fd Change sleep policy strings
Bug: 3404049
Change-Id: I8ad3eae778c1695fc98aaca01ef26677fa8106f1
2011-01-29 09:10:13 -08:00
Jason parks
f821730407 More work on the Crypt Keeper.
* Use the DPM to determine if we are encrypted.
* Fix misspelling (Comfirm -> Confirm).
* Animate to black when enabling encryption.
* Add holo droid background.
* Change the progress bar to indterminate.
* Display the percentage complete in the status line.
* Fixed bug 3388097. You will no longer have to unplug your device to start encryption. This line is intentionally long. I could make it shorter but I am proving a point: <magic>overflow: auto;</magic>.
* Actually hold onto the wakelock to prvent the device from sleeping.
* Implement onStop() as a orientation change can happen at boot. This will start the activity twice and there will be multiple handlers with messages.

Change-Id: Ia752d106c39e0d81431e856f8f500182e8ec1abd
2011-01-27 11:26:58 -06:00
Roy West
cbebe591d7 Fix build; dumb syntax error.
Change-Id: I1204650796df7a49c5221821f2d485fa7e312be6
2011-01-26 16:31:21 -08:00
Roy West
302c14a241 Editing encryption strings.
Change-Id: Ia7c12ea353f1a2dfee3125d2c620980ddd825570
2011-01-26 15:38:38 -08:00
Jim Miller
a34279fb2a Fix 3383575: use styled attribs and update layout
This updates the layout to make more room for the button
text in SecuritySettings. The code now uses styled attributes
to make it easier to tweak in the future.

Change-Id: I5fbdf2f6ae4c4c1f9614ab97891f9f2fe6cda628
2011-01-25 12:29:35 -08:00
Jason parks
323fa9c669 Merge "Display the correct encryption settings." into honeycomb 2011-01-25 09:53:00 -08:00
Jason parks
4112199ed6 Display the correct encryption settings.
* You can no longer try to encrypt the device when it is encrypted.
* Moved the encryption section below the lock screen section. It will be more common to change the lock screen settings.
* If the device doesn't support encryption don't display the encryption section.

Bug: 3384074
Change-Id: I172f5894a3cea57b1b8d03a84f1ecf0ee500c1f3
2011-01-25 10:29:50 -06:00
Jason parks
af6d7cf23c Merge "More UI tweaks." into honeycomb 2011-01-25 06:39:06 -08:00
Jason parks
f1dbf55819 More UI tweaks.
* Grab a full wakelock while encrypting.
* Fix a bug with failed attempts.
* Add a custom theme to animate the screen to black.
* Fix the keyboard to be displayed properly in landscape and portrait.

Change-Id: Icc2d813ce1780588eb3b16f5204c3c60cae5236f
2011-01-25 08:38:17 -06:00
Eric Fischer
cfcdcb84cc Merge "Restore deleted string still referenced from a layout." into honeycomb 2011-01-24 13:47:26 -08:00
Eric Fischer
13baf3c6a0 Restore deleted string still referenced from a layout.
Change-Id: Ief261e16780ad04e53ebac1202d94146cf14e51c
2011-01-24 12:48:06 -08:00
Amith Yamasani
b409b904d6 Bring back the MDN (phone number) status even if there's no voice.
Needed for carrier customer support purposes.

Bug: 3351493

Change "My phone number" string to "MDN".

Change-Id: Icee0f97348034a9fb7f79a3c48868d5f74edabb1
2011-01-24 11:40:31 -08:00
Jason parks
39f1e04079 More UI tweaks and fixes.
* Actually post the correct message every 5 second for the progress bar.
* Update the text for the settings to a more finalish version.
* Check the battery status before allowing encryption to proceed.
* Display a place holder message if no password is set for the device.

Change-Id: I2734300c9a81467dbd0401427d8b656922ab4819
2011-01-21 13:53:41 -06:00
Daisuke Miyakawa
5dc460e407 Use correct wording for SteupWizard
Bug: 3375688
Change-Id: Id8cdfc5347092277429c0a791fb45d55a7236230
2011-01-20 23:35:46 -08:00
Daisuke Miyakawa
ca2870f373 Rename title for Date Time setup
Bug: 3374552
Change-Id: I37a4ac3f7fb1a9f0cf9624aba2a69dd85e9743ac
2011-01-20 16:31:40 -08:00
Jason parks
43775c7f9b Merge "More work on the CryptKeeper." into honeycomb 2011-01-20 15:58:02 -08:00
Jason parks
a13e9c877c Merge "Encrypt inplace settings." into honeycomb 2011-01-20 15:50:55 -08:00
Roy West
e97bc56db1 Tidy up Internal storage screen text.
Change-Id: Ia1b3b79a6df1756c2a4ff9440463771cfa308c13
2011-01-20 10:06:33 -08:00
Chia-chi Yeh
9003862e25 Merge "Extract credential storage dialogs to a new activity." into honeycomb 2011-01-20 04:26:10 -08:00
Chia-chi Yeh
91d65a20af Extract credential storage dialogs to a new activity.
Since now SecuritySettings is a fragment, not an activity, reacting
to intents is not easier anymore. The new activity is transparent,
and it works just like a dialog. This change also refactor'ed
SecuritySettings by moving some preference construction into
security_settings_misc.xml.

Bug: 3120992
Bug: 2117436
Change-Id: I8bd3fc7faa2a31d100b8d67310f9266260cfc31d
2011-01-20 19:45:04 +08:00
Chung-yih Wang
a4491eafd4 Fix the vpnsetting NPE crash.
The bug is triggered by rotating the screen after restoring the
vpn setting which was showing the connect dialog from the recent tasks.

Change-Id: I2562b208fa28f9b6ffa8acba1ab14e0f83b3a0c6
2011-01-20 18:31:26 +08:00
Jake Hamby
2fdd006b1a Add preference to show the list of files received via Bluetooth.
Add a preference item to show a dialog window containing the list
of files received via Bluetooth. This replaces the "live folder"
view that was available in Gingerbread and earlier.

Bug: 3167219
Change-Id: I703266dba47c9ef8c52e5569aba0f812a9511bb5
2011-01-19 13:24:57 -08:00
Daisuke Miyakawa
b213d30d2c Merge "Polish layout and UI for wifi setup" into honeycomb 2011-01-18 16:26:18 -08:00