satok
7435c945fd
am cfc0f2c2: Merge "Add functions to set / get SpellCheckerSubtype"
...
* commit 'cfc0f2c206af24350245f83b36e0032a7d4de49a':
Add functions to set / get SpellCheckerSubtype
2011-08-25 11:33:20 -07:00
Adam Powell
a955464f36
am bc714a35: Merge "Fix bug 5205275 - SwitchPreference doesn\'t allow Switch to slide back and forth."
...
* commit 'bc714a357d79c2315cc665eb706b465334cb9716':
Fix bug 5205275 - SwitchPreference doesn't allow Switch to slide back and forth.
2011-08-25 11:32:13 -07:00
Jeff Sharkey
178e3a3945
am 006efb24: Merge "Proactively disable data when over policy limit."
...
* commit '006efb24706378293a2faa137c7c7ca34a2e15cd':
Proactively disable data when over policy limit.
2011-08-25 11:31:30 -07:00
Jason Simmons
df6bb0a7ee
resolved conflicts for merge of 33264596 to ics-aah
...
Change-Id: I1b0b2c3a63d97d49940666ceec71293bdbab4e2e
2011-08-25 09:57:48 -07:00
satok
cfc0f2c206
Merge "Add functions to set / get SpellCheckerSubtype"
2011-08-24 00:26:01 -07:00
satok
ada8c4e6a3
Add functions to set / get SpellCheckerSubtype
...
Change-Id: I977326879fe201c4dee4a87da361217175eb6041
2011-08-24 16:00:55 +09:00
Adam Powell
bc714a357d
Merge "Fix bug 5205275 - SwitchPreference doesn't allow Switch to slide back and forth."
2011-08-23 21:56:16 -07:00
Jeff Sharkey
006efb2470
Merge "Proactively disable data when over policy limit."
2011-08-23 21:26:51 -07:00
Adam Powell
94f67e2af6
Fix bug 5205275 - SwitchPreference doesn't allow Switch to slide back
...
and forth.
Also have the SwitchPreference's Switch widget's onClick listener
toggle the switch rather than invoke the preference's own onClick
method. This will allow subclasses to assign different behavior to
clicking the preference itself if desired.
Change-Id: I97e3b7a786e9f0e8bdc03c0ed6001caa7dcd991b
2011-08-23 21:17:07 -07:00
Jeff Sharkey
8e28b7d782
Proactively disable data when over policy limit.
...
Add policy controls to NetworkStateTracker which are combined with
other user preference and internal flags to decide if data connection
should be established. Better locking around enabled flags.
When data network would be over limit, proactively disable data on
that network. Enable when policy is snoozed or when cycle resets.
Track and dismiss notifications from now-stale policies.
Bug: 4587023, 5178147
Change-Id: Ibfcc9f73cda7c369209af701b46eddd3d1943f2d
2011-08-23 18:45:44 -07:00
Dianne Hackborn
332645960c
Merge "Fix issue #4279860 : previous UI flashes before showing lock screen..."
2011-08-23 18:13:51 -07:00
Dianne Hackborn
29aae6f36e
Fix issue #4279860 : previous UI flashes before showing lock screen...
...
...(when turning display on after recently turning it off)
Also clean up when we decide to turn the screen on to improve that
transition. There are still problems here with turning it on
before the wallpaper gets dispayed.
Change-Id: I2bc56c12e5ad75a1ce5a0546f43a845bf0823e66
2011-08-23 17:44:52 -07:00
Adam Powell
d44b0df105
am 0e1e5223: Merge "Fix bug 5149918 - Can\'t call ProgressDialog.setProgressNumberFormat() before dialog is shown"
...
* commit '0e1e5223f96250e84323ae95d8cc9bd474b93502':
Fix bug 5149918 - Can't call ProgressDialog.setProgressNumberFormat() before dialog is shown
2011-08-23 17:13:50 -07:00
Adam Powell
5d4faa91f7
Fix bug 5149918 - Can't call ProgressDialog.setProgressNumberFormat()
...
before dialog is shown
Change-Id: I287637e022fb653f02b45b34075eccb68e4a9221
2011-08-23 16:52:35 -07:00
Chet Haase
6aa0ae71a1
am 09d569a5: Merge "Fix invalidation roundoff error with old animations"
...
* commit '09d569a57e7c8f3d8d6a5f2204643988ae36e07c':
Fix invalidation roundoff error with old animations
2011-08-23 15:55:41 -07:00
Chet Haase
09d569a57e
Merge "Fix invalidation roundoff error with old animations"
2011-08-23 15:11:48 -07:00
Chet Haase
530b22ab4e
Fix invalidation roundoff error with old animations
...
We need to add .5 to the width/height of invalidation areas to
avoid truncation errors.
Change-Id: Iaa2407a91a6a7f6d729af21d45e77e436197df11
2011-08-23 14:36:55 -07:00
Jaikumar Ganesh
0963ed73d3
am 234144b5: Merge "Make profile connection state API public."
...
* commit '234144b56a5c101b0c095ec387c3412d10069991':
Make profile connection state API public.
2011-08-23 13:48:28 -07:00
Jaikumar Ganesh
234144b56a
Merge "Make profile connection state API public."
2011-08-23 13:45:59 -07:00
Amith Yamasani
9ee5c7a3e2
am 7b71e458: Merge "Update searchables when packages are modified, in case they are enabled/disabled."
...
* commit '7b71e4586babedd52d7f5d4251b9233cdc20d4fb':
Update searchables when packages are modified, in case they are enabled/disabled.
2011-08-23 13:37:39 -07:00
Jeff Brown
e916e338ef
am ade537a3: Merge "Fix race in removeDeadProvider. Bug: 5202824"
...
* commit 'ade537a33109cf86a9fd9bd658d9f7fdf6a08002':
Fix race in removeDeadProvider. Bug: 5202824
2011-08-23 13:35:39 -07:00
Amith Yamasani
7b71e4586b
Merge "Update searchables when packages are modified, in case they are enabled/disabled."
2011-08-23 13:34:48 -07:00
Jeff Brown
ade537a331
Merge "Fix race in removeDeadProvider. Bug: 5202824"
2011-08-23 13:33:49 -07:00
Jaikumar Ganesh
9354790fa1
Make profile connection state API public.
...
Change-Id: I1f2810d4e820142435f7bbda051c98ec3e3cf3eb
2011-08-23 12:21:55 -07:00
Amith Yamasani
75a265490a
am defa12e9: Merge "Adjust slider range to be one more than max for base 1 volumes."
...
* commit 'defa12e95b8d25db5f3e9a044e83d6fe680b67a3':
Adjust slider range to be one more than max for base 1 volumes.
2011-08-23 12:16:42 -07:00
Amith Yamasani
defa12e95b
Merge "Adjust slider range to be one more than max for base 1 volumes."
2011-08-23 12:13:07 -07:00
Amith Yamasani
13bc602b21
Update searchables when packages are modified, in case they are enabled/disabled.
...
Bug: 5198361 : SearchManagerService doesn't respond to package updates.
Change-Id: I2ac794c5da4769eadd6b860ab0f9123060d2a5e5
2011-08-23 12:11:35 -07:00
Jeff Brown
2a4c5acc27
Fix race in removeDeadProvider.
...
Bug: 5202824
It's possible for removeDeadProvider to be called after the provider
has already been removed from the provider map due to a race between
binderDied and removing the provider.
Deleted removeDeadProviderLocked; it was dead code.
Change-Id: Iecdc68703225e7ac171746e63f1b3141c6f2ce4c
2011-08-23 11:58:26 -07:00
Amith Yamasani
d47a3aee7a
Adjust slider range to be one more than max for base 1 volumes.
...
Bug: 5191642
Change-Id: Id479ce584753fbb56feed22a8506579f2d9e35fd
2011-08-23 11:11:35 -07:00
Matthew Xie
2097c062b7
am f9838d0b: Merge "Set bluetooth discoverable off at power on time if the timeout is no forever"
...
* commit 'f9838d0bb961d5464a92819107747237ea1d923c':
Set bluetooth discoverable off at power on time if the timeout is no forever
2011-08-23 10:55:46 -07:00
Matthew Xie
f9838d0bb9
Merge "Set bluetooth discoverable off at power on time if the timeout is no forever"
2011-08-23 10:54:07 -07:00
Narayan Kamath
da3dda2589
am a7785806: Merge "Framework changes to support new TTS settings features."
...
* commit 'a77858066843182c91272c3e25c7eec10579eb93':
Framework changes to support new TTS settings features.
2011-08-23 03:30:58 -07:00
Narayan Kamath
a778580668
Merge "Framework changes to support new TTS settings features."
2011-08-23 03:28:04 -07:00
Narayan Kamath
e5b8c4dfc7
Framework changes to support new TTS settings features.
...
Locale is now stored per engine, instead of as a global
option.
bug:5149036
Change-Id: I9848172623fe8aea1dd8e6678bca008da6a4cfb1
2011-08-23 10:20:42 +01:00
Wu-cheng Li
1bd38c4136
am a46c372a: Merge "Make camera FOCUS_MODE_CONTINUOUS_PICTURE public."
...
* commit 'a46c372a75972dbfe73b1813d69fa047c3454b83':
Make camera FOCUS_MODE_CONTINUOUS_PICTURE public.
2011-08-23 00:06:01 -07:00
Wu-cheng Li
a46c372a75
Merge "Make camera FOCUS_MODE_CONTINUOUS_PICTURE public."
2011-08-23 00:05:00 -07:00
Mathias Agopian
6b27a8f38b
am 67403e09: BLUR_BEHIND flag is not supported anymore
...
* commit '67403e096e6f59b7cd18a90d0d3f5c3d17c31407':
BLUR_BEHIND flag is not supported anymore
2011-08-22 20:07:40 -07:00
Mathias Agopian
67403e096e
BLUR_BEHIND flag is not supported anymore
...
Bug: 5185650
Change-Id: I56541d4967b90b150a734be1bbeff696eb6a4fb3
2011-08-22 20:03:58 -07:00
Matthew Xie
d96daf1ae5
Set bluetooth discoverable off at power on time if the timeout is no forever
...
Set bluetooth discoverable off at power on time if the discoverable timeout
is no forever
bug 5068151
Change-Id: I413e8de5f49030b741a8b84a566065d112ee60be
2011-08-22 19:45:48 -07:00
Jaikumar Ganesh
598c90dbd2
am 04c43012: Merge "Fix sendConnection State intent api params."
...
* commit '04c4301251b9feff743fa92f3b7290b8dc32ebd9':
Fix sendConnection State intent api params.
2011-08-22 19:31:16 -07:00
Jaikumar Ganesh
04c4301251
Merge "Fix sendConnection State intent api params."
2011-08-22 19:29:57 -07:00
Jaikumar Ganesh
ef4f8f2c08
Fix sendConnection State intent api params.
...
Reported by: sj222.choi@samsung.com
Change-Id: I2e767b372bd5d9fa42d083a37e402a013388a3c2
2011-08-22 18:18:24 -07:00
Adam Powell
c38457907a
am e20c279d: Merge "Fix bug 5198868 - Showing previous hidden options menu doesn\'t work"
...
* commit 'e20c279d9a6719a7c0d8c6606c7ba1bd207db8d3':
Fix bug 5198868 - Showing previous hidden options menu doesn't work
2011-08-22 18:17:58 -07:00
Adam Powell
e20c279d9a
Merge "Fix bug 5198868 - Showing previous hidden options menu doesn't work"
2011-08-22 18:15:18 -07:00
Adam Powell
04dc06f52a
Fix bug 5198868 - Showing previous hidden options menu doesn't work
...
Fix bad assumption in flagging action items.
Change-Id: Ic67b56195bc308e73d1564cbf1b77e41eaa4ecab
2011-08-22 18:11:11 -07:00
Adam Powell
c4f68f1a17
am 76a05fef: Merge "Fix bug 5143392 - Add padding to left of action bar app icon to prevent icon from moving when drilling into hierarchy"
...
* commit '76a05fefbd401b386cd8ae264037bc3c8219bb0a':
Fix bug 5143392 - Add padding to left of action bar app icon to prevent icon from moving when drilling into hierarchy
2011-08-22 17:54:35 -07:00
Adam Powell
76a05fefbd
Merge "Fix bug 5143392 - Add padding to left of action bar app icon to prevent icon from moving when drilling into hierarchy"
2011-08-22 17:52:46 -07:00
Adam Powell
b1e2f25b7e
Fix bug 5143392 - Add padding to left of action bar app icon to
...
prevent icon from moving when drilling into hierarchy
Fix up the layout of home/up/titles in the action bar such that showing/hiding
the "up" indicator never changes the position of the icon, logo, or title.
Change-Id: Ic2117babe3a54619a4b787d5374295955a58fb34
2011-08-22 17:43:30 -07:00
Adam Powell
bf28cef2e1
am 0ddc899d: Merge "Fix bug 5189070 - Don\'t try to show overflow popups for nonexistant menus"
...
* commit '0ddc899dc5f2acebb1daa19369dbfe81d257690d':
Fix bug 5189070 - Don't try to show overflow popups for nonexistant menus
2011-08-22 17:06:41 -07:00
Fabrice Di Meglio
f51ff04f19
am c2d256b4: Merge "Improve TextDirection resolution"
...
* commit 'c2d256b41587ff44efb6373885affe02e5df80b5':
Improve TextDirection resolution
2011-08-22 17:06:35 -07:00