drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
27,215 Commits 1 Branch 0 Tags
Commit Graph

558 Commits

Author SHA1 Message Date
Tom Taylor
f0108cda21 resolved conflicts for merge of ad2fa35d to master 
Change-Id: Ia4362cd48ac0689b91003943a4cd9660da72ff90
 2009-12-22 10:11:55 -08:00
Eric Laurent
484d288868 Fix issue 2299360: Change in in-call volume affects the Bluetooth in-call volume and vice versa. 
Add a separate system settings entry for bluetooth SCO volume.
 2009-12-22 10:10:24 -08:00
Tom Taylor
d4a4729c0c Update imports to android-common 
Several files were moved to android-common. Update all the references
to import those files from the new location.
 2009-12-21 13:59:18 -08:00
Fred Quintana
23c279d522 am bc1c8847: am 66cc5900: Merge change Ic70239e8 into eclair-mr2 
Merge commit 'bc1c8847841689d2f6baa1f729148b4a35af92b0'

* commit 'bc1c8847841689d2f6baa1f729148b4a35af92b0':
  changed SettingsProvider to manage the androidid itself
 2009-12-17 13:21:36 -08:00
Fred Quintana
c70239e84d changed SettingsProvider to manage the androidid itself 2009-12-17 11:30:17 -08:00
Charles Chen
ab089078b1 Fix for a race condition that can occur if an utterance 
is stopped right when it completes.
 2009-12-11 13:54:11 -08:00
Amith Yamasani
9ce13a3993 am 1224b101: am 42c4c589: am a9791d30: Merge change Iae3ed706 into eclair 
Merge commit '1224b1016d2a4ec172f13741e632e59c7528b319'

* commit '1224b1016d2a4ec172f13741e632e59c7528b319':
  Add new setting for notification light pulsing. Bug #2238250
 2009-12-02 20:29:40 -08:00
Amith Yamasani
42c4c58900 am a9791d30: Merge change Iae3ed706 into eclair 
Merge commit 'a9791d304b8ec03e04ad4533b1820a64794e1bcc' into eclair-mr2

* commit 'a9791d304b8ec03e04ad4533b1820a64794e1bcc':
  Add new setting for notification light pulsing. Bug #2238250
 2009-12-02 09:50:40 -08:00
Amith Yamasani
ae3ed70670 Add new setting for notification light pulsing. Bug #2238250 
New System setting and code to set the defaults on upgrade.
 2009-12-01 19:02:05 -08:00
Oscar Montemayor
a8529f6867 Encrypted File Systems Project. Installer modifications. 
Started to modify isntaller for data redirection to a secure location.
 2009-11-24 11:44:19 -08:00
Charles Chen
b4fbe768f8 Adding the ability to specify the speech synthesis 
engine to use for text-to-speech.
 2009-11-19 12:02:55 -08:00
Eric Fischer
bd5b099c25 Import revised translations. DO NOT MERGE 
Approver: jerryw
 2009-11-13 17:13:39 -08:00
Eric Fischer
7274981597 Import revised translations. DO NOT MERGE 2009-11-06 15:25:20 -08:00
Fred Quintana
12a8a59e7a am 0fb041f3: am 3266c5f1: resolved conflicts for merge of f476c480 to eclair-mr2 
Merge commit '0fb041f364355c438eb7d508eb7fa7946418cd11'

* commit '0fb041f364355c438eb7d508eb7fa7946418cd11':
  remove the SubscribedFeedsProvider since it has been moved to vendor/google
 2009-11-05 14:12:16 -08:00
Fred Quintana
3266c5f125 resolved conflicts for merge of f476c480 to eclair-mr2 2009-11-05 11:46:11 -08:00
Fred Quintana
48cbd0bcd6 remove the SubscribedFeedsProvider since it has been moved to vendor/google 2009-11-03 15:05:36 -08:00
Eric Fischer
38a9becfdd Import revised translations. DO NOT MERGE 2009-10-28 21:16:52 -07:00
Android (Google) Code Review
8212a841f6 Merge change I824f0fc9 
* changes:
  Adding support for plugins.
 2009-10-26 20:53:45 -04:00
Eric Fischer
c4bf942cef Import revised translations. DO NOT MERGE 
Approver: jerryw
 2009-10-21 10:41:17 -07:00
