5229 Commits

Author SHA1 Message Date
Mike Lockwood
04f024d564 Merge changes I80558c62,I6587f580
* changes:
  UsbService: Blacklist HID boot subclass devices (keyboards and mice)
  UsbService: Add support for blacklisting certain USB busses
2011-02-03 09:51:06 -08:00
Eric Laurent
25101b0b9a Fix issue 3371080
Modified default volume control logic in AudioService:
1 IN_CALL volume if in video/audio chat
2 NOTIFICATION if notification is playing or was playing less than 5s ago.
3 MUSIC

Modified silent mode:
- now also affect MUSIC stream type
- entering silent mode when VOL- hard key is pressed once while selected
stream volume is already at 0 (except for VOICE_CALL stream).
- exiting silent mode when pressing VOL+ hard key while in silent mode

Play sound FX (audible selections, keyboard clicks) at a fixed volume.

Modified audio framework:
- isStreamActive() method now implemented in AudioPolicyManagerBase (previously AudioFlinger)
- iStreamActive() now specifies a time window during which the stream is considered
active after it actually stopped.

Change-Id: I7e5a0724099450b9fc90825224180ac97322785f
2011-02-03 09:26:24 -08:00
satok
b6109bb591 Register ENABLED_INPUT_METHODS to SettingsObserver
Bug: 3415292

- Registration is required for catching current IME or subtype is disabled

Change-Id: Ia95f16df5bd725c05b4f5085f975d235b88d4b6e
2011-02-03 22:24:54 +09:00
Dianne Hackborn
dd95421291 am a5861743: Merge "Fix issue #3418265: Rotation animation on wallpaper is broken" into honeycomb
* commit 'a58617430d699d26948357f204f09a6ca0b837b8':
  Fix issue #3418265: Rotation animation on wallpaper is broken
2011-02-02 18:44:36 -08:00
Dianne Hackborn
50660e2728 Fix issue #3418265: Rotation animation on wallpaper is broken
Two problems:

1. The wallpaper offsets were being applied at the wrong place in the xform.
2. The background black needs become a clip around the newly revealed UI.

Change-Id: I3b46aea2ace3c8c5a36fc5e37b4e2b67fff1b289
2011-02-02 18:32:27 -08:00
Mathias Agopian
721f3a6ea3 am 50b029d5: am 7ba35f5a: Merge "[3418265] apply layer transformations to the DimLayer." into honeycomb
* commit '50b029d578fa06cd0733dcc7c69cb94f5f824908':
  [3418265] apply layer transformations to the DimLayer.
2011-02-02 16:46:46 -08:00
Mathias Agopian
50b029d578 am 7ba35f5a: Merge "[3418265] apply layer transformations to the DimLayer." into honeycomb
* commit '7ba35f5ab3c838c7f1b3ab957be685ac1f506b2a':
  [3418265] apply layer transformations to the DimLayer.
2011-02-02 16:44:58 -08:00
Kenny Root
35ab3ad61f Remove defunct secure FS work
Bug: 3365047
Change-Id: I68eaea295881f5431907e1b93bdd73e644e84aa5
2011-02-02 16:42:18 -08:00
Mathias Agopian
6e138fb682 [3418265] apply layer transformations to the DimLayer.
with this change DimLayers will behave just like any other layer,
in particular they'll respect the layer transformations.

Change-Id: Icb4a1275e8bca9e3deb5f57c9f9219aaa69f9877
2011-02-02 16:05:39 -08:00
Dianne Hackborn
9ca397f5f0 am e40afdf7: am 0035b5ca: Merge "Fix issue #3415137: New wallpaper size breaks thumbnails." into honeycomb
* commit 'e40afdf7f44f30d78b0afc96717dae2bb883e3ea':
  Fix issue #3415137: New wallpaper size breaks thumbnails.
2011-02-02 13:22:40 -08:00
Dianne Hackborn
e40afdf7f4 am 0035b5ca: Merge "Fix issue #3415137: New wallpaper size breaks thumbnails." into honeycomb
* commit '0035b5cad16c0565102105f5cd0222073b0ddf94':
  Fix issue #3415137: New wallpaper size breaks thumbnails.
