Chet Haase
bfea76c787
Fix requestLayout-during-layout issue with Gallery
...
The way that the Gallery was adding views (which it does in layout)
triggered a requestLayout() because of a call to setLayoutParams()
in View.addViewInner(). This tripped up the new logic that makes
layout-in-layout work, causing layout to be called on every frame,
even when the app was not doing anything.
The fix is to call the appropriate version
of requestLayoutInner() to tell it to skip calls to requestLayout().
Issue #7714495 requestLayout in endless loop
Change-Id: Icdcd886d30e4dd972da36bc6e50732c7213530c5
2012-12-11 14:05:24 -08:00
Matthew Xie
1ef98fb37e
am 5cb09b7d: am 8b283df9: am b6b4f171: Merge "Change getName and getAddress permission to BLUETOOTH" into jb-mr1.1-dev
...
* commit '5cb09b7dc5b2a3bfa895bca5402af9edc8ec9d9a':
Change getName and getAddress permission to BLUETOOTH
2012-12-04 11:29:53 -08:00
Matthew Xie
5cb09b7dc5
am 8b283df9: am b6b4f171: Merge "Change getName and getAddress permission to BLUETOOTH" into jb-mr1.1-dev
...
* commit '8b283df989f9b8b71797f9feaeb15cb012ab3190':
Change getName and getAddress permission to BLUETOOTH
2012-12-04 11:27:11 -08:00
Matthew Xie
8b283df989
am b6b4f171: Merge "Change getName and getAddress permission to BLUETOOTH" into jb-mr1.1-dev
...
* commit 'b6b4f171ff38ccac833edb2a1ad7f725ed068d46':
Change getName and getAddress permission to BLUETOOTH
2012-12-04 11:25:14 -08:00
Matthew Xie
b6b4f171ff
Merge "Change getName and getAddress permission to BLUETOOTH" into jb-mr1.1-dev
2012-12-04 11:21:55 -08:00
Daniel Sandler
3ff1139032
am 994901ee: am d9e46ac5: am d8cb8fa4: Merge "Revised language for notification ringtone picker." into jb-mr1.1-dev
...
* commit '994901ee7f096751cc593e213ea60a1cbdd9504a':
Revised language for notification ringtone picker.
2012-12-04 11:09:25 -08:00
Daniel Sandler
994901ee7f
am d9e46ac5: am d8cb8fa4: Merge "Revised language for notification ringtone picker." into jb-mr1.1-dev
...
* commit 'd9e46ac5ffcd2a1b3abf70bde14af7d10ebf018b':
Revised language for notification ringtone picker.
2012-12-04 11:06:25 -08:00
Romain Guy
ee0ff18c36
Merge "Optimize onAttachedTo/onDetachedFromWindow"
2012-12-04 11:05:21 -08:00
Daniel Sandler
d9e46ac5ff
am d8cb8fa4: Merge "Revised language for notification ringtone picker." into jb-mr1.1-dev
...
* commit 'd8cb8fa463c9a527aff462f887dbca9fa9843fcf':
Revised language for notification ringtone picker.
2012-12-04 11:03:44 -08:00
Daniel Sandler
d8cb8fa463
Merge "Revised language for notification ringtone picker." into jb-mr1.1-dev
2012-12-04 11:01:04 -08:00
Matthew Xie
af5ddbfcf5
Change getName and getAddress permission to BLUETOOTH
...
The permissions were set as BLUETOOTH_ADMIN by mistake. Correct them
bug 7665249
Change-Id: Ic1bdbeb25e8f55d886f9a8d38920cbb769dd38ca
2012-12-04 10:47:43 -08:00
Craig Mautner
bebd1a092e
am d3b9dd6c: am 40627de3: Merge "Remove unnecessary references in WindowManagerService"
...
* commit 'd3b9dd6ca6325abe5cf2049c2894a86b256a3db1':
Remove unnecessary references in WindowManagerService
2012-12-04 10:39:59 -08:00
Craig Mautner
d3b9dd6ca6
am 40627de3: Merge "Remove unnecessary references in WindowManagerService"
...
* commit '40627de3044c4a23c20c2229cab20aab21ff2b03':
Remove unnecessary references in WindowManagerService
2012-12-04 10:38:32 -08:00
Irfan Sheriff
56a715ef7a
Merge "Fix NPE in StateMachine"
2012-12-04 10:23:09 -08:00
Irfan Sheriff
f98facaf80
Fix NPE in StateMachine
...
Bug: 7661311
Change-Id: I8645692baf43aced1f4b364bbf13275646754b63
2012-12-04 10:17:25 -08:00
Craig Mautner
40627de304
Merge "Remove unnecessary references in WindowManagerService"
2012-12-04 09:45:03 -08:00
You Kim
cb6291c9b1
Remove unnecessary references in WindowManagerService
...
Clean message routines in WindowManagerService.
Change-Id: I3e3106b6499c67d1fd7133c987c0452a73141a3f
Signed-off-by: You Kim <you.kim72@gmail.com>
2012-12-05 00:10:03 +09:00
Daniel Sandler
efe89f28cb
am 59912d40: am b8145002: am 9f2532bf: Merge "Reduce false swipe-closed gestures in status bar panels." into jb-mr1.1-dev
...
* commit '59912d40babedccb2346d94651f79491cbe5fd8e':
Reduce false swipe-closed gestures in status bar panels.
2012-12-04 06:06:32 -08:00
Daniel Sandler
aa9c5b6e9f
Revised language for notification ringtone picker.
...
Bug: 7659273
Change-Id: I5cb94a24b8ebff96ab5b567efc39a780300ee7ee
2012-12-04 09:06:21 -05:00
Daniel Sandler
59912d40ba
am b8145002: am 9f2532bf: Merge "Reduce false swipe-closed gestures in status bar panels." into jb-mr1.1-dev
...
* commit 'b814500269324bc24de13f974f9564ff176a578f':
Reduce false swipe-closed gestures in status bar panels.
2012-12-04 06:03:18 -08:00
Daniel Sandler
b814500269
am 9f2532bf: Merge "Reduce false swipe-closed gestures in status bar panels." into jb-mr1.1-dev
...
* commit '9f2532bf1215dffb4058d1b01834b3a0a7272fdc':
Reduce false swipe-closed gestures in status bar panels.
2012-12-04 06:00:02 -08:00
Daniel Sandler
9f2532bf12
Merge "Reduce false swipe-closed gestures in status bar panels." into jb-mr1.1-dev
2012-12-04 05:33:16 -08:00
Baligh Uddin
9347e00188
Merge "Import translations. DO NOT MERGE"
2012-12-03 21:21:39 -08:00
Baligh Uddin
31d949daee
am ea71e29a: (-s ours) am a468a7e5: am 8ef5660e: Merge "Import translations. DO NOT MERGE" into jb-mr1.1-dev
...
* commit 'ea71e29a4ba57641a5adc67ff12b46f214a32126':
Import translations. DO NOT MERGE
2012-12-03 21:21:06 -08:00
Baligh Uddin
5868368bd5
am 33383354: (-s ours) am 52190903: am d8567b66: am 47ae0b93: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
...
* commit '333833541c7c69fcb6849fdd0b7fe9067f60000a':
Import translations. DO NOT MERGE
2012-12-03 21:19:29 -08:00
Baligh Uddin
ea71e29a4b
am a468a7e5: am 8ef5660e: Merge "Import translations. DO NOT MERGE" into jb-mr1.1-dev
...
* commit 'a468a7e533add133ffa4cf5aff89163c126307a7':
Import translations. DO NOT MERGE
2012-12-03 21:17:35 -08:00
Baligh Uddin
cabdbfcbda
Merge "Import translations. DO NOT MERGE"
2012-12-03 21:15:55 -08:00
Baligh Uddin
a468a7e533
am 8ef5660e: Merge "Import translations. DO NOT MERGE" into jb-mr1.1-dev
...
* commit '8ef5660e3ccdd9de41b0d08992bfc2641d9c860b':
Import translations. DO NOT MERGE
2012-12-03 21:15:30 -08:00
Baligh Uddin
333833541c
am 52190903: am d8567b66: am 47ae0b93: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
...
* commit '521909035e0c406ba89c76b67f73cd88f7eb69dd':
Import translations. DO NOT MERGE
2012-12-03 21:13:58 -08:00
Baligh Uddin
8ef5660e3c
Merge "Import translations. DO NOT MERGE" into jb-mr1.1-dev
2012-12-03 21:11:52 -08:00
Baligh Uddin
521909035e
am d8567b66: am 47ae0b93: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
...
* commit 'd8567b661c3197ed4b208141e1c0f0542ae2723a':
Import translations. DO NOT MERGE
2012-12-03 21:11:50 -08:00
Baligh Uddin
d8567b661c
am 47ae0b93: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
...
* commit '47ae0b93c3a3b4fcb32cd46ad3b8313959344912':
Import translations. DO NOT MERGE
2012-12-03 21:09:55 -08:00
Baligh Uddin
4c5f46dfa8
am 2306bec5: (-s ours) am 4ca5fbaa: Merge "Import translations. DO NOT MERGE" into jb-mr1-aah-dev
...
* commit '2306bec5851265146cecd4d5fdf02c930697a453':
Import translations. DO NOT MERGE
2012-12-03 21:08:08 -08:00
Baligh Uddin
47ae0b93c3
Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
2012-12-03 21:04:42 -08:00
Baligh Uddin
2306bec585
am 4ca5fbaa: Merge "Import translations. DO NOT MERGE" into jb-mr1-aah-dev
...
* commit '4ca5fbaa91dc002647b2fd5f63b8a162cefc3553':
Import translations. DO NOT MERGE
2012-12-03 21:04:02 -08:00
Baligh Uddin
4ca5fbaa91
Merge "Import translations. DO NOT MERGE" into jb-mr1-aah-dev
2012-12-03 21:00:51 -08:00
Romain Guy
fbb93fa2f3
Optimize onAttachedTo/onDetachedFromWindow
...
Apps detaching/attaching large subtrees would waste a few milliseconds
dealing with dirty display lists. This change removes the need to do
ArrayList.remove() on every detachedFromWindow().
Change-Id: Icee72516c40d48ff0fd9d6f3128589f99bf61428
2012-12-03 18:51:57 -08:00
Svetoslav Ganov
1616269a40
Merge "Adding API for refreshing the state of an AccessibilityNodeInfo."
2012-12-03 17:25:06 -08:00
Svetoslav Ganov
0b0afb49a8
Adding API for refreshing the state of an AccessibilityNodeInfo.
...
Sometimes a client needs to hold onto an accessibility node info and
this info may get into a stale state. The clent has to be able to
request a refresh of the info. This change adds a refresh call to
AccessibilityNodeInfo.
bug:6711796
Change-Id: I580a9a5d9fd1f705ea0a2cf4d3ff65543714c9c3
2012-12-03 16:59:22 -08:00
The Android Open Source Project
563dc542d8
am b89f1ec2: (-s ours) Reconcile with jb-mr1.1-release - do not merge
...
* commit 'b89f1ec20b05675a0e70f9bfb6aa4a703e4597f1':
2012-12-03 16:41:16 -08:00
The Android Open Source Project
b89f1ec20b
Reconcile with jb-mr1.1-release - do not merge
...
Change-Id: I3fbcd93e4cef710bf1562bc7844f4a62f3146e02
2012-12-03 16:39:07 -08:00
Dianne Hackborn
6a6f51ff41
am f9ae5f75: (-s ours) am 23307cbb: am e0a676a3: Merge "Fix issue #7649590 : Background windows sometimes not being hidden for secondary users" into jb-mr1.1-dev
...
* commit 'f9ae5f75af259437391e41dac7f3c4461c495dd9':
Fix issue #7649590 : Background windows sometimes not being hidden for secondary users
2012-12-03 16:15:27 -08:00
Scott Main
5dcbfdc257
am dac257cd: am 9857e246: am cd6ffc82: am a06c2941: docs: revisions to GPS Setup page w/ note about emulator
...
* commit 'dac257cd73cce3e63dd21267520660dd6869baf4':
docs: revisions to GPS Setup page w/ note about emulator
2012-12-03 16:11:06 -08:00
Dianne Hackborn
f9ae5f75af
am 23307cbb: am e0a676a3: Merge "Fix issue #7649590 : Background windows sometimes not being hidden for secondary users" into jb-mr1.1-dev
...
* commit '23307cbb6b432b658b0fd7437dacfedd6298af94':
Fix issue #7649590 : Background windows sometimes not being hidden for secondary users
2012-12-03 16:08:35 -08:00
Scott Main
dac257cd73
am 9857e246: am cd6ffc82: am a06c2941: docs: revisions to GPS Setup page w/ note about emulator
...
* commit '9857e24612d97f2e4e9145294375ce88029a52b3':
docs: revisions to GPS Setup page w/ note about emulator
2012-12-03 16:08:29 -08:00
Svetoslav Ganov
2c5f782094
Merge "Refactoring of the screen magnification feature."
2012-12-03 15:59:32 -08:00
Dianne Hackborn
23307cbb6b
am e0a676a3: Merge "Fix issue #7649590 : Background windows sometimes not being hidden for secondary users" into jb-mr1.1-dev
...
* commit 'e0a676a3bb0e7b9aced9359a021e4c5d2ffef752':
Fix issue #7649590 : Background windows sometimes not being hidden for secondary users
2012-12-03 15:54:34 -08:00
The Android Automerger
2cba4f1b56
merge in jb-mr1.1-release history after reset to jb-mr1.1-dev
2012-12-03 15:54:28 -08:00
Dianne Hackborn
e0a676a3bb
Merge "Fix issue #7649590 : Background windows sometimes not being hidden for secondary users" into jb-mr1.1-dev
2012-12-03 15:51:47 -08:00
Scott Main
9857e24612
am cd6ffc82: am a06c2941: docs: revisions to GPS Setup page w/ note about emulator
...
* commit 'cd6ffc82ef248dc0260f2b5fb615d0ae727664b9':
docs: revisions to GPS Setup page w/ note about emulator
2012-12-03 15:48:51 -08:00