Charles Chen
998207c821 Adding support for plugins. 2009-10-20 11:11:22 -07:00
Mike Lockwood
2086152c1b am f55aa972: Merge change I01935be3 into eclair 
Merge commit 'f55aa972f9911c6aafc9fbdb736bdec11e004542' into eclair-mr2

* commit 'f55aa972f9911c6aafc9fbdb736bdec11e004542':
  Remove PowerManager.setAutoBrightness()
 2009-10-16 09:38:03 -07:00
Mike Lockwood
dc3494e3d8 Remove PowerManager.setAutoBrightness() 
We will use the System.SCREEN_BRIGHTNESS_MODE Settings value instead.
Add SCREEN_BRIGHTNESS_MODE_MANUAL and SCREEN_BRIGHTNESS_MODE_AUTOMATIC constants.

Change-Id: I01935be3fcb48cf76392d2c594205cb47babc5b2
Signed-off-by: Mike Lockwood <lockwood@android.com>
 2009-10-16 07:42:26 -07:00
Eric Fischer
da1d0a679c Reimport translations. 
Change-Id: I3f59d859605c2744a4a10d06139bc366cc21cf8e
 2009-10-13 16:29:59 -07:00
Eric Fischer
bd6c80f689 Import revised translations. DO NOT MERGE 2009-10-13 16:03:48 -07:00
Daniel Sandler
813f2f24a9 am 8da45e9e: am 87b94b13: Merge change I6e01fa52 into eclair 
Merge commit '8da45e9ee989df2215a49552609713d817c076ef'

* commit '8da45e9ee989df2215a49552609713d817c076ef':
  Remove unneeded icon.
 2009-10-01 15:12:44 -07:00
Hung-ying Tyan
9a45b1fe01 am 3d95dfc4: am 62de7421: Merge change I4fe2a47a into eclair 
Merge commit '3d95dfc4f6b03511c76580690cf7f7364f29c0a5'

* commit '3d95dfc4f6b03511c76580690cf7f7364f29c0a5':
  Fix stopping all vpn daemons before connect and more.
 2009-10-01 13:58:52 -07:00
Christopher Tate
55b0a4ea56 am 6a444d4f: am 5f3c928f: Merge change Id93f4c9e into eclair 
Merge commit '6a444d4f5060a720d77daf8a81452566e327f266'

* commit '6a444d4f5060a720d77daf8a81452566e327f266':
  Turn off the last of the STOPSHIP verbose debugging
 2009-10-01 13:44:14 -07:00
Christopher Tate
4cbcab985c am 6678aecc: am 436344ae: Turn off most of the backup-related debug logging 
Merge commit '6678aeccec58f5ff306fb93ad4411208ed6227db'

* commit '6678aeccec58f5ff306fb93ad4411208ed6227db':
  Turn off most of the backup-related debug logging
 2009-10-01 13:40:57 -07:00
Mike Cleron
5679ccb9b5 am 051b28dd: am 170d9df0: Merge change I2d4deb11 into eclair 
Merge commit '051b28dd658ffff709db17ee70a563d18e103ec8'

* commit '051b28dd658ffff709db17ee70a563d18e103ec8':
  Placeholder mdpi assets
 2009-10-01 12:12:43 -07:00
Mike Cleron
7b81fe7773 am 11d8d62e: am 4ca8c837: Merge change Ia4087911 into eclair 
Merge commit '11d8d62e740ea171b19ed32306f3db2973a5242a'

* commit '11d8d62e740ea171b19ed32306f3db2973a5242a':
  Newer icons
 2009-10-01 11:54:20 -07:00
Costin Manolache
d153ea28e0 am 264f9b45: am 3348f14b: Remove GAIA string 
Merge commit '264f9b4530d6ecbd9e9d02cf5c61c7b19f4c6376'

* commit '264f9b4530d6ecbd9e9d02cf5c61c7b19f4c6376':
  Remove GAIA string
 2009-10-01 11:51:16 -07:00
Mike Cleron
a60a1ef869 am 03ecab42: am 7957eaa6: Merge change Iee9b30d3 into eclair 
Merge commit '03ecab425235bdb5e3548900284e8089c3d72e5e'

* commit '03ecab425235bdb5e3548900284e8089c3d72e5e':
  New icons
 2009-10-01 11:34:19 -07:00
