satok
a08651734d
am 4bc554b3: Merge "Fix setCurrentSpellCheckerSubtype"
...
* commit '4bc554b37165dbee8d805a6f73ac5e946f2769ae':
Fix setCurrentSpellCheckerSubtype
2011-08-25 21:36:17 -07:00
satok
4bc554b371
Merge "Fix setCurrentSpellCheckerSubtype"
2011-08-25 21:34:44 -07:00
satok
3cb5b39a0e
Fix setCurrentSpellCheckerSubtype
...
Change-Id: Ib42a3b4377b8700ceaf4b7e13150848464d073c1
2011-08-26 12:39:42 +09:00
Mathias Agopian
852530700b
am 97c46181: Merge "put the watchdog values back to what they should be"
...
* commit '97c46181c7089cb937cfe3fab536049d2d99ad72':
put the watchdog values back to what they should be
2011-08-25 17:15:23 -07:00
Mathias Agopian
97c46181c7
Merge "put the watchdog values back to what they should be"
2011-08-25 17:13:59 -07:00
Mathias Agopian
cf2317ef13
put the watchdog values back to what they should be
...
Change-Id: I4f394248c2f4c514f74b66fde3cb69bbed9ec796
2011-08-25 17:12:37 -07:00
Paul Westbrook
9bf3097c25
am 6683eb2d: Merge "Use ELAPSE_REALTIME alarm for tick event"
...
* commit '6683eb2d8d4323ac21ad42b3f7646c761968c75f':
Use ELAPSE_REALTIME alarm for tick event
2011-08-25 17:09:39 -07:00
Mathias Agopian
1e0a1fd8c8
am 8228e68b: Merge changes I083c4133,If904634e
...
* commit '8228e68becda68bee31c85796f08396b58370f6f':
make sure to re-initialize SurfaceTexture to its default state on disconnect
Fix screenshots
2011-08-25 17:07:40 -07:00
Paul Westbrook
6683eb2d8d
Merge "Use ELAPSE_REALTIME alarm for tick event"
2011-08-25 17:07:06 -07:00
Mathias Agopian
8228e68bec
Merge changes I083c4133,If904634e
...
* changes:
make sure to re-initialize SurfaceTexture to its default state on disconnect
Fix screenshots
2011-08-25 17:05:33 -07:00
Mathias Agopian
2370d0a14f
make sure to re-initialize SurfaceTexture to its default state on disconnect
...
this caused problems where the NavigationBar would disapear or be
drawn in the wrong orientation.
Change-Id: I083c41338db83a4afd14f427caec2f31c180d734
2011-08-25 17:03:30 -07:00
John Huang
c9493383ac
am f60ac630: Merge "Notify overall state instead of current changed state"
...
* commit 'f60ac6307e07b409faea9f2506aa8c7162d11a4f':
Notify overall state instead of current changed state
2011-08-25 15:58:13 -07:00
John Huang
f60ac6307e
Merge "Notify overall state instead of current changed state"
2011-08-25 15:56:55 -07:00
yoonsung.nam
e6fa120275
Notify overall state instead of current changed state
...
TelephonyRegistry notifies wrong state thourgh onDataConnectionStateChanged().
As a result, browser works even though there is no data icon in status bar.
The issue is reproducible as following senario:
1. There are two connections.
2. Network type is changed and one of the connections is disconnected
at the same time.
3. TelephonyRegisitry notifies disconnect state to apps which are listening
PhoneStateLinstener.
Change-Id: Iac1e2b14e41715a63ea0d842cb44d232447e814a
Signed-off-by: yoonsung.nam <yoonsung.nam@samsung.com >
2011-08-25 14:12:33 -07:00
Dianne Hackborn
33a988101b
am 7b2a582a: Merge "Whoops, remove this."
...
* commit '7b2a582a277494643e123c71683cff47156b303c':
Whoops, remove this.
2011-08-25 13:35:25 -07:00
Dianne Hackborn
7b2a582a27
Merge "Whoops, remove this."
2011-08-25 13:33:50 -07:00
Paul Westbrook
51608a5304
Use ELAPSE_REALTIME alarm for tick event
...
Change to use a real item alarm for scheduling ACTION_TIME_TICK
intents for the case where time goes backwards after the tick intent
is schedule, and where the time change is not noticed from the call
to waitForAlarm().
Bug: 5166877
Change-Id: I46b9a1c80146d27becedc341c4af977fcdf47352
2011-08-25 13:32:49 -07:00
Dianne Hackborn
8795b60dfc
Whoops, remove this.
...
Change-Id: I863d4739e918de1b4177ec8bb17063597f1ff3dc
2011-08-25 13:31:41 -07:00
Dianne Hackborn
66e295b9a7
am 123adee3: Merge "Fix issue #5214105 and work on issue #5109947."
...
* commit '123adee398361809beaeddf2f3c073c0283b1e62':
Fix issue #5214105 and work on issue #5109947 .
2011-08-25 13:28:00 -07:00
Dianne Hackborn
123adee398
Merge "Fix issue #5214105 and work on issue #5109947."
2011-08-25 13:26:19 -07:00
Jeff Sharkey
bc0c990689
am ed191e1f: Merge "Data usage buckets active time, parsing ISE."
...
* commit 'ed191e1fae0f860323f6ed76ea982287c42ec83e':
Data usage buckets active time, parsing ISE.
2011-08-25 13:23:37 -07:00
Jeff Sharkey
8bb898f1e3
am 235c47ff: Merge "Register for kernel global data usage alerts."
...
* commit '235c47ff3edc9228609e82d2201275e70889921f':
Register for kernel global data usage alerts.
2011-08-25 13:23:32 -07:00
Svetoslav Ganov
0a1dc8689d
am 12bde60b: Merge "Intra-process view hierarchy interrogation does not work."
...
* commit '12bde60b39affbfdcb7ef6317e0a5f99c3f41b10':
Intra-process view hierarchy interrogation does not work.
2011-08-25 13:22:27 -07:00
satok
3d9e56b19e
am 1e3fac8b: Merge "Add functions to enable / disable spell checker"
...
* commit '1e3fac8bc62a2495eb9bb79cc208573b5782cedc':
Add functions to enable / disable spell checker
2011-08-25 13:20:00 -07:00
satok
213861b497
am 47d0e481: Merge "Dismiss the ime switch notification properly"
...
* commit '47d0e48197c566be5d4c11534ceabc8a38a18cec':
Dismiss the ime switch notification properly
2011-08-25 13:19:32 -07:00
Dianne Hackborn
295e3c27e4
Fix issue #5214105 and work on issue #5109947 .
...
Change-Id: Iff2cfec5280a314989d915aa830c16124f921611
5214105: taking a screenshot while "Android is upgrading..." crashes device
5109947: Race condition between retrieving a content provider and updating its oom adj
2011-08-25 13:19:08 -07:00
Dianne Hackborn
a3e1ccc5ee
am 6ff00377: Merge "Fix to show the correct HW accel background in the preview window."
...
* commit '6ff0037792619c4441d9d3caa4f9ab4f45c11236':
Fix to show the correct HW accel background in the preview window.
2011-08-25 13:18:29 -07:00
Brett Chabot
495954b7f1
am b26db260: Merge "Disable package verification by default."
...
* commit 'b26db260ae91a335fcee4f67df9341d002fbe1b0':
Disable package verification by default.
2011-08-25 13:17:54 -07:00
Romain Guy
aacf1d7310
am c39e8e89: Merge "Add OpenGL backend to ImageWallpaper Bug #5204874 "
...
* commit 'c39e8e89eb370ed66f552da3be258e57f1aabeb9':
Add OpenGL backend to ImageWallpaper Bug #5204874
2011-08-25 13:14:23 -07:00
Dianne Hackborn
e67afddf4a
am 19bc995e: Merge "Fix animation scale to also scale start offset."
...
* commit '19bc995e9ae4ec9ea48c183758759e2b68ec964b':
Fix animation scale to also scale start offset.
2011-08-25 13:14:11 -07:00
Christopher Tate
3b34eb58e3
am 1c424f86: Merge "Make sure to go to the right Settings panel when tapping a notification"
...
* commit '1c424f86c634a8c27ef1bbb82938ae64b4f3a385':
Make sure to go to the right Settings panel when tapping a notification
2011-08-25 13:09:00 -07:00
Chia-chi Yeh
a95e198d13
am 42577560: Merge "VPN: stop daemons by closing the control sockets."
...
* commit '42577560fb0a1aead62a378caa267734e9d91207':
VPN: stop daemons by closing the control sockets.
2011-08-25 13:06:58 -07:00
Dianne Hackborn
42a6f9e002
am 2da59ffb: Merge "Fix issue #5192141 : systemui asplodes after enough tapping on the windowlist button"
...
* commit '2da59ffbda80594e6312f400341810f91e1d333a':
Fix issue #5192141 : systemui asplodes after enough tapping on the windowlist button
2011-08-25 13:06:03 -07:00
Mike Lockwood
35314a0ace
am d0bf536f: Merge "No longer disable notification lights when screen turns on"
...
* commit 'd0bf536fd6618414bb9c84424a931865e62e6876':
No longer disable notification lights when screen turns on
2011-08-25 11:38:09 -07:00
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
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
Jeff Sharkey
ed191e1fae
Merge "Data usage buckets active time, parsing ISE."
2011-08-25 11:13:38 -07:00
Jeff Sharkey
235c47ff3e
Merge "Register for kernel global data usage alerts."
2011-08-25 11:13:32 -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
Svetoslav Ganov
12bde60b39
Merge "Intra-process view hierarchy interrogation does not work."
2011-08-25 08:54:29 -07:00
satok
1e3fac8bc6
Merge "Add functions to enable / disable spell checker"
2011-08-25 01:21:05 -07:00
satok
a33c4fc5be
Add functions to enable / disable spell checker
...
Bug: 5057977
Change-Id: I2b27bd5f55feb305368034d7e95f83257ac4b3e6
2011-08-25 17:08:19 +09:00
satok
47d0e48197
Merge "Dismiss the ime switch notification properly"
2011-08-25 00:36:35 -07:00
satok
dbf2950781
Dismiss the ime switch notification properly
...
Bug: 5159818
Change-Id: I606294dd453d3cc105714c62b945fcf1fa11164d
2011-08-25 15:29:48 +09:00
Dianne Hackborn
6ff0037792
Merge "Fix to show the correct HW accel background in the preview window."
2011-08-24 20:56:05 -07:00
Dianne Hackborn
07213e6d88
Fix to show the correct HW accel background in the preview window.
...
Also tweak wallpaper service to do a cleaner transition to a
static wallpaper.
Change-Id: I876a32091f92dd5a529d7fd809d3b8e730bb7d2a
2011-08-24 20:05:39 -07:00
Brett Chabot
b26db260ae
Merge "Disable package verification by default."
2011-08-24 19:45:51 -07:00
Brett Chabot
ae05e8655d
Disable package verification by default.
...
Change-Id: I0e02cd177dbb99fc97e964ac87251a900d915b95
2011-08-24 18:38:26 -07:00
Romain Guy
c39e8e89eb
Merge "Add OpenGL backend to ImageWallpaper Bug #5204874 "
2011-08-24 17:09:30 -07:00
Dianne Hackborn
19bc995e9a
Merge "Fix animation scale to also scale start offset."
2011-08-24 17:07:51 -07:00