summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* am 4b255a23: am 03aa28fb: Merge "Improve the input policy handling a bit." ↵Jeff Brown2010-10-133-67/+87
|\ | | | | | | | | | | | | | | | | into gingerbread Merge commit '4b255a23041225103a6870e77a236f78c2816eda' * commit '4b255a23041225103a6870e77a236f78c2816eda': Improve the input policy handling a bit.
| * am 03aa28fb: Merge "Improve the input policy handling a bit." into gingerbreadJeff Brown2010-10-123-67/+87
| |\ | | | | | | | | | | | | | | | | | | Merge commit '03aa28fb36589a3d601be08e75c08a24c4344d6f' into gingerbread-plus-aosp * commit '03aa28fb36589a3d601be08e75c08a24c4344d6f': Improve the input policy handling a bit.
| | * Merge "Improve the input policy handling a bit." into gingerbreadJeff Brown2010-10-123-67/+87
| | |\
| | | * Improve the input policy handling a bit.Jeff Brown2010-10-123-67/+87
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixed some issues with Monkeys turning off their own screens. Ook ook! Added some more comments to explain what's going on. Change-Id: Id2bc0466161a642a73ef7ef97725d1c81e984b12
* | | | am b99db0c7: am 4367ab00: Set the wifi-only for SIP service as the default ↵Chung-yih Wang2010-10-131-1/+1
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | config. Merge commit 'b99db0c70e0ee18e0a691126134b9394f30f7f03' * commit 'b99db0c70e0ee18e0a691126134b9394f30f7f03': Set the wifi-only for SIP service as the default config.
| * | | am 4367ab00: Set the wifi-only for SIP service as the default config.Chung-yih Wang2010-10-111-1/+1
| |\ \ \ | | |/ / | | | | | | | | | | | | | | | | | | | | Merge commit '4367ab00edb59f95703e4a8a0f9a1a73dbf13551' into gingerbread-plus-aosp * commit '4367ab00edb59f95703e4a8a0f9a1a73dbf13551': Set the wifi-only for SIP service as the default config.
| | * | Set the wifi-only for SIP service as the default config.Chung-yih Wang2010-10-121-1/+1
| | | | | | | | | | | | | | | | | | | | Change-Id: I90d2d14b5d9c953e45f85d3d5128d096ea17b22e bug-id: http://b/3068006
* | | | am f5b7c855: am f5201ab7: Keep original phone number in SipConnection.Hung-ying Tyan2010-10-132-6/+17
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | Merge commit 'f5b7c855fbb69e8614dab5ca15639228a2428784' * commit 'f5b7c855fbb69e8614dab5ca15639228a2428784': Keep original phone number in SipConnection.
| * | | am f5201ab7: Keep original phone number in SipConnection.Hung-ying Tyan2010-10-112-6/+17
| |\ \ \ | | |/ / | | | | | | | | | | | | | | | | | | | | Merge commit 'f5201ab71ff4d104265ab126e86afc6b81da8011' into gingerbread-plus-aosp * commit 'f5201ab71ff4d104265ab126e86afc6b81da8011': Keep original phone number in SipConnection.
| | * | Keep original phone number in SipConnection.Hung-ying Tyan2010-10-122-6/+17
| | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | In case it's a PSTN number carried by an Internet call, the phone app can still get the original phone number from Connection.getAddress() instead of getting a SIP URI. http://b/issue?id=3085996 Change-Id: Ie6c66100a4b5b2ce3f73baa1b446761cd51d7727
* | | am b05632aa: am a28d5aff: Merge "Fix a bug synthesizing cancelation events ↵Jeff Brown2010-10-131-1/+1
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | | | | for motions." into gingerbread Merge commit 'b05632aae37ea3a3573aabf10e6868733546de96' * commit 'b05632aae37ea3a3573aabf10e6868733546de96': Fix a bug synthesizing cancelation events for motions.
| * | am a28d5aff: Merge "Fix a bug synthesizing cancelation events for motions." ↵Jeff Brown2010-10-111-1/+1
| |\ \ | | |/ | | | | | | | | | | | | | | | | | | | | | into gingerbread Merge commit 'a28d5aff5466a55149b9e6f9cd908fcc225c25ff' into gingerbread-plus-aosp * commit 'a28d5aff5466a55149b9e6f9cd908fcc225c25ff': Fix a bug synthesizing cancelation events for motions.
| | * Merge "Fix a bug synthesizing cancelation events for motions." into gingerbreadJeff Brown2010-10-111-1/+1
| | |\
| | | * Fix a bug synthesizing cancelation events for motions.Jeff Brown2010-10-111-1/+1
| | | | | | | | | | | | | | | | Change-Id: I881c0fa16c1d22c4b1b6cca24deb0105405ff5b0
* | | | am c74d3917: am ece7e11b: Merge "SipService: fix a missing switch-case ↵Hung-ying Tyan2010-10-131-0/+1
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | break." into gingerbread Merge commit 'c74d39173e1071dbffe713e008b95784ac4312bc' * commit 'c74d39173e1071dbffe713e008b95784ac4312bc': SipService: fix a missing switch-case break.
| * | | am ece7e11b: Merge "SipService: fix a missing switch-case break." into ↵Hung-ying Tyan2010-10-111-0/+1
| |\ \ \ | | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | gingerbread Merge commit 'ece7e11b3723140b31d28bae6ed6f1ae30e5d802' into gingerbread-plus-aosp * commit 'ece7e11b3723140b31d28bae6ed6f1ae30e5d802': SipService: fix a missing switch-case break.
| | * | Merge "SipService: fix a missing switch-case break." into gingerbreadHung-ying Tyan2010-10-111-0/+1
| | |\ \
| | | * | SipService: fix a missing switch-case break.Hung-ying Tyan2010-10-121-0/+1
| | | | | | | | | | | | | | | | | | | | Change-Id: I638eecd8000293d4cb37b3595c02ca33df4924eb
* | | | | am a007ab29: am ffbc4b94: Merge "Fix SD card mounting issues #3074555 and ↵Dianne Hackborn2010-10-133-24/+14
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | #3072332" into gingerbread Merge commit 'a007ab294d83db987b05b49ab869566978a87494' * commit 'a007ab294d83db987b05b49ab869566978a87494': Fix SD card mounting issues #3074555 and #3072332
| * | | | am ffbc4b94: Merge "Fix SD card mounting issues #3074555 and #3072332" into ↵Dianne Hackborn2010-10-113-24/+14
| |\ \ \ \ | | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | gingerbread Merge commit 'ffbc4b948d0214c28df382f9eb209ea8f5ceef83' into gingerbread-plus-aosp * commit 'ffbc4b948d0214c28df382f9eb209ea8f5ceef83': Fix SD card mounting issues #3074555 and #3072332
| | * | | Merge "Fix SD card mounting issues #3074555 and #3072332" into gingerbreadDianne Hackborn2010-10-113-24/+14
| | |\ \ \ | | | |_|/ | | |/| |
| | | * | Fix SD card mounting issues #3074555 and #3072332Dianne Hackborn2010-10-113-24/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I79572bb4e92d2546abd97512a119ae74f0d72019 3074555: Kill "Shared storage safe to remove" notification 3072332: "blank shared storage" notification doesn't go anywhere
* | | | | Merge "Dynamically show the menu button on the system bar."Daniel Sandler2010-10-1311-12/+120
|\ \ \ \ \
| * | | | | Dynamically show the menu button on the system bar.Daniel Sandler2010-10-1311-12/+120
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Windows with FLAG_NEEDS_MENU_KEY (or windowNeedsMenuKey=true in their theme) will cause the system bar to show a menu icon. (Note that the phone's status bar currently ignores this, but phones tend to have hardware menu keys anyway.) Additionally, all windows whose package's SDK version is pre-Honeycomb will have FLAG_NEEDS_MENU_KEY set by default. Bug: 3003728 Change-Id: I2d983763a726ea4f32cd1af9b0390e30478b11d1
* | | | | | Merge "Adds a way to scroll to a position in a given duration"Erik2010-10-132-4/+44
|\ \ \ \ \ \
| * | | | | | Adds a way to scroll to a position in a given durationErik2010-10-132-4/+44
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Adds a method to AbsListView to allow for a smooth scroll to an offset position with an app defined duration. Change-Id: I8cd690597cda078b25bce9aeba683be030d6b155
* | | | | | | am c3041432: am de846ac6: Merge "Change to new binder implementation for ↵Kenny Root2010-10-131-1/+4
|\ \ \ \ \ \ \ | |/ / / / / / |/| | / / / / | | |/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | OBB" into gingerbread Merge commit 'c30414329c381afba7bd23bdd0f1237fad0850a6' * commit 'c30414329c381afba7bd23bdd0f1237fad0850a6': Change to new binder implementation for OBB
| * | | | | am de846ac6: Merge "Change to new binder implementation for OBB" into ↵Kenny Root2010-10-111-1/+4
| |\ \ \ \ \ | | | |/ / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | gingerbread Merge commit 'de846ac659e8c14d898a3fa14bd0504b24096057' into gingerbread-plus-aosp * commit 'de846ac659e8c14d898a3fa14bd0504b24096057': Change to new binder implementation for OBB
| | * | | | Merge "Change to new binder implementation for OBB" into gingerbreadKenny Root2010-10-111-1/+4
| | |\ \ \ \
| | | * | | | Change to new binder implementation for OBBKenny Root2010-10-111-1/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I3282df361a11fc37e94bc5ba4bd5860ae62a10e4
* | | | | | | resolved conflicts for merge of 8bb7a1df to masterKenny Root2010-10-1313-429/+722
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | | | | | | | | | | Change-Id: Ieec036f494a54eab74a27b954d1423bf981dd3f9
| * | | | | | am b4de3dca: Merge "OBB: rearrange to be entirely asynchronous" into gingerbreadKenny Root2010-10-1113-430/+725
| |\ \ \ \ \ \ | | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge commit 'b4de3dca96b9ff18562062e181dcd8b83e641e45' into gingerbread-plus-aosp * commit 'b4de3dca96b9ff18562062e181dcd8b83e641e45': OBB: rearrange to be entirely asynchronous
| | * | | | | Merge "OBB: rearrange to be entirely asynchronous" into gingerbreadKenny Root2010-10-1113-430/+725
| | |\ \ \ \ \ | | | |/ / / /
| | | * | | | OBB: rearrange to be entirely asynchronousKenny Root2010-10-1113-430/+725
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Rearrange structure of MountService handling of OBBs to be entirely asynchronous so we don't rely on locking as much. We still need the locking to support dumpsys which has been improved to output all the data structures for OBBs. Added more tests to cover more of the error return codes. Oh and fix a logic inversion bug. Change-Id: I34f541192dbbb1903b24825889b8fa8f43e6e2a9
* | | | | | | Merge "Begin hooking up SurfaceConfig."Jason Sams2010-10-137-104/+238
|\ \ \ \ \ \ \
| * | | | | | | Begin hooking up SurfaceConfig.Jason Sams2010-10-137-104/+238
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I328138f29affbed11fcfb5e9ed0872d4ba22d241
* | | | | | | | Allow icon+text action buttonsAdam Powell2010-10-136-15/+70
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I96d1f3958de3ac13cadbab108b87d6bae96e9473
* | | | | | | | Merge "Add a getNativeMatrix() API."Romain Guy2010-10-135-0/+28
|\ \ \ \ \ \ \ \
| * | | | | | | | Add a getNativeMatrix() API.Romain Guy2010-10-135-0/+28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This API can be used by WebView to apply the appropriate transform on its rendering. Change-Id: I79aa39a29805f462fb08226370328815e74bdc52
* | | | | | | | | Merge "state machine fixes"Irfan Sheriff2010-10-131-44/+23
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / / |/| | | | | | | |
| * | | | | | | | state machine fixesIrfan Sheriff2010-10-121-44/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - When supplicant dies, restart it - When wifimonitor fails to connect in time, restart supplicant - fix dhcp counter reset - defer all load/unload actions when waiting for supplicant control connection - we dont need to disconnect & reconnect at start with the faster monitor connection and handling of failures Bug: 2973023 Bug: 3090725 Change-Id: I5c834ddd08e6300e2b29da0941a24633825b4d3b
* | | | | | | | | Merge "Add voice button and a bunch of minor fixes for focus and visibility ↵Amith Yamasani2010-10-132-14/+174
|\ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / |/| | | | | | | | | | | | | | | | | of ime, submit button and drop down."
| * | | | | | | | Add voice button and a bunch of minor fixes for focus and visibility of ime, ↵Amith Yamasani2010-10-132-14/+174
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | submit button and drop down. Bug: 3077768 suggestion drawer not dismissed Bug: 3067611 submit button incorrectly displayed in some cases
* | | | | | | | | am 0ad4a77c: (-s ours) am 1169f420: Merge "Add animation for the status bar ↵Joe Onorato2010-10-130-0/+0
|\ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | going away." into gingerbread Merge commit '0ad4a77cb78348951c349ba92ec858bfb26aeb33' * commit '0ad4a77cb78348951c349ba92ec858bfb26aeb33': Add animation for the status bar going away.
| * | | | | | | | am 1169f420: Merge "Add animation for the status bar going away." into ↵Joe Onorato2010-10-111-1/+1
| |\ \ \ \ \ \ \ \ | | | |_|_|/ / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | gingerbread Merge commit '1169f420f6df5cf5254fed883efa7e6780473c08' into gingerbread-plus-aosp * commit '1169f420f6df5cf5254fed883efa7e6780473c08': Add animation for the status bar going away.
| | * | | | | | | Merge "Add animation for the status bar going away." into gingerbreadJoe Onorato2010-10-111-1/+1
| | |\ \ \ \ \ \ \
| | | * | | | | | | Add animation for the status bar going away.Joe Onorato2010-10-111-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 3077525 Change-Id: I0c166fc161f8febe963e667259517173b9ac609b
* | | | | | | | | | GL RenderingNicolas Roard2010-10-131-14/+41
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is a two-parts CL, Its counterpart is https://android-git.corp.google.com/g/#change,71690 Change-Id: I8ebe7f3bce84e76c903908768d010f46f3a30a4c
* | | | | | | | | | Merge "Retry quicker for control channel setup"Irfan Sheriff2010-10-131-2/+2
|\ \ \ \ \ \ \ \ \ \ | | |_|_|_|/ / / / / | |/| | | | | | | |
| * | | | | | | | | Retry quicker for control channel setupIrfan Sheriff2010-10-111-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 2976277 Change-Id: Ifedb0c1aebefc251028e8d2f578f530a3840c702
generated by cgit v1.1 at 2025-03-16 13:12:09 +0000