Commit Graph

20174 Commits

Author SHA1 Message Date
Daniel Sandler
30182033d3 Updated icons for Settings. DO NOT MERGE
Fixes http://b/2105756

DrNo for eclair: mcleron

Change-Id: Ib720a080613a4513bd7bd62ae416c243ef9841a7
2009-11-05 19:49:13 -05:00
Daniel Sandler
86a9685409 am 3f20d278: am a21a458b: Merge change I3abd5c0d into eclair-mr2
Merge commit '3f20d2782ffd00d46ce9a2c017e02d0cde72429c'

* commit '3f20d2782ffd00d46ce9a2c017e02d0cde72429c':
  Updated icons for Settings.
2009-11-05 16:45:01 -08:00
Michael Chan
ef7a3e4a4f am f69e5ad5: am d55c31ea: am 4d004e91: b/2238546 Fixed NPE in Settings when Bluetooth "class" is null
Merge commit 'f69e5ad5372fbeef76f191f22e6d65202f9c782f'

* commit 'f69e5ad5372fbeef76f191f22e6d65202f9c782f':
  b/2238546 Fixed NPE in Settings when Bluetooth "class" is null
2009-11-05 16:44:55 -08:00
Daniel Sandler
3f20d2782f am a21a458b: Merge change I3abd5c0d into eclair-mr2
Merge commit 'a21a458bf3ae8a7e6490221a5130b3d79818cb7b' into eclair-mr2-plus-aosp

* commit 'a21a458bf3ae8a7e6490221a5130b3d79818cb7b':
  Updated icons for Settings.
2009-11-05 16:39:43 -08:00
Michael Chan
f69e5ad537 am d55c31ea: am 4d004e91: b/2238546 Fixed NPE in Settings when Bluetooth "class" is null
Merge commit 'd55c31ead6e52b215f42f351761483386ecacbc2' into eclair-mr2-plus-aosp

* commit 'd55c31ead6e52b215f42f351761483386ecacbc2':
  b/2238546 Fixed NPE in Settings when Bluetooth "class" is null
2009-11-05 16:39:37 -08:00
Android (Google) Code Review
a21a458bf3 Merge change I3abd5c0d into eclair-mr2
* changes:
  Updated icons for Settings.
2009-11-05 19:33:14 -05:00
Michael Chan
d55c31ead6 am 4d004e91: b/2238546 Fixed NPE in Settings when Bluetooth "class" is null
Merge commit '4d004e910732565ddd449c7c525f7d6cbd353392' into eclair-mr2

* commit '4d004e910732565ddd449c7c525f7d6cbd353392':
  b/2238546 Fixed NPE in Settings when Bluetooth "class" is null
2009-11-05 10:32:57 -08:00
Michael Chan
6e787689be am 4d004e91: b/2238546 Fixed NPE in Settings when Bluetooth "class" is null
Merge commit '4d004e910732565ddd449c7c525f7d6cbd353392' into eclair-plus-aosp

* commit '4d004e910732565ddd449c7c525f7d6cbd353392':
  b/2238546 Fixed NPE in Settings when Bluetooth "class" is null
2009-11-05 10:32:02 -08:00
Michael Chan
4d004e9107 b/2238546 Fixed NPE in Settings when Bluetooth "class" is null 2009-11-04 17:19:48 -08:00
Daniel Sandler
3abd5c0d79 Updated icons for Settings.
Fixes http://b/2105756
2009-11-03 14:11:37 -05:00
Jean-Michel Trivi
a50b05284d am 35a4c327: am dd1f7c9e: am 9d6be2ba: Add backup string for a platform setting to enable or disable advanced audio recording features on QSD8k phones.
Merge commit '35a4c327a94272d7bd1ec5c575e787ea3d5364cc'

* commit '35a4c327a94272d7bd1ec5c575e787ea3d5364cc':
  Add backup string for a platform setting to enable or disable
2009-11-02 11:02:14 -08:00
Jean-Michel Trivi
35a4c327a9 am dd1f7c9e: am 9d6be2ba: Add backup string for a platform setting to enable or disable advanced audio recording features on QSD8k phones.
Merge commit 'dd1f7c9e64b9614f5fe3fff9edf4343ee82ab48b' into eclair-mr2-plus-aosp

* commit 'dd1f7c9e64b9614f5fe3fff9edf4343ee82ab48b':
  Add backup string for a platform setting to enable or disable
2009-11-02 10:57:08 -08:00
Jean-Michel Trivi
f31c56f799 am 9d6be2ba: Add backup string for a platform setting to enable or disable advanced audio recording features on QSD8k phones.
Merge commit '9d6be2baf517462d2cce818c21b25958a40e4f06' into eclair-plus-aosp

