Mathias Agopian
9d216f7b0e
Merge "improve documentation for the ROTATION_VECTOR sensor"
2011-05-03 15:36:23 -07:00
Mathias Agopian
557975c2b5
Merge "Add documentation for Sensor.TYPE_PRESSURE"
2011-05-03 15:25:42 -07:00
Adam Powell
0d42f17f5e
Merge "Fix bug 4345702 - update action bar tab views when the Tab object is updated"
2011-05-03 14:55:54 -07:00
Adam Powell
0d8ec1d739
Fix bug 4345702 - update action bar tab views when the Tab object is
...
updated
Also fix a bug with visibility of split action bar views.
Change-Id: Iadd63d5e9b6cb9debab0f7a777e424e4c4807a13
2011-05-03 14:50:08 -07:00
Eino-Ville Talvala
3723396c7a
Merge "Add an auto-exposure lock feature to the Camera API."
2011-05-03 11:07:33 -07:00
Wink Saville
f45f13bd15
am 3165f1a8: am d0d44c4e: Merge "Make DataConnection asynchronous." into honeycomb-LTE
...
* commit '3165f1a8eb707b36a6b2c66379c3fde85d9cc2fd':
Make DataConnection asynchronous.
2011-05-02 23:46:03 -07:00
Wink Saville
3165f1a8eb
am d0d44c4e: Merge "Make DataConnection asynchronous." into honeycomb-LTE
...
* commit 'd0d44c4e988ecdea86c2bb04e29d8f6d20c1c631':
Make DataConnection asynchronous.
2011-05-02 23:44:16 -07:00
Wink Saville
d0d44c4e98
Merge "Make DataConnection asynchronous." into honeycomb-LTE
2011-05-02 23:41:29 -07:00
Adam Powell
e42b189f36
Remove debug logging
...
Change-Id: If1a8ef5461b98239d8f55f842e1043b6b3d0f070
2011-05-02 22:45:59 -07:00
Adam Powell
04748befb8
Merge "Refactoring of action bar internals"
2011-05-02 22:17:24 -07:00
Adam Powell
640a66eac6
Refactoring of action bar internals
...
Split action bar implementation details. Factor out common components
into AbsActionBar. Layout rules for the lower half of split action
bars.
Change-Id: I6bc39ba6c343055597880a7d4663dd8f30aa4999
2011-05-02 22:12:44 -07:00
Wink Saville
0b80114a2d
Make DataConnection asynchronous.
...
Change-Id: Ic0e01dded25ba1fdb3b2c6d0f95a1193f608a0e0
2011-05-02 21:55:04 -07:00
Mathias Agopian
d84d2b7b1e
improve documentation for the ROTATION_VECTOR sensor
...
the documentation didn't specify which reference coordinate
system was used.
Change-Id: I5ff5d1041b59de365863db6ee34cc9d823801d34
2011-05-02 19:08:53 -07:00
Mathias Agopian
1260a89b54
Add documentation for Sensor.TYPE_PRESSURE
...
Change-Id: I634722a9a22946a1ae96c0b868af0c66d467a3a6
2011-05-02 18:59:07 -07:00
Romain Guy
df0a7fbdcf
Merge "Allows to render with an OpenGL context inside a TextureView."
2011-05-02 18:33:26 -07:00
Romain Guy
8f0095cd33
Allows to render with an OpenGL context inside a TextureView.
...
Change-Id: I59453f7fc3997f0502a1c5d325d37fed376fabc7
2011-05-02 18:32:29 -07:00
Robert Greenwalt
f32330cf17
Merge "resolved conflicts for merge of db46fa25 to master"
2011-05-02 15:24:09 -07:00
Romain Guy
2542d0cd53
Merge "Remove unnecessary code."
2011-05-02 15:16:25 -07:00
Romain Guy
e91a9c7ab0
Remove unnecessary code.
...
Change-Id: I0352bf861192df51fe78873d439e8d7ff887118e
2011-05-02 14:53:30 -07:00
Robert Greenwalt
a8e0dfae06
resolved conflicts for merge of db46fa25 to master
...
Change-Id: I8df9d5d07588fbd70e417dae567be26f645b74b6
2011-05-02 14:41:57 -07:00
Irfan Sheriff
d713683f9f
am d369d64e: am 8ab6a6d4: Merge "Add DhcpStateMachine for interation with dhcpcd" into honeycomb-LTE
...
* commit 'd369d64ee7931726d479e60e64d76a31fdba4a8f':
Add DhcpStateMachine for interation with dhcpcd
2011-05-02 13:29:36 -07:00
Robert Greenwalt
db46fa25be
am a47c4019: Merge "Add RouteInfo objects for tracking routes." into honeycomb-LTE
...
* commit 'a47c40193fcbe9ca07facea78b2828afdae5e025':
Add RouteInfo objects for tracking routes.
2011-05-02 13:29:22 -07:00
Robert Greenwalt
a47c40193f
Merge "Add RouteInfo objects for tracking routes." into honeycomb-LTE
2011-05-02 13:26:52 -07:00
Irfan Sheriff
d369d64ee7
am 8ab6a6d4: Merge "Add DhcpStateMachine for interation with dhcpcd" into honeycomb-LTE
...
* commit '8ab6a6d415156bb543a735612fbbdecfbff6c3a4':
Add DhcpStateMachine for interation with dhcpcd
2011-05-02 12:26:52 -07:00
Wink Saville
a0449f03eb
Resolve merge conflicts for merge of 21083066 to master.
...
Change-Id: Ief83f7abdd3396af965fb86ad6815e16ce36ff5c
2011-05-02 12:13:44 -07:00
Wink Saville
210830664d
am 7e74c60d: Merge "Enhance AsyncChannel." into honeycomb-LTE
...
* commit '7e74c60db5261ea137c8f6672f8573873eb5814e':
Enhance AsyncChannel.
2011-05-02 11:51:36 -07:00
Irfan Sheriff
8ab6a6d415
Merge "Add DhcpStateMachine for interation with dhcpcd" into honeycomb-LTE
2011-05-02 11:49:46 -07:00
Robert Greenwalt
aa70f101e0
Add RouteInfo objects for tracking routes.
...
Used to have list of gateways for default routes, but general static routes
should be supported.
Change-Id: I01730142c6139f2b833b9d48f5381d2d320b69f6
2011-05-02 11:17:30 -07:00
Wink Saville
0246bbc8d7
Enhance AsyncChannel.
...
- Use Protocol for BASE of CMD's.
- Add synchronous connect methods.
- Back port sha1 c23971b3e4 from master
Change-Id: If0b3f6cbbb8d4268cad6ca19d26ab2ee42390d86
2011-05-02 10:44:56 -07:00
Conley Owens
e8141854dc
am dddaa56f: Merge commit \'b737647d\' (Scrolling using arrow keys with padding) into m
...
* commit 'dddaa56f793ad9ecb4e20df746f562ac7f24d158':
Scolling using arrow keys with padding
2011-05-02 10:28:26 -07:00
Conley Owens
f4c4a276e2
Merge commit 'f395e304' into m
...
Conflicts:
core/tests/coretests/src/android/text/TextUtilsTest.java
Change-Id: I7439f7f80cf91ff654c0ddd79c3e6b3808ba4784
2011-05-02 10:25:55 -07:00
Conley Owens
4c79ca8cae
am c30d7676: am 1a846ab0: am b1578d85: Merge "Fix startSearch condition on Dialog, because pressing search key causes ANR popup. If search key is pressed on Dialog and there is no search item then do nothing. How to reproduce the issue: Settings > About phone > Legal
...
* commit 'c30d767628861b0bbea907824682e47732c820f9':
Fix startSearch condition on Dialog, because pressing search key causes ANR popup. If search key is pressed on Dialog and there is no search item then do nothing. How to reproduce the issue: Settings > About phone > Legal information > Google legal > Press search key > Touch list item or press back key > ANR popup is shown
2011-05-02 10:11:43 -07:00
Conley Owens
5e3357fcee
Merge commit '5eb49e0f' into m
...
Conflicts:
core/java/com/android/internal/os/BatteryStatsImpl.java
Change-Id: Idc9c84c2ca7dec2540ceccead7927fddb912ff12
2011-05-02 09:59:30 -07:00
Conley Owens
9c4ba2580e
Merge "Removing dead store; it was likely a relict of debuging code."
2011-05-02 09:53:25 -07:00
Eino-Ville Talvala
3773eef4e3
Add an auto-exposure lock feature to the Camera API.
...
Adds a new camera parameter for locking auto-exposure to its current
value. Also adds a function for checking if auto-exposure lock is
supported by the current platform.
Hidden for now.
Change-Id: Id452371191ab220318ce2cb98b8ee91bdde9aab6
2011-05-02 09:36:06 -07:00
Irfan Sheriff
31be7cf4c7
Add DhcpStateMachine for interation with dhcpcd
...
- Supports wakeup and renewal on dhcp
- Supports multiple controllers to use the state machine
simultaneously
- Optionally, a controller can request a notification prior
to DHCP request/renewal being sent
Change-Id: I3a9d7e6a02ff26be3a86ddca6964683ad3c28f93
2011-04-30 12:58:51 -07:00
Conley Owens
a3dcd0a3f1
Merged "Adjust mBiggerTouchSlopSquare to the suitable value"
...
Conflicts:
core/java/android/view/ViewConfiguration.java
Change-Id: I74de006dbb19fd878591bc90955a1c6e74aa084e
2011-04-29 17:49:06 -07:00
Conley Owens
dddaa56f79
Merge commit 'b737647d' (Scrolling using arrow keys with padding) into m
...
Conflicts:
core/java/android/widget/ScrollView.java
Change-Id: I1cfd3f7091e92793ce9fa048a09ae08a04c10c80
2011-04-29 17:35:29 -07:00
Conley Owens
f395e3042a
am 19653c64: am 425db473: Merge "CHAR_SEQUENCE_CREATOR cannot handle null string"
...
* commit '19653c6440eaf7328ecbc01c3ca6d7a910906484':
CHAR_SEQUENCE_CREATOR cannot handle null string
2011-04-29 17:15:39 -07:00
Conley Owens
c30d767628
am 1a846ab0: am b1578d85: Merge "Fix startSearch condition on Dialog, because pressing search key causes ANR popup. If search key is pressed on Dialog and there is no search item then do nothing. How to reproduce the issue: Settings > About phone > Legal information >
...
* commit '1a846ab089878a6b342c6bc3e8850fc2e0ef3080':
Fix startSearch condition on Dialog, because pressing search key causes ANR popup. If search key is pressed on Dialog and there is no search item then do nothing. How to reproduce the issue: Settings > About phone > Legal information > Google legal > Press search key > Touch list item or press back key > ANR popup is shown
2011-04-29 17:07:14 -07:00
Conley Owens
5eb49e0f1e
am e321d064: am 2f463ef1: Merge "Adding a sanity test in the while loop in readHistory()"
...
* commit 'e321d06430304fa93282c765aa6070c908121a16':
Adding a sanity test in the while loop in readHistory()
2011-04-29 16:44:14 -07:00
Scott Main
bd3ddbb809
am 75c78dc3: am 511ec082: am de506220: am 1462813a: Merge "docs: more documentation for ProgressBar" into honeycomb
...
* commit '75c78dc364efb74c2d7c0187b3b26d0ab70e3c3e':
docs: more documentation for ProgressBar
2011-04-29 15:11:50 -07:00
Conley Owens
19b7cd95ff
am c703b49e: am 54668b8a: am e1787009: Merge "Added null check on return value for getKeyDispatcherState()"
...
* commit 'c703b49eb13993c45a1cab7ea1130601fba1df3e':
Added null check on return value for getKeyDispatcherState()
2011-04-29 15:11:48 -07:00
Conley Owens
a02a9e602b
am 27e8f1a3: am 8b22ef66: am e41d2aed: Merge "Using robust equality check."
...
* commit '27e8f1a3a6b43592e3d419d7a3cfc6192a86bf5c':
Using robust equality check.
2011-04-29 15:11:34 -07:00
Conley Owens
1b38cc3057
am 014757ee: am a9517012: am 1e29552b: Merge "We don\'t need these local references."
...
* commit '014757eea22fc9cceede1548c579c33c79464001':
We don't need these local references.
2011-04-29 15:11:30 -07:00
Conley Owens
95b533911c
am 49df110a: am d66a92e6: am da882181: Merge "Eliminating dead code with no other effect than consuming battery life."
...
* commit '49df110aeb94ada810a8eec0540e30a25c267a56':
Eliminating dead code with no other effect than consuming battery life.
2011-04-29 15:11:26 -07:00
Svetoslav Ganov
f0f955e2c3
Merge "Touch exploration - nits"
2011-04-29 15:10:14 -07:00
Svetoslav Ganov
887e1a17eb
Touch exploration - nits
...
Change-Id: Ie49558e0a81218dbad70c02f81dd7a59b3213d5c
2011-04-29 15:09:28 -07:00
Scott Main
75c78dc364
am 511ec082: am de506220: am 1462813a: Merge "docs: more documentation for ProgressBar" into honeycomb
...
* commit '511ec082bb198cfd04aebdccf56db6f4c8df9523':
docs: more documentation for ProgressBar
2011-04-29 15:05:10 -07:00
Scott Main
511ec082bb
am de506220: am 1462813a: Merge "docs: more documentation for ProgressBar" into honeycomb
...
* commit 'de506220d8a3d453463e1abe1b2eb54afd48ec93':
docs: more documentation for ProgressBar
2011-04-29 14:59:08 -07:00