PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
1,692 Commits 1 Branch 0 Tags
fc5a02225e8bca21f07543f55e1b51a33670c501
Commit Graph

1692 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Michael Chan
715be7ceb2 am 28a30ec4: am 4fcf94c4: am 5469ff8b: b/2226832 Showing Pairing Dialog in the foreground 
Merge commit '28a30ec4929dbd753f98d42e061fa19386fabda3'

* commit '28a30ec4929dbd753f98d42e061fa19386fabda3':
  b/2226832 Showing Pairing Dialog in the foreground
 2009-11-10 15:23:13 -08:00
Daniel Sandler
d8a83b8fc4 am 85c5b614: (-s ours) am c3ace180: am 7ceb387e: (-s ours) Merge change Ib720a080 into eclair 
Merge commit '85c5b614d7bcd6f1d45102c11640292cce3d6690'

* commit '85c5b614d7bcd6f1d45102c11640292cce3d6690':
  Updated icons for Settings. DO NOT MERGE
 2009-11-10 15:23:10 -08:00
Michael Chan
28a30ec492 am 4fcf94c4: am 5469ff8b: b/2226832 Showing Pairing Dialog in the foreground 
Merge commit '4fcf94c47b5526e1ee64854d7e25bfcac171885b' into eclair-mr2-plus-aosp

* commit '4fcf94c47b5526e1ee64854d7e25bfcac171885b':
  b/2226832 Showing Pairing Dialog in the foreground
 2009-11-10 15:10:43 -08:00
Daniel Sandler
85c5b614d7 am c3ace180: am 7ceb387e: (-s ours) Merge change Ib720a080 into eclair 
Merge commit 'c3ace180d0853185da19b49e9668324faa9f468e' into eclair-mr2-plus-aosp

* commit 'c3ace180d0853185da19b49e9668324faa9f468e':
  Updated icons for Settings. DO NOT MERGE
 2009-11-10 15:10:35 -08:00
Michael Chan
4fcf94c47b am 5469ff8b: b/2226832 Showing Pairing Dialog in the foreground 
Merge commit '5469ff8b3f9966c6f141078b37da5f178b7825e4' into eclair-mr2

* commit '5469ff8b3f9966c6f141078b37da5f178b7825e4':
  b/2226832 Showing Pairing Dialog in the foreground
 2009-11-10 11:06:36 -08:00
Daniel Sandler
c3ace180d0 am 7ceb387e: (-s ours) Merge change Ib720a080 into eclair 
Merge commit '7ceb387ee601655ba72264646e3d8ecf2d74c138' into eclair-mr2

* commit '7ceb387ee601655ba72264646e3d8ecf2d74c138':
  Updated icons for Settings. DO NOT MERGE
 2009-11-10 11:06:27 -08:00
Michael Chan
9cffec1c7b am 5469ff8b: b/2226832 Showing Pairing Dialog in the foreground 
Merge commit '5469ff8b3f9966c6f141078b37da5f178b7825e4' into eclair-plus-aosp

* commit '5469ff8b3f9966c6f141078b37da5f178b7825e4':
  b/2226832 Showing Pairing Dialog in the foreground
 2009-11-10 11:06:01 -08:00
Daniel Sandler
945ea6dae7 am 7ceb387e: Merge change Ib720a080 into eclair 
Merge commit '7ceb387ee601655ba72264646e3d8ecf2d74c138' into eclair-plus-aosp

* commit '7ceb387ee601655ba72264646e3d8ecf2d74c138':
  Updated icons for Settings. DO NOT MERGE
 2009-11-10 11:05:58 -08:00
Michael Chan
5469ff8b3f b/2226832 Showing Pairing Dialog in the foreground 
Pairing Dialogs notifications (in the window shade) were not visible in full
screen apps e.g. gallery.  Showing Pairing Dialog in the foreground:
1) if the remote device was picked in the device picker in the last minute or
2) if the device was in discoverable mode in the last minute.
 2009-11-10 10:37:54 -08:00
Eric Fischer
1db917f9d8 am ac783645: (-s ours) am 60037611: Import revised translations. DO NOT MERGE 
Merge commit 'ac7836457a8360154caf43d4be94ea464fc81966'

* commit 'ac7836457a8360154caf43d4be94ea464fc81966':
  Import revised translations.  DO NOT MERGE
 2009-11-06 16:27:31 -08:00
Eric Fischer
ac7836457a am 60037611: Import revised translations. DO NOT MERGE 
Merge commit '60037611a4f4bd9f2a724f9076abb17f553c6bb9' into eclair-mr2-plus-aosp

* commit '60037611a4f4bd9f2a724f9076abb17f553c6bb9':
  Import revised translations.  DO NOT MERGE
 2009-11-06 16:15:55 -08:00
Eric Fischer
60037611a4 Import revised translations. DO NOT MERGE 2009-11-06 15:29:45 -08:00
Michael Chan
bffe6334bd am d7962545: am 51dfd4b0: am 834e5993: b/2234854 Fixed Bluetooth API return codes for requesting permission to enable bluetooth 
Merge commit 'd7962545aadb31b5ac1a9ff93f5a91168bcae5c6'

* commit 'd7962545aadb31b5ac1a9ff93f5a91168bcae5c6':
  b/2234854 Fixed Bluetooth API return codes for requesting permission to enable bluetooth
 2009-11-06 13:47:05 -08:00
Android (Google) Code Review
7ceb387ee6 Merge change Ib720a080 into eclair 
* changes:
  Updated icons for Settings. DO NOT MERGE
 2009-11-06 16:44:30 -05:00
Michael Chan
d7962545aa am 51dfd4b0: am 834e5993: b/2234854 Fixed Bluetooth API return codes for requesting permission to enable bluetooth 
Merge commit '51dfd4b03563fd5b6fa87a7123d8bf0a9a7ce89d' into eclair-mr2-plus-aosp

* commit '51dfd4b03563fd5b6fa87a7123d8bf0a9a7ce89d':
  b/2234854 Fixed Bluetooth API return codes for requesting permission to enable bluetooth
 2009-11-06 13:38:15 -08:00
Michael Chan
51dfd4b035 am 834e5993: b/2234854 Fixed Bluetooth API return codes for requesting permission to enable bluetooth 
Merge commit '834e5993e4f2f34d5aceb3196601b30231d00b07' into eclair-mr2

* commit '834e5993e4f2f34d5aceb3196601b30231d00b07':
  b/2234854 Fixed Bluetooth API return codes for requesting permission to enable bluetooth
 2009-11-06 13:32:53 -08:00
Michael Chan
830ab02954 am 834e5993: b/2234854 Fixed Bluetooth API return codes for requesting permission to enable bluetooth 
Merge commit '834e5993e4f2f34d5aceb3196601b30231d00b07' into eclair-plus-aosp

* commit '834e5993e4f2f34d5aceb3196601b30231d00b07':
  b/2234854 Fixed Bluetooth API return codes for requesting permission to enable bluetooth
 2009-11-06 13:32:42 -08:00
Michael Chan
834e5993e4 b/2234854 Fixed Bluetooth API return codes for requesting permission to enable bluetooth 
Also added test app.
 2009-11-05 18:32:09 -08:00
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