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
Romain Guy
98da04130e
am 359ef798: Merge "Fix crash with OpenGL wallpaper Bug #5216751 "
...
* commit '359ef7985316397564a6a999d77f6cc1edab7373':
Fix crash with OpenGL wallpaper Bug #5216751
2011-08-25 17:02:55 -07:00
Romain Guy
359ef79853
Merge "Fix crash with OpenGL wallpaper Bug #5216751 "
2011-08-25 17:01:24 -07:00
Romain Guy
f929629e74
Fix crash with OpenGL wallpaper
...
Bug #5216751
Change-Id: Ieb2c0e3b29a0673a5127692c9740ba59c879a3c2
2011-08-25 17:00:39 -07:00
Daniel Sandler
776a73abb4
am bf446c2a: Merge "Windowshade visual cleanups."
...
* commit 'bf446c2a2b9c2e0c3808b35c14955319a7adfae5':
Windowshade visual cleanups.
2011-08-25 16:56:13 -07:00
Adam Powell
cd11156964
am d85ffac5: Merge "Bug 4972534 - System dialog updates for ICS"
...
* commit 'd85ffac59f1685fc5c0c462de24c3a47dde09c8c':
Bug 4972534 - System dialog updates for ICS
2011-08-25 16:56:10 -07:00
Daniel Sandler
bf446c2a2b
Merge "Windowshade visual cleanups."
2011-08-25 16:54:25 -07:00
Adam Powell
d85ffac59f
Merge "Bug 4972534 - System dialog updates for ICS"
2011-08-25 16:54:09 -07:00
Peter Ng
e0806b9b7a
am 04a0974e: Merge "Browser generic buttons now fix btn_default 9patch optimization and combobox is now holo style"
...
* commit '04a0974e1e0c0e9a05a65eb29d9d17a92506c6d2':
Browser generic buttons now fix btn_default 9patch optimization and combobox is now holo style
2011-08-25 16:52:10 -07:00
Peter Ng
04a0974e1e
Merge "Browser generic buttons now fix btn_default 9patch optimization and combobox is now holo style"
2011-08-25 16:50:21 -07:00
Justin Ho
69a1072e2e
am 37e2abf9: Merge "b/5076132 Font drop from Christian"
...
* commit '37e2abf9f2315f7894dc1824c23d0328937e1d64':
b/5076132 Font drop from Christian
2011-08-25 16:44:33 -07:00
Justin Ho
37e2abf9f2
Merge "b/5076132 Font drop from Christian"
2011-08-25 16:42:18 -07:00
Irfan Sheriff
26ff9134c7
am b6dbd69f: Merge "Prevent dup network adding - b/5200491"
...
* commit 'b6dbd69fa958d162f638a92d1420cfc9602648ba':
Prevent dup network adding - b/5200491
2011-08-25 16:35:51 -07:00
Irfan Sheriff
b6dbd69fa9
Merge "Prevent dup network adding - b/5200491"
2011-08-25 16:34:47 -07:00
RoboErik
f65de15336
b/5076132 Font drop from Christian
...
Change-Id: I0aaf2be55736a4eaed64cf030534939b35040f8e
2011-08-25 16:32:44 -07:00
John Huang
d4a4d04ab5
am faafad76: Merge "Allow data during voice call if network type is LTE"
...
* commit 'faafad768411a1fcf1df4e1f3a1a7b208e6b71ad':
Allow data during voice call if network type is LTE
2011-08-25 16:32:42 -07:00
John Huang
faafad7684
Merge "Allow data during voice call if network type is LTE"
2011-08-25 16:30:31 -07:00
Tom Taylor
ba2088a469
am b5f819a2: Merge "Move Messaging app values from system to app config file"
...
* commit 'b5f819a2c83522517d19e15c9970bd404d4ee3e6':
Move Messaging app values from system to app config file
2011-08-25 16:29:52 -07:00
Tom Taylor
b5f819a2c8
Merge "Move Messaging app values from system to app config file"
2011-08-25 16:26:45 -07:00
yoonsung.nam
bcfa57ba52
Allow data during voice call if network type is LTE
...
Change-Id: Ibbf327ed709c8429232eb4e9088fe900a2e87980
Signed-off-by: yoonsung.nam <yoonsung.nam@samsung.com>
2011-08-25 16:24:25 -07:00
Peter Ng
cf677f6a3b
Browser generic buttons now fix btn_default 9patch optimization and combobox is now holo style
...
Bug: 5121825
Change-Id: I244bc780b6481493e32825765a4164ece9c9d481
2011-08-25 16:03:33 -07:00
Amith Yamasani
e5d7ff8970
am 8922d774: Merge "Fix preferences padding for single-pane screens."
...
* commit '8922d7744b7d5916b9736d4943f427ee98f4f0d3':
Fix preferences padding for single-pane screens.
2011-08-25 16:03:17 -07:00
Amith Yamasani
8922d7744b
Merge "Fix preferences padding for single-pane screens."
2011-08-25 16:02:04 -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
Irfan Sheriff
2492bf16b0
am 7b0e5af5: Merge "Fix connection notification for group owner"
...
* commit '7b0e5af540089007b2b6fb2d982d33d5ef9fb2b6':
Fix connection notification for group owner
2011-08-25 15:58:10 -07:00
John Huang
f60ac6307e
Merge "Notify overall state instead of current changed state"
2011-08-25 15:56:55 -07:00
Irfan Sheriff
7b0e5af540
Merge "Fix connection notification for group owner"
2011-08-25 15:56:41 -07:00
Adam Powell
1d71ef6fd6
Bug 4972534 - System dialog updates for ICS
...
Update grant_credentials_permission layout to match ICS UX guidelines
Change-Id: I4382beb8672bd9f30c55686005cfaabef943d6de
2011-08-25 15:54:49 -07:00
Adam Powell
6f4fb19a75
am ba5fe923: Merge "Fix bug 5199326 - ListView\'s fast scroller is out of sync with contents"
...
* commit 'ba5fe92361f717899e4b1e37a79f9f0547624487':
Fix bug 5199326 - ListView's fast scroller is out of sync with contents
2011-08-25 15:27:51 -07:00
Adam Powell
ba5fe92361
Merge "Fix bug 5199326 - ListView's fast scroller is out of sync with contents"
2011-08-25 15:26:36 -07:00
Isaac Levy
8fd4a3d0f7
Prevent dup network adding - b/5200491
...
Change-Id: I8260cf73c4261e8efb696bb8557a39e02754190e
2011-08-25 15:19:07 -07:00
Chris Craik
585e4cd48b
am 412be650: Merge "actually pause webkit thread, remove costly invalidate"
...
* commit '412be650371f63da229eb5ba4045e8e35bd59afb':
actually pause webkit thread, remove costly invalidate
2011-08-25 15:14:56 -07:00
Chris Craik
412be65037
Merge "actually pause webkit thread, remove costly invalidate"
2011-08-25 15:13:39 -07:00
Daniel Sandler
a3dba34dd2
Windowshade visual cleanups.
...
Bug: 5175050
Change-Id: Ia6ac4f6692823a17eb4f0ce0c4b9e1eb3fd16fcf
2011-08-25 15:12:20 -07:00
Daniel Sandler
1a66725c2f
am 6f758885: Merge "Scale windowshade gesture parameters for screen density."
...
* commit '6f7588850b2b1dd4a96584bad889bd4b51112c98':
Scale windowshade gesture parameters for screen density.
2011-08-25 14:42:30 -07:00
Daniel Sandler
6f7588850b
Merge "Scale windowshade gesture parameters for screen density."
2011-08-25 14:41:07 -07:00
Justin Ho
b5dc1f1ccd
am 9ebcfcaf: Merge "Fixes the flickering we witness in crespo by increasing the luminance of the bg hash bug: 5178100"
...
* commit '9ebcfcaf963a80548d893b11a65e2738be451108':
Fixes the flickering we witness in crespo by increasing the luminance of the bg hash bug: 5178100
2011-08-25 14:38:14 -07:00
Mathias Agopian
ec49d89701
Fix screenshots
...
Change-Id: If904634e64b154bbe336d5789dd1209b8ae871fb
2011-08-25 14:36:43 -07:00
Justin Ho
9ebcfcaf96
Merge "Fixes the flickering we witness in crespo by increasing the luminance of the bg hash bug: 5178100"
2011-08-25 14:36:31 -07:00
Daniel Sandler
dc940eaa67
Scale windowshade gesture parameters for screen density.
...
This has been broken since 2.0 but we didn't really notice
until now. Flinging the windowshade should now feel less
janky (the window's motion once flung will be more
continuous with your finger motion while flinging).
Bug: 5210198
Change-Id: Ieae0cabf5def46004f98a6dcb2337b2648f5e9ab
2011-08-25 14:35:53 -07:00
Chris Craik
58d94af539
actually pause webkit thread, remove costly invalidate
...
pass isScrolling info to glwebviewstate
pause webkit in a way that doesn't require full inval on resume
depends on change https://android-git.corp.google.com/g/#/c/130210/
bug:5106313
Change-Id: Icbe57e3a163c17c99bd1ea49ab42e40f9d41cc6d
2011-08-25 14:27:44 -07:00
Adam Powell
35948b7ed5
Fix bug 5199326 - ListView's fast scroller is out of sync with contents
...
Also fix a bug where the fast scroll track was not being properly
invalidated while animating out.
Change-Id: Ie90568a993699d5d061985985e3d93165d1d2219
2011-08-25 14:17:12 -07:00
Amith Yamasani
96313a9eb3
Fix preferences padding for single-pane screens.
...
Also fix the side margins for xlarge screens.
Bug: 5186006
Remove top/bottom margins for preference panel
Bug: 5053975
Change-Id: Iff3a82fd15acc7ec58461a1ca7a57e8b489d2a9f
2011-08-25 14:15:36 -07:00