Commit Graph

3828 Commits

Author SHA1 Message Date
Eric Fischer
2cf42dfb2a am c5d5334e: Import revised translations. DO NOT MERGE
* commit 'c5d5334e9c55e17c4df98af444c814569b3a77c5':
  Import revised translations.  DO NOT MERGE
2011-02-09 10:47:27 -08:00
Eric Fischer
c5d5334e9c Import revised translations. DO NOT MERGE
Change-Id: Iadab60dd0e8902911647870d730709279ae8b197
2011-02-08 18:03:05 -08:00
Eric Fischer
d422079aeb am 47d2ecd0: Import revised translations. DO NOT MERGE
* commit '47d2ecd0c4faf758f59f4eb59f515a41091c39e0':
  Import revised translations.  DO NOT MERGE
2011-02-08 17:33:14 -08:00
Eric Fischer
b5f3addfc5 am f0c435c6: (-s ours) am 805b5add: Import revised translations. DO NOT MERGE
* commit 'f0c435c6c8485b6a60e79803ba4ba1b2e5a975bb':
  Import revised translations.  DO NOT MERGE
2011-02-08 10:50:23 -08:00
Eric Fischer
f0c435c6c8 am 805b5add: Import revised translations. DO NOT MERGE
* commit '805b5add435d2c639363d239cf9abf32cd5a1fdd':
  Import revised translations.  DO NOT MERGE
2011-02-08 10:45:36 -08:00
Alon Albert
5779f7a9a0 Merge "Use main looper to post start animation commands This is a workaround till we find a better solution. Posting start() on mail looper will make sure the animation starts but animation can stop randomly when the list gets refreshed which happens for example any time the user interacts with the list by check/uncheking boxes. This is because the list rebuilds itself and views gets detached/attached which binds to a new view." 2011-02-08 10:14:01 -08:00
Alon Albert
3cef309389 Merge "Remove Gmail Permissions" 2011-02-08 10:13:35 -08:00
Alon Albert
8169e1c1d2 Remove Gmail Permissions
Bug: 3377724
Change-Id: I6e17e7a70bce840b180e40031fc3af25b2b8fdb1
2011-02-08 09:47:55 -08:00
Alon Albert
5b6983049d Use main looper to post start animation commands
This is a workaround till we find a better solution. Posting start() on mail
looper will make sure the animation starts but animation can stop randomly
when the list gets refreshed which happens for example any time the user
interacts with the list by check/uncheking boxes. This is because the list
rebuilds itself and views gets detached/attached which binds to a new view.

The long term solution is to switch to the new animator framework but for now
posting on main looper will be consistent with GB behavior.

Bug: 3426585
Change-Id: I77f15873bb47ad05113dc914a5d3d6d8af27e2e8
2011-02-08 09:43:12 -08:00
Eric Fischer
805b5add43 Import revised translations. DO NOT MERGE
Change-Id: I82cf88e26e86820b0dc44d07f62a9bd8ac670ca9
2011-02-07 17:30:01 -08:00
Jake Hamby
cc872597de am 93d419a2: am 47cb1753: (-s ours) am 1798fc04: Merge "Fixed a memory leak in the bluetooth settings"
* commit '93d419a290696611fa5e2bc644adf0847dfb627a':
  Fixed a memory leak in the bluetooth settings
2011-02-07 13:49:54 -08:00
Eric Fischer
47d2ecd0c4 Import revised translations. DO NOT MERGE
Change-Id: If53b83d77929ba02915eeafd3c614599316cca1e
2011-02-07 13:38:01 -08:00
Jim Miller
537b64103e am 1d8c91fa: am 78713aed: Fix 3419077: implement new volume control in Settings.
* commit '1d8c91faa715a8695ec8c7c03cbe028b07a76070':
  Fix 3419077: implement new volume control in Settings.
2011-02-07 11:40:24 -08:00
Justin Ho
0f08ee293b am 683d8a21: am a9d8046c: Updated icons in settings
* commit '683d8a21371f6781718542b62ab185533aae170f':
  Updated icons in settings
2011-02-07 10:56:56 -08:00
Daisuke Miyakawa
f3bfc89ce5 Enable orientation in SetupWizard
Change-Id: I45e30c652feab1d30c4f0379379f8ca4e455fa02
2011-02-04 18:38:19 -08:00
Lorenzo Colitti
f5a2a5eba1 Merge "Support configuring the protocol in APN settings." 2011-02-04 17:52:16 -08:00
Jake Hamby
93d419a290 am 47cb1753: (-s ours) am 1798fc04: Merge "Fixed a memory leak in the bluetooth settings"
* commit '47cb175396c8b020eded62d6c2293b777f20932b':
  Fixed a memory leak in the bluetooth settings
2011-02-04 17:49:01 -08:00
Jake Hamby
47cb175396 am 1798fc04: Merge "Fixed a memory leak in the bluetooth settings"
* commit '1798fc049eda5f6fd14be3a369eebe81c851abd2':
  Fixed a memory leak in the bluetooth settings
2011-02-04 16:20:15 -08:00
Jake Hamby
1798fc049e Merge "Fixed a memory leak in the bluetooth settings" 2011-02-04 16:12:54 -08:00
Lorenzo Colitti
a7e587fc8d Support configuring the protocol in APN settings.
Change-Id: I435061a631bdb2f58935af607abf8cd7c5d252ba
2011-02-04 13:17:15 -08:00
satok
82131332d1 Merge "Do not reset IME Subtype in InputMethodConfig fragment" 2011-02-03 19:34:35 -08:00
satok
d7973d1c0a Do not reset IME Subtype in InputMethodConfig fragment
Bug: 3415292

Change-Id: Ic9a27982402c6bfd747960d32cce13f3856545da
2011-02-04 12:29:17 +09: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
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
ec4045faba am 327147eb: Have SecuritySettings and SoundSettings use getCurrentPhoneType
* commit '327147eb062a25ecab40d66ea14559070e0ecef3':
  Have SecuritySettings and SoundSettings use getCurrentPhoneType
2011-02-02 13:20:06 -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
37033e1a88 am 9597406a: Restart encryption display after screen power cycle
* commit '9597406aa1b83867b03a47d1a5162969b924f2fc':
  Restart encryption display after screen power cycle
2011-02-01 18:17:19 -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
Andy Stadler
5152fb05d1 am 95ef5575: Prevent NPE in onActivityResult
* commit '95ef5575a2b70d8c018f99b218353c925a70d418':
  Prevent NPE in onActivityResult
2011-02-01 17:27:26 -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
9d06aac2c0 am 1499740c: Preserve wakelock through rotation
* commit '1499740c13af5fbd5766a87825c3e789b37bab24':
  Preserve wakelock through rotation
2011-02-01 16:17:51 -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
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
71863f3b48 Merge "Use a custom media file for media volume sample." into honeycomb 2011-02-01 05:28:41 -08:00
Daisuke Miyakawa
d4eb7c6be3 am 649b9f19: Disable left pane of "Input languages" conditionally.
* commit '649b9f19e1193547f339239afa32d569f43358fc':
  Disable left pane of "Input languages" conditionally.
2011-01-31 22:49:16 -08:00