Winson Chung
d578b38566
am dffd302f: am a58800d1: am 4cce397c: Merge "Letting partial update fall through if the widget has not received a full update yet. (Bug 7214731)" into jb-mr1-dev
...
* commit 'dffd302f7d07a7d31f40acd3edb223476b9b9395':
Letting partial update fall through if the widget has not received a full update yet. (Bug 7214731)
2012-10-11 17:53:20 -07:00
Adam Powell
90ef752146
am ff99f59f: am 4e5efaef: am 49dbc161: Merge "Revert "Fixed group and child view caching in SimpleExpandableListAdapter."" into jb-mr1-dev
...
* commit 'ff99f59f0bd30f6e475bf5adf358acb4d737cc51':
Revert "Fixed group and child view caching in SimpleExpandableListAdapter."
2012-10-11 17:52:54 -07:00
Fabrice Di Meglio
0c5c23b3a2
am 4c95bfd5: am 39b0c29e: am ec139240: Merge "Fix bug #7325234 LayoutParams are not resolved correctly (Settings apps looks broken on Manta in Arabic)" into jb-mr1-dev
...
* commit '4c95bfd5ad4d17b6e0e618cd3244ee2d33bcbda1':
Fix bug #7325234 LayoutParams are not resolved correctly (Settings apps looks broken on Manta in Arabic)
2012-10-11 17:52:51 -07:00
Danielle Millett
8bb1f5abc4
am 855bdf65: am 85a4ac92: am 8f89e6f8: Merge "Face Unlock is shown correctly during a phone call - fix b/7271718" into jb-mr1-dev
...
* commit '855bdf6500edfc4496002367638c577318b0b912':
Face Unlock is shown correctly during a phone call - fix b/7271718
2012-10-11 17:52:28 -07:00
Jeff Sharkey
98a8a3552d
am e0fec434: am 1cf5bd2a: am 26e3f3df: Merge "Database cleanup needs to happen for all users." into jb-mr1-dev
...
* commit 'e0fec43459ded4f304d6bd3d8f07e3acedcb5a11':
Database cleanup needs to happen for all users.
2012-10-11 17:18:42 -07:00
Adam Cohen
1c3bbfc7a4
am 68794263: am 2514cbc2: am e60cdf12: Merge "Final keyguard tablet layout integration" into jb-mr1-dev
...
* commit '6879426372c707d1b67cff549fae523621884304':
Final keyguard tablet layout integration
2012-10-11 17:18:37 -07:00
Svetoslav Ganov
6fdd3176e6
am 02942145: am a1489d30: am 9aefa145: Merge "Send accessibility event for content change upon setting content description." into jb-mr1-dev
...
* commit '0294214519df70978b5440b01ec6c2597f4eecec':
Send accessibility event for content change upon setting content description.
2012-10-11 17:18:33 -07:00
Dianne Hackborn
b10d82597b
am fc31380a: am ff363aa9: am 2a3e1ffd: Merge "More on issue #7318666 : hide developer options from user build" into jb-mr1-dev
...
* commit 'fc31380adf4272c11bc32fab1dcea75804ad3166':
More on issue #7318666 : hide developer options from user build
2012-10-11 17:18:25 -07:00
Satoshi Kataoka
bc58774037
am 95189b92: am 6a1d4b99: am 8e767115: Merge "Don\'t update the text services locale in the main thread" into jb-mr1-dev
...
* commit '95189b92259529997cfa4d15b5ffd060d9f99a51':
Don't update the text services locale in the main thread
2012-10-11 17:18:18 -07:00
Winson Chung
dffd302f7d
am a58800d1: am 4cce397c: Merge "Letting partial update fall through if the widget has not received a full update yet. (Bug 7214731)" into jb-mr1-dev
...
* commit 'a58800d153f2a3db963ccbf9347eeccf855ed421':
Letting partial update fall through if the widget has not received a full update yet. (Bug 7214731)
2012-10-11 17:13:17 -07:00
Adam Powell
ff99f59f0b
am 4e5efaef: am 49dbc161: Merge "Revert "Fixed group and child view caching in SimpleExpandableListAdapter."" into jb-mr1-dev
...
* commit '4e5efaef793c58ff014265eab7f11c3ded34b2ed':
Revert "Fixed group and child view caching in SimpleExpandableListAdapter."
2012-10-11 17:12:47 -07:00
Fabrice Di Meglio
4c95bfd5ad
am 39b0c29e: am ec139240: Merge "Fix bug #7325234 LayoutParams are not resolved correctly (Settings apps looks broken on Manta in Arabic)" into jb-mr1-dev
...
* commit '39b0c29e4f6582420518f1124af262865797339d':
Fix bug #7325234 LayoutParams are not resolved correctly (Settings apps looks broken on Manta in Arabic)
2012-10-11 17:12:32 -07:00
Danielle Millett
855bdf6500
am 85a4ac92: am 8f89e6f8: Merge "Face Unlock is shown correctly during a phone call - fix b/7271718" into jb-mr1-dev
...
* commit '85a4ac9281f5e592dead0f20146e4f154efd7c78':
Face Unlock is shown correctly during a phone call - fix b/7271718
2012-10-11 17:11:50 -07:00
Jeff Sharkey
e0fec43459
am 1cf5bd2a: am 26e3f3df: Merge "Database cleanup needs to happen for all users." into jb-mr1-dev
...
* commit '1cf5bd2aeb983e09e7e4b664b1380c30b94b4d50':
Database cleanup needs to happen for all users.
2012-10-11 17:11:19 -07:00
Adam Cohen
6879426372
am 2514cbc2: am e60cdf12: Merge "Final keyguard tablet layout integration" into jb-mr1-dev
...
* commit '2514cbc218923cb5e2270ebd9be19d2c9aad356e':
Final keyguard tablet layout integration
2012-10-11 17:11:13 -07:00
Svetoslav Ganov
0294214519
am a1489d30: am 9aefa145: Merge "Send accessibility event for content change upon setting content description." into jb-mr1-dev
...
* commit 'a1489d302289e92e7135452db3fee446e2452535':
Send accessibility event for content change upon setting content description.
2012-10-11 17:11:09 -07:00
Dianne Hackborn
fc31380adf
am ff363aa9: am 2a3e1ffd: Merge "More on issue #7318666 : hide developer options from user build" into jb-mr1-dev
...
* commit 'ff363aa967749803cd2e6cf598d4bfaae397a1bb':
More on issue #7318666 : hide developer options from user build
2012-10-11 17:10:54 -07:00
Satoshi Kataoka
95189b9225
am 6a1d4b99: am 8e767115: Merge "Don\'t update the text services locale in the main thread" into jb-mr1-dev
...
* commit '6a1d4b998cb543093b99dcabffaf849686eea656':
Don't update the text services locale in the main thread
2012-10-11 17:10:50 -07:00
Winson Chung
a58800d153
am 4cce397c: Merge "Letting partial update fall through if the widget has not received a full update yet. (Bug 7214731)" into jb-mr1-dev
...
* commit '4cce397c0dab44cf7b1b657d0e5410b5970eef55':
Letting partial update fall through if the widget has not received a full update yet. (Bug 7214731)
2012-10-11 14:58:47 -07:00
Winson Chung
4cce397c0d
Merge "Letting partial update fall through if the widget has not received a full update yet. (Bug 7214731)" into jb-mr1-dev
2012-10-11 14:56:56 -07:00
Adam Powell
4e5efaef79
am 49dbc161: Merge "Revert "Fixed group and child view caching in SimpleExpandableListAdapter."" into jb-mr1-dev
...
* commit '49dbc1617c5e0ea56d5568fdcbfe9a771671567a':
Revert "Fixed group and child view caching in SimpleExpandableListAdapter."
2012-10-11 14:37:02 -07:00
Adam Powell
49dbc1617c
Merge "Revert "Fixed group and child view caching in SimpleExpandableListAdapter."" into jb-mr1-dev
2012-10-11 14:32:50 -07:00
Winson Chung
6611988429
Letting partial update fall through if the widget has not received a full update yet. (Bug 7214731)
...
Change-Id: I4da99c259df51f8f66d3ade1156040bd0360ca5d
2012-10-11 14:27:03 -07:00
Adam Powell
77ace2ef69
Revert "Fixed group and child view caching in SimpleExpandableListAdapter."
...
This reverts commit b49e4d63d1976b673b4763bc012d152833609688.
This produced problems with app compatibility. The boolean array
introduced in this patch is never resized and can cause applications
expecting different behavior to crash with index out of bounds
exceptions.
This looks like a good path but it will need to be revisted later.
Bug 7221618
2012-10-11 14:26:21 -07:00
Fabrice Di Meglio
39b0c29e4f
am ec139240: Merge "Fix bug #7325234 LayoutParams are not resolved correctly (Settings apps looks broken on Manta in Arabic)" into jb-mr1-dev
...
* commit 'ec139240480702e80cd56c0309394f7549a993f3':
Fix bug #7325234 LayoutParams are not resolved correctly (Settings apps looks broken on Manta in Arabic)
2012-10-11 14:15:00 -07:00
Fabrice Di Meglio
ec13924048
Merge "Fix bug #7325234 LayoutParams are not resolved correctly (Settings apps looks broken on Manta in Arabic)" into jb-mr1-dev
2012-10-11 14:10:02 -07:00
Danielle Millett
85a4ac9281
am 8f89e6f8: Merge "Face Unlock is shown correctly during a phone call - fix b/7271718" into jb-mr1-dev
...
* commit '8f89e6f8e66ab445cca16e5426a126d3798f09d9':
Face Unlock is shown correctly during a phone call - fix b/7271718
2012-10-11 12:10:02 -07:00
Danielle Millett
8f89e6f8e6
Merge "Face Unlock is shown correctly during a phone call - fix b/7271718" into jb-mr1-dev
2012-10-11 12:07:38 -07:00
Jeff Sharkey
1cf5bd2aeb
am 26e3f3df: Merge "Database cleanup needs to happen for all users." into jb-mr1-dev
...
* commit '26e3f3df8761ee3c75155ca848d29cfe820a2a8c':
Database cleanup needs to happen for all users.
2012-10-11 11:15:33 -07:00
Jeff Sharkey
26e3f3df87
Merge "Database cleanup needs to happen for all users." into jb-mr1-dev
2012-10-11 11:13:30 -07:00
Adam Cohen
2514cbc218
am e60cdf12: Merge "Final keyguard tablet layout integration" into jb-mr1-dev
...
* commit 'e60cdf1291ba01400f7d864ee3501a6762e516bd':
Final keyguard tablet layout integration
2012-10-11 11:10:16 -07:00
Adam Cohen
e60cdf1291
Merge "Final keyguard tablet layout integration" into jb-mr1-dev
2012-10-11 11:08:19 -07:00
Jeff Sharkey
8f55d11298
Database cleanup needs to happen for all users.
...
Bug: 6970084
Change-Id: I9a6f1cbaf095b245ec9707a90c518256e0aa1f5f
2012-10-11 11:00:28 -07:00
Svetoslav Ganov
a1489d3022
am 9aefa145: Merge "Send accessibility event for content change upon setting content description." into jb-mr1-dev
...
* commit '9aefa1457967b52f1865173aa70896db84f111f1':
Send accessibility event for content change upon setting content description.
2012-10-11 11:00:26 -07:00
Svetoslav Ganov
9aefa14579
Merge "Send accessibility event for content change upon setting content description." into jb-mr1-dev
2012-10-11 10:57:41 -07:00
Dianne Hackborn
ff363aa967
am 2a3e1ffd: Merge "More on issue #7318666 : hide developer options from user build" into jb-mr1-dev
...
* commit '2a3e1ffd0f1c369a39f5321a54206d36beab31b9':
More on issue #7318666 : hide developer options from user build
2012-10-11 10:46:34 -07:00
Satoshi Kataoka
6a1d4b998c
am 8e767115: Merge "Don\'t update the text services locale in the main thread" into jb-mr1-dev
...
* commit '8e767115a888b78c5732fe935bd811a7db6bf2e1':
Don't update the text services locale in the main thread
2012-10-11 10:44:55 -07:00
Dianne Hackborn
2a3e1ffd0f
Merge "More on issue #7318666 : hide developer options from user build" into jb-mr1-dev
2012-10-11 10:44:37 -07:00
Satoshi Kataoka
1eac6b7b05
Don't update the text services locale in the main thread
...
This is a revised version of I9f8a81d3c9261a6cfc00292b9f5cb06053b9112d
Bug: 6761326
Change-Id: I43a0a65df6e4b6941bd0dca548c4af20b7e5bf58
2012-10-12 00:58:24 +09:00
Jeff Brown
f02070ca7d
am aabf7a59: am d2d7d5c8: am 60fa4617: Merge changes I50eb7dcf,I7ae92ce1,Icb22db1c into jb-mr1-dev
...
* commit 'aabf7a5940ab917a3d2835d32707dccc418a42a9':
Don't enable input dispatch until the screen is visible.
Dejank electron beam.
Don't process UEvents in Dalvik unless they match a pattern.
2012-10-11 00:17:56 -07:00
Daniel Sandler
999a4b23e3
am 3f8037b4: am cd70a4c2: am 6918d9f9: Merge "Remove Dream windows immediately." into jb-mr1-dev
...
* commit '3f8037b426f1e1eaae841e7d637935234df625ce':
Remove Dream windows immediately.
2012-10-11 00:17:48 -07:00
Jeff Brown
aabf7a5940
am d2d7d5c8: am 60fa4617: Merge changes I50eb7dcf,I7ae92ce1,Icb22db1c into jb-mr1-dev
...
* commit 'd2d7d5c8903c7fd6078b16492ee7b21347fce5f2':
Don't enable input dispatch until the screen is visible.
Dejank electron beam.
Don't process UEvents in Dalvik unless they match a pattern.
2012-10-11 00:15:57 -07:00
Daniel Sandler
3f8037b426
am cd70a4c2: am 6918d9f9: Merge "Remove Dream windows immediately." into jb-mr1-dev
...
* commit 'cd70a4c23cdb9cb318a4b90f3f6c986ba59e979d':
Remove Dream windows immediately.
2012-10-11 00:15:51 -07:00
Jeff Brown
d2d7d5c890
am 60fa4617: Merge changes I50eb7dcf,I7ae92ce1,Icb22db1c into jb-mr1-dev
...
* commit '60fa4617bc4be292a9e0ae10cf259153dec07aa9':
Don't enable input dispatch until the screen is visible.
Dejank electron beam.
Don't process UEvents in Dalvik unless they match a pattern.
2012-10-10 23:26:05 -07:00
Daniel Sandler
cd70a4c23c
am 6918d9f9: Merge "Remove Dream windows immediately." into jb-mr1-dev
...
* commit '6918d9f970989f1e5ca5a03b04d10a4c890721e9':
Remove Dream windows immediately.
2012-10-10 23:25:58 -07:00
Amith Yamasani
efce935e93
am 4e69679c: am c97332cb: am 31cee479: Merge "Fix a runtime restart when cycling between 4 users" into jb-mr1-dev
...
* commit '4e69679c5bf846355d4680c7fe365136880fac4f':
Fix a runtime restart when cycling between 4 users
2012-10-10 23:25:22 -07:00
Jeff Brown
60fa4617bc
Merge changes I50eb7dcf,I7ae92ce1,Icb22db1c into jb-mr1-dev
...
* changes:
Don't enable input dispatch until the screen is visible.
Dejank electron beam.
Don't process UEvents in Dalvik unless they match a pattern.
2012-10-10 23:06:15 -07:00
Daniel Sandler
6918d9f970
Merge "Remove Dream windows immediately." into jb-mr1-dev
2012-10-10 22:58:59 -07:00
Amith Yamasani
4e69679c5b
am c97332cb: am 31cee479: Merge "Fix a runtime restart when cycling between 4 users" into jb-mr1-dev
...
* commit 'c97332cb8751356d2fa5ecf8a92cea73d277cadc':
Fix a runtime restart when cycling between 4 users
2012-10-10 22:43:42 -07:00
Amith Yamasani
c97332cb87
am 31cee479: Merge "Fix a runtime restart when cycling between 4 users" into jb-mr1-dev
...
* commit '31cee479fc43fc422b481f6360fa499a7b4fc70a':
Fix a runtime restart when cycling between 4 users
2012-10-10 22:40:01 -07:00