* commit '9d6be2baf517462d2cce818c21b25958a40e4f06':
  Add backup string for a platform setting to enable or disable
2009-11-02 10:52:23 -08:00
Jean-Michel Trivi
dd1f7c9e64 am 9d6be2ba: Add backup string for a platform setting to enable or disable advanced audio recording features on QSD8k phones.
Merge commit '9d6be2baf517462d2cce818c21b25958a40e4f06' into eclair-mr2

* commit '9d6be2baf517462d2cce818c21b25958a40e4f06':
  Add backup string for a platform setting to enable or disable
2009-11-02 10:52:15 -08:00
Jean-Michel Trivi
9d6be2baf5 Add backup string for a platform setting to enable or disable
advanced audio recording features on QSD8k phones.
2009-11-02 09:18:32 -08:00
Eric Fischer
f7660bc7b3 am bf777ba8: (-s ours) am 2b42f028: am 8e3c8c20: (-s ours) Merge change I1d016ce3 into eclair
Merge commit 'bf777ba89ccce0f6804a3a58daff1bbc767f7071'

* commit 'bf777ba89ccce0f6804a3a58daff1bbc767f7071':
  Import revised translations.  DO NOT MERGE
2009-11-01 21:51:36 -08:00
Mike Lockwood
23134dd063 am da2644a3: am afe722ff: am fd07eb22: Merge change Ibe1d06fc into eclair
Merge commit 'da2644a3aeaa163b21e5cfadd02aec4e40c0b31a'

* commit 'da2644a3aeaa163b21e5cfadd02aec4e40c0b31a':
  Avoid setting screen brightness when initializing brightness dialog in automatic mode.
2009-11-01 21:51:31 -08:00
Eric Fischer
bf777ba89c am 2b42f028: am 8e3c8c20: (-s ours) Merge change I1d016ce3 into eclair
Merge commit '2b42f028f7250f86590a8c39f2ce29936f960b7a' into eclair-mr2-plus-aosp

* commit '2b42f028f7250f86590a8c39f2ce29936f960b7a':
  Import revised translations.  DO NOT MERGE
2009-10-30 11:23:57 -07:00
Mike Lockwood
da2644a3ae am afe722ff: am fd07eb22: Merge change Ibe1d06fc into eclair
Merge commit 'afe722ff83c8669e6cd678f949adf9df97f0e376' into eclair-mr2-plus-aosp

* commit 'afe722ff83c8669e6cd678f949adf9df97f0e376':
  Avoid setting screen brightness when initializing brightness dialog in automatic mode.
2009-10-30 11:23:52 -07:00
Eric Fischer
2b42f028f7 am 8e3c8c20: (-s ours) Merge change I1d016ce3 into eclair
Merge commit '8e3c8c209b1f13d1704669887edb47df0a1afc0a' into eclair-mr2

* commit '8e3c8c209b1f13d1704669887edb47df0a1afc0a':
  Import revised translations.  DO NOT MERGE
2009-10-30 11:18:07 -07:00
Eric Fischer
504539d83c am 8e3c8c20: Merge change I1d016ce3 into eclair
Merge commit '8e3c8c209b1f13d1704669887edb47df0a1afc0a' into eclair-plus-aosp

* commit '8e3c8c209b1f13d1704669887edb47df0a1afc0a':
  Import revised translations.  DO NOT MERGE
2009-10-30 11:17:48 -07:00
Android (Google) Code Review
8e3c8c209b Merge change I1d016ce3 into eclair
* changes:
  Import revised translations.  DO NOT MERGE
2009-10-30 14:09:06 -04:00
Eric Fischer
1d016ce34d Import revised translations. DO NOT MERGE 2009-10-30 10:05:54 -07:00
Mike Lockwood
afe722ff83 am fd07eb22: Merge change Ibe1d06fc into eclair
Merge commit 'fd07eb222b6bd32039cdc2545fb75552835e418f' into eclair-mr2

* commit 'fd07eb222b6bd32039cdc2545fb75552835e418f':
  Avoid setting screen brightness when initializing brightness dialog in automatic mode.
2009-10-30 10:02:57 -07:00
Mike Lockwood
9af6272a13 am fd07eb22: Merge change Ibe1d06fc into eclair
Merge commit 'fd07eb222b6bd32039cdc2545fb75552835e418f' into eclair-plus-aosp

* commit 'fd07eb222b6bd32039cdc2545fb75552835e418f':
  Avoid setting screen brightness when initializing brightness dialog in automatic mode.
2009-10-30 10:00:39 -07:00
Android (Google) Code Review
fd07eb222b Merge change Ibe1d06fc into eclair
* changes:
  Avoid setting screen brightness when initializing brightness dialog in automatic mode.
