Commit Graph

1374 Commits

Author SHA1 Message Date
Lorenzo Colitti
f5a2a5eba1 Merge "Support configuring the protocol in APN settings." 2011-02-04 17:52:16 -08:00
Lorenzo Colitti
a7e587fc8d Support configuring the protocol in APN settings.
Change-Id: I435061a631bdb2f58935af607abf8cd7c5d252ba
2011-02-04 13:17:15 -08:00
Jim Miller
1d8c91faa7 am 78713aed: Fix 3419077: implement new volume control in Settings.
* commit '78713aed9e23fbf2f89edae87b2ba9e1387104ff':
  Fix 3419077: implement new volume control in Settings.
2011-02-03 18:42:11 -08:00
Jim Miller
78713aed9e Fix 3419077: implement new volume control in Settings.
Change-Id: Ia4b803315382d59ae231c26187afaceb69397952
2011-02-03 18:20:23 -08:00
Daisuke Miyakawa
d5c52ca56a Remove unnecessary flag.
Bug: 3415073
Change-Id: I01d8c958a495bd7d9376304de1098b473b56a091
2011-02-03 18:18:31 -08:00
Justin Ho
683d8a2137 am a9d8046c: Updated icons in settings
* commit 'a9d8046c490a2295d6bda1e5eb4bd49838a5c064':
  Updated icons in settings
2011-02-03 15:33:45 -08:00
Justin Ho
a9d8046c49 Updated icons in settings
Change-Id: If5eca6cf91e1c71d53694a0ce2d78485b8729737
2011-02-03 14:49:24 -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
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
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
7247e1a10f 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.
2011-02-01 05:31:04 -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
b3d50cac64 am 13d62049: More CryptKeeper UI work.
* commit '13d62049f7c96c47356f23eaee7f0997612fdf9f':
  More CryptKeeper UI work.
2011-01-31 20:01:16 -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
ba275d29ea am ba681faf: Merge "Import revised translations. DO NOT MERGE. Bug 3394542" into honeycomb
* commit 'ba681faf73906dcc9c372008855667437b034cc4':
  Import revised translations.  DO NOT MERGE.  Bug 3394542
2011-01-31 18:33:54 -08:00
Eric Fischer
ba681faf73 Merge "Import revised translations. DO NOT MERGE. Bug 3394542" into honeycomb 2011-01-31 17:28:26 -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
Eric Fischer
c16a1641f9 Import revised translations. DO NOT MERGE. Bug 3394542
Change-Id: Id6c2e64725cb9177263d9b9249125378fe04b29a
2011-01-31 12:48:02 -08:00
Daisuke Miyakawa
6a452ce148 am 8ad1fb63: Merge "Disable back button on SetupWizard flow." into honeycomb
* commit '8ad1fb63403e624f730684db4a3b0ea8aec80b78':
  Disable back button on SetupWizard flow.
2011-01-31 11:59:36 -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
865ca2a2ef am 17141200: Final cleanup of "password required" dialog
* commit '171412000a95ce35fd3461afe7bcc5b7f2f210f4':
  Final cleanup of "password required" dialog
2011-01-31 11:03:45 -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
5fab237226 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
2011-01-30 20:13:07 -08:00
Justin Ho
89ebb843be am 88866927: Merge "Updating Settings icons in side menu Bug: 3362749" into honeycomb
* commit '888669277e2b6220162fe25e368a9cc9c208e501':
  Updating Settings icons in side menu Bug: 3362749
2011-01-30 20:10:23 -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
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
d19b76f606 am f534db8a: Merge "Improvements to enable encryption steps" into honeycomb
* commit 'f534db8ae4d62b39e5afecb2242c06dadf070e99':
  Improvements to enable encryption steps
2011-01-30 17:12:38 -08:00
Andy Stadler
f534db8ae4 Merge "Improvements to enable encryption steps" into honeycomb 2011-01-30 17:09:11 -08:00
Roy West
8bb35b1393 am 15dfde32: am 66f32a86: Fix bug 3405977.
* commit '15dfde321a43586fb1f5a0a60737c434435b0745':
  Fix bug 3405977.
2011-01-30 16:48:10 -08:00
Roy West
15dfde321a am 66f32a86: Fix bug 3405977.
* commit '66f32a8680eca2d3203b31bd36efdf753ad1a7fc':
  Fix bug 3405977.
2011-01-30 16:45:33 -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
Justin Ho
8a3f211b1c 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
2011-01-29 14:34:12 -08:00
Justin Ho
9685108ea0 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
2011-01-29 14:32:34 -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
Irfan Sheriff
2310ebc22a am 6c15162b: am abeff000: Change sleep policy strings
* commit '6c15162b7dd22e43852b1af3a38102a07f721f1c':
  Change sleep policy strings
2011-01-29 10:17:12 -08:00
Irfan Sheriff
6c15162b7d am abeff000: Change sleep policy strings
* commit 'abeff000fdd0c421ee514effb83c202174209b9d':
  Change sleep policy strings
2011-01-29 10:14:45 -08:00
Irfan Sheriff
abeff000fd Change sleep policy strings
Bug: 3404049
Change-Id: I8ad3eae778c1695fc98aaca01ef26677fa8106f1
2011-01-29 09:10:13 -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
Irfan Sheriff
c3bc110466 am 7bdf0e73: Move sleep policy to main settings page
* commit '7bdf0e73d051f176fbc20451761eb50177d69f91':
  Move sleep policy to main settings page
2011-01-28 17:30:59 -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
e4df0b3ec8 am 46f4b754: Merge "Enlarge texts and fit the other elements" into honeycomb
* commit '46f4b754e1173cfc7065df39311ab5c30f92ed60':
  Enlarge texts and fit the other elements
2011-01-28 16:26:08 -08:00