Merge commit 'ed7755cc30fe6b2b0254207347629ad0cae094db' into eclair-mr2-plus-aosp
* commit 'ed7755cc30fe6b2b0254207347629ad0cae094db':
PowerManagerService: Ensure that recent changes do not effect the hardware ALS case.
Merge commit '3333fa4f3d2e1bd3842fe7d41d19557ff9a98372' into eclair-mr2
* commit '3333fa4f3d2e1bd3842fe7d41d19557ff9a98372':
PowerManagerService: Ensure that recent changes do not effect the hardware ALS case.
Merge commit 'fb872d1af3c775114ac7d241eb1924a9aafbb9df' into eclair-plus-aosp
* commit 'fb872d1af3c775114ac7d241eb1924a9aafbb9df':
Fix a race that kept the locale picker from working under heavy CPU load.
Merge commit 'd376d2407bbc14a2d221dfef9955d0feeab0d550' into eclair-plus-aosp
* commit 'd376d2407bbc14a2d221dfef9955d0feeab0d550':
A better solution for ignoring user activity while the screen is animating off.
Fixes a deadlock that occurred because mAnimatingScreenOff was left set to true
after aborting turning off the screen.
This change removes the mAnimatingScreenOff flag and checks for
(mScreenBrightness.animating && mScreenBrightness.targetValue == 0) instead.
Fixes bug b/2219706
Change-Id: I081f08c14ad7585a953fb567867238b1f3db841f
Signed-off-by: Mike Lockwood <lockwood@android.com>
The locale picker and the activity transition would both change the
configuration, and depending upon the timing, the activity transition
would undo what the locale picker had just done. Usually it worked right,
but would often fail if the user changed locales just after a data wipe,
when the media scanner was working hard in the background to index
the contents of the SD card.
http://b/issue?id=2216298
Merge commit '2d155d264e5cefc27abf2c5020fcfa06bde755ec' into eclair-plus-aosp
* commit '2d155d264e5cefc27abf2c5020fcfa06bde755ec':
PowerManagerService: Fix bug resulting in backlights turning on while screen is off.
This fixes a problem that resulted in bogus battery statistics for the prox and light sensors
due to the sensors being enabled in an app's context and disabled in the system context.
Fixes problems reported in bug b/2211960
Change-Id: Ib0d3d9d06f043b386d3b8d494b9bad5bd40bb6e1
Signed-off-by: Mike Lockwood <lockwood@android.com>
Fixes bug b/2198028 (testDirectionsFromScratchByTyping fails because of android.permission.ACCESS_WIFI_STATE)
Change-Id: I44e95981d805189ed6d906d388c5189ee788802f
Signed-off-by: Mike Lockwood <lockwood@android.com>
Merge commit '3333fa4f3d2e1bd3842fe7d41d19557ff9a98372' into eclair-plus-aosp
* commit '3333fa4f3d2e1bd3842fe7d41d19557ff9a98372':
PowerManagerService: Ensure that recent changes do not effect the hardware ALS case.
Merge commit '9baeff05a8bf9bd4479f2a357dca0463cc750202' into eclair-mr2-plus-aosp
* commit '9baeff05a8bf9bd4479f2a357dca0463cc750202':
PowerManagerService: Do not enable light sensor if hardware backlight management is being used.
Merge commit '6eb14c30387d9c13538887e54bc180a430b2ac40' into eclair-mr2
* commit '6eb14c30387d9c13538887e54bc180a430b2ac40':
PowerManagerService: Do not enable light sensor if hardware backlight management is being used.
Merge commit '6eb14c30387d9c13538887e54bc180a430b2ac40' into eclair-plus-aosp
* commit '6eb14c30387d9c13538887e54bc180a430b2ac40':
PowerManagerService: Do not enable light sensor if hardware backlight management is being used.
The driver can now report to us that they are hosed and we'll shut
down wifi and restart it - only to be used as a last resort.
Also fixing synch problem with updateWifiState.
bug: 2173119
Merge commit 'c6bead14fe6fe70bcfd8802ee9f0259476a074ce' into eclair-mr2-plus-aosp
* commit 'c6bead14fe6fe70bcfd8802ee9f0259476a074ce':
Implement feature #2117336: Create event communication APIs for live wallpaper
Merge commit '7580493b014a2c7ea883cd291255798dc72ebbff' into eclair-plus-aosp
* commit '7580493b014a2c7ea883cd291255798dc72ebbff':
Implement feature #2117336: Create event communication APIs for live wallpaper
Merge commit '7580493b014a2c7ea883cd291255798dc72ebbff' into eclair-mr2
* commit '7580493b014a2c7ea883cd291255798dc72ebbff':
Implement feature #2117336: Create event communication APIs for live wallpaper
Merge commit 'fa48000a25a32de1a117c716dcd6f9c255bffe58' into eclair-mr2-plus-aosp
* commit 'fa48000a25a32de1a117c716dcd6f9c255bffe58':
Update the names of the widgets when the locale changes.
Merge commit '94f2c524214b56ac2416f79cf9e81fa598327917' into eclair-mr2
* commit '94f2c524214b56ac2416f79cf9e81fa598327917':
Update the names of the widgets when the locale changes.
Merge commit '94f2c524214b56ac2416f79cf9e81fa598327917' into eclair-plus-aosp
* commit '94f2c524214b56ac2416f79cf9e81fa598327917':
Update the names of the widgets when the locale changes.
Merge commit 'd278ffc0984d730b333f53636a223eae6d9b7657' into eclair-mr2-plus-aosp
* commit 'd278ffc0984d730b333f53636a223eae6d9b7657':
PowerManager: Don't poke user activity in setKeyboardVisibility unless the state actually changed.
Merge commit '96e0c3156e21bbdb0d94201b08d80379b98c472a' into eclair-plus-aosp
* commit '96e0c3156e21bbdb0d94201b08d80379b98c472a':
PowerManager: Don't poke user activity in setKeyboardVisibility unless the state actually changed.
Merge commit '96e0c3156e21bbdb0d94201b08d80379b98c472a' into eclair-mr2
* commit '96e0c3156e21bbdb0d94201b08d80379b98c472a':
PowerManager: Don't poke user activity in setKeyboardVisibility unless the state actually changed.
Fixes bug b/2158297 (lock screen should time out after 7 seconds)
Change-Id: Ia3f7ef6464129ab78283923dbfd7f7472136e676
Signed-off-by: Mike Lockwood <lockwood@android.com>
Merge commit 'eadb97b4826bb6a2fa34db9c65b5a0d6f7baade9' into eclair-plus-aosp
* commit 'eadb97b4826bb6a2fa34db9c65b5a0d6f7baade9':
PowerManagerService: Ignore user activity while the screen is animating off.
Merge commit '0737b1643071694cf8767e3609ad628f1679d63a' into eclair-plus-aosp
* commit '0737b1643071694cf8767e3609ad628f1679d63a':
Fix bug 2194213: Non-default system IMEs are enabled, but not initially shown in input method switcher.
Merge commit 'f8a57dcb5983ad465bff697bbccb0eca031e7072' into eclair-mr2-plus-aosp
* commit 'f8a57dcb5983ad465bff697bbccb0eca031e7072':
PowerManagerService: Ignore user activity while the screen is animating off.
Merge commit '9f9f56212610ddd69c8af8ddeeed39265c0e58e1' into eclair-mr2-plus-aosp
* commit '9f9f56212610ddd69c8af8ddeeed39265c0e58e1':
Fix bug 2194213: Non-default system IMEs are enabled, but not initially shown in input method switcher.
Merge commit 'eadb97b4826bb6a2fa34db9c65b5a0d6f7baade9' into eclair-mr2
* commit 'eadb97b4826bb6a2fa34db9c65b5a0d6f7baade9':
PowerManagerService: Ignore user activity while the screen is animating off.
Merge commit '0737b1643071694cf8767e3609ad628f1679d63a' into eclair-mr2
* commit '0737b1643071694cf8767e3609ad628f1679d63a':
Fix bug 2194213: Non-default system IMEs are enabled, but not initially shown in input method switcher.
Merge commit '6d924c69af055559ed84afaf487aa38bd6fd2e33' into eclair-mr2-plus-aosp
* commit '6d924c69af055559ed84afaf487aa38bd6fd2e33':
If we fail to persist the current settings and fall back to the back settings file
Merge commit '5b48223d0e8b8becea0c120895d964e6472b3552' into eclair-mr2
* commit '5b48223d0e8b8becea0c120895d964e6472b3552':
If we fail to persist the current settings and fall back to the back settings file