2011-02-02 13:19:44 -08:00
Dianne Hackborn
dd962ee163 Fix issue #3415137: New wallpaper size breaks thumbnails.
Change-Id: I3ce4fa8f532cc378c390138bab0ff3126fe0f0c3
2011-02-02 11:29:41 -08:00
Mike Lockwood
8b682ad08a UsbService: Blacklist HID boot subclass devices (keyboards and mice)
Change-Id: I80558c6205e041ad730c7815aba97cb80132e820
Signed-off-by: Mike Lockwood <lockwood@android.com>
2011-02-01 15:53:11 -05:00
Mike Lockwood
a8e3a898a2 UsbService: Add support for blacklisting certain USB busses
This can be used to prevent applications from connecting to
sensitive internal USB devices (like the modem)

Change-Id: I6587f58018e3f8d8f78405d4004cce64db23b628
Signed-off-by: Mike Lockwood <lockwood@android.com>
2011-02-01 13:46:50 -05:00
Jeff Brown
406e26d174 am a70154b0: am c623fff0: Merge "Fix keyboard hidden flag." into honeycomb
* commit 'a70154b0187603af3487bbe01b607818b12cc268':
  Fix keyboard hidden flag.
2011-02-01 10:09:11 -08:00
Dianne Hackborn
5c4e4f9066 am db569b49: am 6cf32312: Merge "Do not check features in PackageManagerService" into honeycomb
* commit 'db569b49180621c01fa55db88ed92071aae9b3bb':
  Do not check features in PackageManagerService
2011-02-01 10:08:21 -08:00
Jozef BABJAK
06e57b5d46 Fixing possible race condition.
That return statement is effectively a reading of asynchronously modified
field. The reading and writing is elsewhere protected by locking on thread
instance, except this one occurence. Moving 'return' statement into
synchronized block ensures that it reads updated value.

Don't be afraid of deadlock - wait() releases the lock and acquires it
back when notified.

Change-Id: I940c24c04a1a2d4508d14d11b6174ff4fb2ab7d5
2011-02-01 08:53:52 +01:00
Jeff Brown
a70154b018 am c623fff0: Merge "Fix keyboard hidden flag." into honeycomb
* commit 'c623fff00c53f6002a8ec6c98cf4fdd6b1b2ad12':
  Fix keyboard hidden flag.
2011-01-31 18:52:06 -08:00
Dianne Hackborn
db569b4918 am 6cf32312: Merge "Do not check features in PackageManagerService" into honeycomb
* commit '6cf32312aaee6716ffd1df7098838b08d80054e4':
  Do not check features in PackageManagerService
2011-01-31 18:51:56 -08:00
satok
4d29ac86e4 am c253fc0f: am 076d059b: Merge "Not to update IME when Settings version is older than the last updated version." into honeycomb
* commit 'c253fc0f8069c67eacf70def32436067584b5636':
  Not to update IME when Settings version is older than the last updated version.
2011-01-31 18:38:17 -08:00
satok
c253fc0f80 am 076d059b: Merge "Not to update IME when Settings version is older than the last updated version." into honeycomb
* commit '076d059b54664b31920f0be13d56c657ab77cecc':
  Not to update IME when Settings version is older than the last updated version.
2011-01-31 18:31:46 -08:00
Dianne Hackborn
b04ec6a8a7 am 7a7ed2b2: Merge "Do not check features in PackageManagerService DO NOT MERGE" into gingerbread
* commit '7a7ed2b21233480d63a1f6b3830e3b0c1c6a3298':
  Do not check features in PackageManagerService DO NOT MERGE