2009-10-30 12:56:20 -04:00
Mike Lockwood
9878e86c45 Avoid setting screen brightness when initializing brightness dialog in automatic mode.
Fixes bug b/2226257 (Brightness wonky)

Change-Id: Ibe1d06fc907960dcb6a70faa92e6c3a562016865
Signed-off-by: Mike Lockwood <lockwood@android.com>
2009-10-30 09:43:02 -04:00
Michael Chan
c81adc729c am 69b4dec0: am 8b643d94: am 0cb3743e: b/2219381 Gray out Bluetooth Settings for the emulator
Merge commit '69b4dec040eaf5f4984aa0128c75328e0b1b5efc'

* commit '69b4dec040eaf5f4984aa0128c75328e0b1b5efc':
  b/2219381 Gray out Bluetooth Settings for the emulator
2009-10-29 20:14:34 -07:00
Amith Yamasani
9477d8d60e am 8c591405: am a8a974bd: am dd45a47b: Merge change I4d31288f into eclair
Merge commit '8c591405074da2b1f8c5e51ef23b5507fb83fc98'

* commit '8c591405074da2b1f8c5e51ef23b5507fb83fc98':
  Fix for 1974140. Delete entry if not valid on hitting home.
2009-10-29 20:14:28 -07:00
Eric Fischer
4e4c66e8d4 am 18828fa6: (-s ours) am 7bb19a89: am 17fcd476: (-s ours) Import revised translations. DO NOT MERGE
Merge commit '18828fa65dfac58a8a0f7d3798c7c35f64d1ea20'

* commit '18828fa65dfac58a8a0f7d3798c7c35f64d1ea20':
  Import revised translations.  DO NOT MERGE
2009-10-29 20:14:22 -07:00
Michael Chan
69b4dec040 am 8b643d94: am 0cb3743e: b/2219381 Gray out Bluetooth Settings for the emulator
Merge commit '8b643d946222119cf15b0d5d9d9cf7cd4fe019c1' into eclair-mr2-plus-aosp

* commit '8b643d946222119cf15b0d5d9d9cf7cd4fe019c1':
  b/2219381 Gray out Bluetooth Settings for the emulator
2009-10-29 19:54:58 -07:00
Amith Yamasani
8c59140507 am a8a974bd: am dd45a47b: Merge change I4d31288f into eclair
Merge commit 'a8a974bd171ccbc3b35b18c3e73a23d22834d05e' into eclair-mr2-plus-aosp

* commit 'a8a974bd171ccbc3b35b18c3e73a23d22834d05e':
  Fix for 1974140. Delete entry if not valid on hitting home.
2009-10-29 19:54:53 -07:00
Eric Fischer
18828fa65d am 7bb19a89: am 17fcd476: (-s ours) Import revised translations. DO NOT MERGE
Merge commit '7bb19a892cdf94d017a2046b374f977d47d20597' into eclair-mr2-plus-aosp

* commit '7bb19a892cdf94d017a2046b374f977d47d20597':
  Import revised translations.  DO NOT MERGE
2009-10-29 19:54:47 -07:00
Michael Chan
8b643d9462 am 0cb3743e: b/2219381 Gray out Bluetooth Settings for the emulator
Merge commit '0cb3743e93aef81e7669f1e6c81184559e0f8154' into eclair-mr2

* commit '0cb3743e93aef81e7669f1e6c81184559e0f8154':
  b/2219381 Gray out Bluetooth Settings for the emulator
2009-10-29 19:34:49 -07:00
Amith Yamasani
a8a974bd17 am dd45a47b: Merge change I4d31288f into eclair
Merge commit 'dd45a47bde9cdb9c27cb3ac3529a34f9789782ec' into eclair-mr2

* commit 'dd45a47bde9cdb9c27cb3ac3529a34f9789782ec':
  Fix for 1974140. Delete entry if not valid on hitting home.
2009-10-29 19:27:12 -07:00
Eric Fischer
7bb19a892c am 17fcd476: (-s ours) Import revised translations. DO NOT MERGE
Merge commit '17fcd476643e27943f548415e49e1be7d8e74ac1' into eclair-mr2

* commit '17fcd476643e27943f548415e49e1be7d8e74ac1':
  Import revised translations.  DO NOT MERGE
2009-10-29 19:24:59 -07:00
Michael Chan
527068fed8 am 0cb3743e: b/2219381 Gray out Bluetooth Settings for the emulator
Merge commit '0cb3743e93aef81e7669f1e6c81184559e0f8154' into eclair-plus-aosp

* commit '0cb3743e93aef81e7669f1e6c81184559e0f8154':
  b/2219381 Gray out Bluetooth Settings for the emulator