Daniel Sandler
28a1b67a1c Remove unneeded icon. 
(Obviated by commit a408791148e816215f65ad81a187051c5fb47c68.)

Change-Id: I6e01fa52f2bbeb28c969e6a033ab0b1032cbc848
 2009-10-01 11:00:24 -04:00
Hung-ying Tyan
c8217638be Fix stopping all vpn daemons before connect and more. 
* move DaemonHelper out from VpnService to VpnDaemons for better
  managing native daemons.
* check connectivity and dns less frequently to save battery.
 2009-10-01 15:18:28 +08:00
Christopher Tate
13f4a64ddd Turn off the last of the STOPSHIP verbose debugging 
Change-Id: Id93f4c9e9fb8468a554ae1e5c5c767f72903662c
 2009-09-30 20:06:45 -07:00
Christopher Tate
436344ae12 Turn off most of the backup-related debug logging 
The core logging in BackupManagerService and in the Google backup transport are
still enabled at this point.

Change-Id: I10abfa565bbd1097dd3631051b6aca163e4af33a
 2009-09-30 17:07:37 -07:00
Android (Google) Code Review
170d9df0f3 Merge change I2d4deb11 into eclair 
* changes:
  Placeholder mdpi assets
 2009-09-30 14:17:23 -04:00
Mike Cleron
2d4deb11e1 Placeholder mdpi assets 2009-09-30 10:58:37 -07:00
Android (Google) Code Review
4ca8c837d3 Merge change Ia4087911 into eclair 
* changes:
  Newer icons
 2009-09-30 04:26:06 -04:00
Mike Cleron
a408791148 Newer icons 2009-09-30 01:04:36 -07:00
Costin Manolache
3348f14b3d Remove GAIA string 2009-09-29 22:52:05 -07:00
Mike Cleron
ee9b30d394 New icons 2009-09-29 13:01:09 -07:00
Christopher Tate
cfe771500a am 2d5168f6: am 141e4f1d: Merge change 27177 into eclair 
Merge commit '2d5168f650b1865812b1174ea1c37df9bfda6390'

* commit '2d5168f650b1865812b1174ea1c37df9bfda6390':
  Add auto-brightness mode to the list of backed-up settings
 2009-09-28 01:10:40 -07:00
Dianne Hackborn
4e4607c5ad am 9f704306: am 075a18d6: Turn on haptic feedback by default. 
Merge commit '9f704306846ea8d941511fbf4a506cd59e5a8479'

* commit '9f704306846ea8d941511fbf4a506cd59e5a8479':
  Turn on haptic feedback by default.
 2009-09-28 01:08:18 -07:00
Android (Google) Code Review
141e4f1d69 Merge change 27177 into eclair 
* changes:
  Add auto-brightness mode to the list of backed-up settings
 2009-09-27 13:20:44 -04:00
Dianne Hackborn
075a18d607 Turn on haptic feedback by default. 
Change-Id: I85efeca1a0aca91992e28236077c668e0d14cbbb
 2009-09-26 12:43:19 -07:00
Christopher Tate
362aca6045 Add auto-brightness mode to the list of backed-up settings 
Change-Id: I4302b79691ed717d810748b239311cba198f6381
 2009-09-25 17:14:57 -07:00
Christopher Tate
fb554aca11 am a0b07d2c: am 13006be1: Merge change 26457 into eclair 
Merge commit 'a0b07d2c0297e8f10c2d98428b2acacb531cd5a7'

* commit 'a0b07d2c0297e8f10c2d98428b2acacb531cd5a7':
  Don't restore any setting that we don't think should be backed up
 2009-09-23 11:38:07 -07:00
Christopher Tate
796e0f0ed5 Don't restore any setting that we don't think should be backed up 
The ad-hoc blacklist has been replaced by a check that whitelists each restored
datum against the set of keys that we actually back up.  Keys read from the
restore data which are not found in the whitelist are not applied.

Also adds in some more debugging output, marked to be disabled for ship.
 2009-09-22 15:04:25 -07:00
Chia-chi Yeh
990f215b78 am 91115fd6: am 5b4aa6db: Merge change 26315 into eclair 
Merge commit '91115fd698c492c276307008ae533c22ebc46994'

* commit '91115fd698c492c276307008ae533c22ebc46994':
  VpnService: use Credentials instead of CertTool.
 2009-09-22 09:33:45 -07:00