2011-01-31 17:55:11 -08:00
Jeff Brown
c623fff00c Merge "Fix keyboard hidden flag." into honeycomb 2011-01-31 17:45:56 -08:00
Dianne Hackborn
6cf32312aa Merge "Do not check features in PackageManagerService" into honeycomb 2011-01-31 17:41:09 -08:00
Jeff Brown
597eec8c3d Fix keyboard hidden flag.
Configuration.hardKeyboardHidden should be set to
HARDKEYBOARDHIDDEN_YES when no keyboard is present or when it is
disabled.  The code in PhoneWindowManager.adjustConfigurationLw
does the right thing.  It also takes care of setting keyboardHidden
correctly when only a soft keyboard is available.

So it turns out that all we need to do to disable the hard keyboard
is to set Configuration.keyboard to KEYBOARD_NOKEYS *before* asking
the policy to adjust the configuration.

Bug: 3406101
Change-Id: I3519d02af30d8068198cb3d6b8fdde601c2fe8b4
2011-01-31 17:12:25 -08:00
Kenny Root
4c3915a0f7 Do not check features in PackageManagerService
PackageManagerService shouldn't check features that a package declares
that it uses because this will cause problems in the future when we add
more features that older phones didn't explicitly declare. We must rely
on markets to know about phones and filter them for us to avoid this
situation.

Bug: 3409434
Change-Id: I419a5b936be3572b83a485081a6c81b2f1c8741c
2011-01-31 16:59:12 -08:00
Kenny Root
fa2ae1ad1a Do not check features in PackageManagerService DO NOT MERGE
PackageManagerService shouldn't check features that a package declares
that it uses because this will cause problems in the future when we add
more features that older phones didn't explicitly declare. We must rely
on markets to know about phones and filter them for us to avoid this
situation.

Bug: 3409434
Change-Id: I0d51b2de33d8110edc6824af4b5b8c901f96077f
2011-01-31 16:27:38 -08:00
satok
4d733290a1 Not to update IME when Settings version is older than the last updated version.
- Check if just old version or not.

- Sometimes, ContentObserver.onChange is called before finishing to save the actual value.
This can be verified by checking the system settings version. If the version is not updated,
cached value will be returned from Settings.Secure, and this should not be handled.

Bug: 3406300

Change-Id: Ie3f5b484b5574e10a41dfc209ed31271a474b828
2011-02-01 09:01:58 +09:00
Joe Onorato
60d9d9cdba am 75057b15: am 4de68bae: Merge "Check for the STATUS_BAR permission for the system UI properties." into honeycomb
* commit '75057b1507881625368f76b2f401097b606bd530':
  Check for the STATUS_BAR permission for the system UI properties.
2011-01-30 16:09:29 -08:00
Joe Onorato
75057b1507 am 4de68bae: Merge "Check for the STATUS_BAR permission for the system UI properties." into honeycomb
* commit '4de68baed4bf18b33dc38f89f25410d3d5edfecf':
  Check for the STATUS_BAR permission for the system UI properties.
2011-01-30 16:03:59 -08:00
Joe Onorato
4de68baed4 Merge "Check for the STATUS_BAR permission for the system UI properties." into honeycomb 2011-01-30 16:00:52 -08:00
Joe Onorato
ac0ee89bd9 Check for the STATUS_BAR permission for the system UI properties.
If the app doesn't have that permission, just mask out the bits.
Also makes the systemUiVisibility field visible in hierarchyviewer.

Change-Id: Ic3d3a3aed96b5c6448832755b4b2e6175117e5be
2011-01-30 15:38:30 -08:00
Jamie Gennis
4453b1a5b6 am 09443aeb: am 62884505: Merge "Reset ANativeWindow crop on buffer geometry changes." into honeycomb
* commit '09443aeb6470d66f5bc1938b70d74b3e2f9bbbb9':
  Reset ANativeWindow crop on buffer geometry changes.
2011-01-30 15:05:42 -08:00
Jamie Gennis
09443aeb64 am 62884505: Merge "Reset ANativeWindow crop on buffer geometry changes." into honeycomb
* commit '628845056282a0c5b1a212ce5aeeaac092b91ec8':
  Reset ANativeWindow crop on buffer geometry changes.