2009-10-29 17:55:04 -07:00
Mike Lockwood
4caafd5685 am 6dab602f: am acfc96f1: am 53dcdeeb: Don\'t restore old brightness when cancelling brightness dialog in automatic mode.
Merge commit '6dab602fdf7cdb41bebfd027ff94ab3edaf2132c'

* commit '6dab602fdf7cdb41bebfd027ff94ab3edaf2132c':
  Don't restore old brightness when cancelling brightness dialog in automatic mode.
2009-10-29 14:43:12 -07:00
Michael Chan
0cb3743e93 b/2219381 Gray out Bluetooth Settings for the emulator
Change-Id: I11ae2e6c7652ba550aeadf0dadb6f520c19dedc6
2009-10-29 14:42:06 -07:00
Mike Lockwood
6dab602fdf am acfc96f1: am 53dcdeeb: Don\'t restore old brightness when cancelling brightness dialog in automatic mode.
Merge commit 'acfc96f1504ffa01fcdf78e9ff3c91917a9401c1' into eclair-mr2-plus-aosp

* commit 'acfc96f1504ffa01fcdf78e9ff3c91917a9401c1':
  Don't restore old brightness when cancelling brightness dialog in automatic mode.
2009-10-29 13:56:08 -07:00
Mike Lockwood
acfc96f150 am 53dcdeeb: Don\'t restore old brightness when cancelling brightness dialog in automatic mode.
Merge commit '53dcdeeb85e523e0b752d802d3413f5d4001d575' into eclair-mr2

* commit '53dcdeeb85e523e0b752d802d3413f5d4001d575':
  Don't restore old brightness when cancelling brightness dialog in automatic mode.
2009-10-29 13:45:44 -07:00
Amith Yamasani
59103bde50 am dd45a47b: Merge change I4d31288f into eclair
Merge commit 'dd45a47bde9cdb9c27cb3ac3529a34f9789782ec' into eclair-plus-aosp

* commit 'dd45a47bde9cdb9c27cb3ac3529a34f9789782ec':
  Fix for 1974140. Delete entry if not valid on hitting home.
2009-10-29 06:35:07 -07:00
Android (Google) Code Review
dd45a47bde Merge change I4d31288f into eclair
* changes:
  Fix for 1974140. Delete entry if not valid on hitting home.
2009-10-29 09:28:35 -04:00
Mike Cleron
98472ea087 am 5eea8422: am ac465854: am d02acfb9: Merge change I2abbb876 into eclair
Merge commit '5eea8422718e415d99f360fcc5962236e1391008'

* commit '5eea8422718e415d99f360fcc5962236e1391008':
  New widgets
2009-10-29 01:56:06 -07:00
Mike Cleron
5eea842271 am ac465854: am d02acfb9: Merge change I2abbb876 into eclair
Merge commit 'ac465854ac29aa001578c0fe0d64c71b213b1759' into eclair-mr2-plus-aosp

* commit 'ac465854ac29aa001578c0fe0d64c71b213b1759':
  New widgets
2009-10-29 01:43:12 -07:00
Mike Cleron
ac465854ac am d02acfb9: Merge change I2abbb876 into eclair
Merge commit 'd02acfb908562780eec830a85e121f9925108c36' into eclair-mr2

* commit 'd02acfb908562780eec830a85e121f9925108c36':
  New widgets
2009-10-29 01:26:57 -07:00
Eric Fischer
f8fc478ec1 am 4f75cca2: am a4ec838d: am e0711522: Use consistent punctuation for the Chinese locale names.
Merge commit '4f75cca2cdc828fef6c09f3afea57e9ae771c0a2'

* commit '4f75cca2cdc828fef6c09f3afea57e9ae771c0a2':
  Use consistent punctuation for the Chinese locale names.
2009-10-28 23:51:37 -07:00
Jaikumar Ganesh
21a0aafe46 am afed5fca: am 760b45c2: am 195bc434: Add Authentication Type field to the APN settings.
Merge commit 'afed5fca00f781c5356cb1cf2ed7ee7f6326dc4c'

* commit 'afed5fca00f781c5356cb1cf2ed7ee7f6326dc4c':
  Add Authentication Type field to the APN settings.
2009-10-28 23:48:35 -07:00
Eric Fischer
789c772aab am 17fcd476: Import revised translations. DO NOT MERGE
Merge commit '17fcd476643e27943f548415e49e1be7d8e74ac1' into eclair-plus-aosp

* commit '17fcd476643e27943f548415e49e1be7d8e74ac1':
  Import revised translations.  DO NOT MERGE
2009-10-28 23:35:05 -07:00
Eric Fischer
17fcd47664 Import revised translations. DO NOT MERGE 2009-10-28 21:19:37 -07:00