2011-01-30 15:03:03 -08:00
Jamie Gennis
6288450562 Merge "Reset ANativeWindow crop on buffer geometry changes." into honeycomb 2011-01-30 15:00:44 -08:00
Jeff Brown
46bfd4a355 resolved conflicts for merge of c608e106 to master
Change-Id: I49117966f43080d86763bab51848dbc50e55ecf8
2011-01-30 12:50:09 -08:00
The Android Open Source Project
b2abd8c424 Mass merge from gingerbread - do not merge
Change-Id: I45dc3596bf4211d8f91c64f2d1d00588878df629
2011-01-30 12:40:38 -08:00
Jeff Brown
c608e106a6 am 3c89f6d1: Merge "Add "Use physical keyboard" option to system bar IME button." into honeycomb
* commit '3c89f6d1bd0821d0ae0205a5b48176156735aaac':
  Add "Use physical keyboard" option to system bar IME button.
2011-01-30 12:10:07 -08:00
Jeff Brown
3c89f6d1bd Merge "Add "Use physical keyboard" option to system bar IME button." into honeycomb 2011-01-30 12:07:49 -08:00
Dianne Hackborn
4651e84411 am bdaee964: am e97a12e3: Fix screen size compatibility mode.
* commit 'bdaee964f7d00806e714a7e453fff8d6a408c692':
  Fix screen size compatibility mode.
2011-01-30 11:04:10 -08:00
Dianne Hackborn
bdaee964f7 am e97a12e3: Fix screen size compatibility mode.
* commit 'e97a12e340dfdc246b531dfb49596628bd24e81b':
  Fix screen size compatibility mode.
2011-01-30 11:02:29 -08:00
Dianne Hackborn
e97a12e340 Fix screen size compatibility mode.
Change-Id: I2c06bbb586b4e54fc7ec52ec914cf95a18006217
2011-01-30 10:31:30 -08:00
Dianne Hackborn
71bb59f9e6 am c12cdda9: Merge "DO NOT MERGE: Fix screen size compatibility mode." into gingerbread
* commit 'c12cdda949e6b916dd9e6fa4b30ab8b0d1898faa':
  DO NOT MERGE: Fix screen size compatibility mode.
2011-01-29 22:30:57 -08:00
Ken Wakasa
428dbe0181 am 4e3f3a20: am 8710e76a: Follow up change to I741642ac
* commit '4e3f3a2046a5743f02ebca665b771467ad900ce1':
  Follow up change to I741642ac
2011-01-29 21:46:22 -08:00
Ken Wakasa
4e3f3a2046 am 8710e76a: Follow up change to I741642ac
* commit '8710e76a897cd546a79ee4338a4147eeb9f3e068':
  Follow up change to I741642ac
2011-01-29 21:42:30 -08:00
Dianne Hackborn
726318b56a DO NOT MERGE: Fix screen size compatibility mode.
Cherry-picked from HC.

Change-Id: Icce2a64f187a56deefcddc3d9b22fa94effce431
2011-01-29 18:02:18 -08:00
Ken Wakasa
8710e76a89 Follow up change to I741642ac
Fix wrong constant.

bug: 3404788
Change-Id: Ic5f849e6640a78a70951cf819d7e8ce53a9c2585
2011-01-30 11:02:09 +09:00
Jason parks
450536b6a6 am d4796c82: am a2e765ef: Merge "Update the encryption password when the device password is changed." into honeycomb
* commit 'd4796c823b92866d5895acf610e5571e9b5724d9':
  Update the encryption password when the device password is changed.
2011-01-29 12:06:39 -08:00
Jason parks
d4796c823b am a2e765ef: Merge "Update the encryption password when the device password is changed." into honeycomb
* commit 'a2e765ef1ad2cb907a4ae0a93bb15e4764ebb59a':
  Update the encryption password when the device password is changed.
2011-01-29 12:04:11 -08:00
Jason parks
a2e765ef1a Merge "Update the encryption password when the device password is changed." into honeycomb 2011-01-29 12:02:19 -08:00