Jeff Brown
5d359a9265
am 5e3dcf72: Merge "Remove clearUserActivityTimeout()." into jb-mr1-dev
...
* commit '5e3dcf7210bed65d8f9aec40d9da078daf76dead':
Remove clearUserActivityTimeout().
2012-10-01 11:39:30 -07:00
Jeff Brown
5e3dcf7210
Merge "Remove clearUserActivityTimeout()." into jb-mr1-dev
2012-10-01 11:35:55 -07:00
Adam Powell
21a80ff4d1
am c56e5600: Merge "Construct a task stack for picking a wifi network from notification" into jb-mr1-dev
...
* commit 'c56e5600501a5c376dc13e6a99fcec7782fc8718':
Construct a task stack for picking a wifi network from notification
2012-10-01 10:34:59 -07:00
Adam Powell
c56e560050
Merge "Construct a task stack for picking a wifi network from notification" into jb-mr1-dev
2012-10-01 10:32:35 -07:00
Daniel Sandler
0cfda91b91
am bfbf6e12: Merge "Fix IME tile related crash" into jb-mr1-dev
...
* commit 'bfbf6e1232013a999f4776f7fdf7cf6fb577f89b':
Fix IME tile related crash
2012-10-01 10:13:17 -07:00
John Spurlock
db3b01a5bf
am ff70848e: Merge "Status bar: Keep disabled state per user." into jb-mr1-dev
...
* commit 'ff70848eb2a6b916ad2ad2ceec0c59bcb41373a2':
Status bar: Keep disabled state per user.
2012-10-01 10:13:14 -07:00
Baligh Uddin
40aca08323
am b5174cc2: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
...
* commit 'b5174cc2cf4345d51be86ec803f05163c2c9b2d8':
Import translations. DO NOT MERGE
2012-10-01 10:13:03 -07:00
Daniel Sandler
0f78437ef8
am 17d5f47e: Merge "Remove IME tile from Quick Settings." into jb-mr1-dev
...
* commit '17d5f47e5a1deb9a4fa09aee444a28ec3d1b1687':
Remove IME tile from Quick Settings.
2012-10-01 10:12:44 -07:00
Daniel Sandler
bfbf6e1232
Merge "Fix IME tile related crash" into jb-mr1-dev
2012-10-01 10:00:40 -07:00
Daniel Sandler
aca0c757e6
Fix IME tile related crash
...
Bug: 7246375
Change-Id: I374ed201ea4870fb7397d075baed09524061030d
2012-10-01 12:59:36 -04:00
John Spurlock
ff70848eb2
Merge "Status bar: Keep disabled state per user." into jb-mr1-dev
2012-10-01 09:55:57 -07:00
Baligh Uddin
b5174cc2cf
Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
2012-10-01 09:41:36 -07:00
Baligh Uddin
7d9c7a2436
Merge "Import translations. DO NOT MERGE" into jb-mr1-aah-dev
2012-10-01 09:32:38 -07:00
John Spurlock
13451a25ff
Status bar: Keep disabled state per user.
...
Bug:7165607
Change-Id: If6f7a41c2516996612aef5e013dd0d2bd23f9084
2012-10-01 11:44:37 -04:00
Daniel Sandler
17d5f47e5a
Merge "Remove IME tile from Quick Settings." into jb-mr1-dev
2012-10-01 08:43:32 -07:00
Daniel Sandler
dd68da887a
Remove IME tile from Quick Settings.
...
It will remain a transient notification.
Bug: 7246375
Change-Id: I34e262816c6f000d1ae64c41982ff9cc48e378e6
2012-10-01 10:21:25 -04:00
Daniel Sandler
10b49cce87
am 79eda11f: Merge "Assets were drawn in the wrong timezone." into jb-mr1-dev
...
* commit '79eda11f357e23f731fa85fc5d2b11ded5e91586':
Assets were drawn in the wrong timezone.
2012-10-01 06:40:13 -07:00
Daniel Sandler
79eda11f35
Merge "Assets were drawn in the wrong timezone." into jb-mr1-dev
2012-10-01 06:37:08 -07:00
Alan Smithee
7689edd521
am 0a00cfdb: Merge "Tapping the clock now takes you to date/time settings." into jb-mr1-dev
...
* commit '0a00cfdbd938f34c642ae3a501f7e194c464d94c':
Tapping the clock now takes you to date/time settings.
2012-10-01 06:35:25 -07:00
Alan Smithee
0a00cfdbd9
Merge "Tapping the clock now takes you to date/time settings." into jb-mr1-dev
2012-10-01 06:32:48 -07:00
Daniel Sandler
a60d4bb4f7
Assets were drawn in the wrong timezone.
...
Bug: 7258384
Change-Id: I62eaeaceb304789ced8027d2b17543a68d5eeca1
2012-10-01 09:23:08 -04:00
Alan Smithee
154bc0631a
Tapping the clock now takes you to date/time settings.
...
Bug: 7175168
Change-Id: Ib430f0c5765cc6e474ed9a2a2a09e6a127cacf3c
2012-10-01 09:15:08 -04:00
Satoshi Kataoka
c97fa8f8a0
am 135e5fb7: Always accept API calls from processes which have INTERACT_ACROSS_USERS_FULL in InputMethodManagerService
...
* commit '135e5fb71242b1151929e2ea7bf221ff421e6ad2':
Always accept API calls from processes which have INTERACT_ACROSS_USERS_FULL in InputMethodManagerService
2012-10-01 00:29:44 -07:00
Satoshi Kataoka
135e5fb712
Always accept API calls from processes which have INTERACT_ACROSS_USERS_FULL in InputMethodManagerService
...
Bug: 6931482
Change-Id: I1620413578b9e8da6564664219f65bdc00d5ecfd
2012-10-01 16:18:05 +09:00
Adam Powell
d56b4d1db3
Construct a task stack for picking a wifi network from notification
...
Bug 7001327
Change-Id: I5a79e6933cd33386cd0aa4df626f15902deedd67
2012-09-30 18:30:42 -07:00
Irfan Sheriff
e6f9f2a8a3
am bdac829f: Merge "Make rssi state change sticky" into jb-mr1-dev
...
* commit 'bdac829f501421439b6558555577b3d6932b54ad':
Make rssi state change sticky
2012-09-30 17:51:14 -07:00
Irfan Sheriff
bdac829f50
Merge "Make rssi state change sticky" into jb-mr1-dev
2012-09-30 17:49:39 -07:00
Jeff Sharkey
f138e3cec9
am 71520a68: Merge "Handle ISE when physical volume isn\'t mounted." into jb-mr1-dev
...
* commit '71520a68f3906ce2a7e425edd7fe08bac535a967':
Handle ISE when physical volume isn't mounted.
2012-09-30 17:18:49 -07:00
Jeff Sharkey
71520a68f3
Merge "Handle ISE when physical volume isn't mounted." into jb-mr1-dev
2012-09-30 17:16:50 -07:00
Irfan Sheriff
17d9f6753a
Make rssi state change sticky
...
NetworkController misses the rssi state at boot. It gets the wifi
connection status because it is sticky. The rssi state will remain
out of sync until the wifi state machine sends another update which may
not happen if rssi does not change significantly.
Make rssi sticky as well to make sure NetworkController has the last known
signal strength on wifi.
Bug: 6916156
Change-Id: Id7dd621c6dbc35d7354757c61aa18a3b1ba90593
2012-09-30 16:25:50 -07:00
Jeff Brown
edce6a7978
Remove clearUserActivityTimeout().
...
This function is not implemented and not needed.
Bug: 7165399
Change-Id: Ib1c50fabad6292ccf670404ba70aeb1242c4614d
2012-09-30 16:23:05 -07:00
Chet Haase
bcdaf8cb6d
am 62ea4363: Merge "Fix texture corruption" into jb-mr1-dev
...
* commit '62ea4363362526d32b48f920601d3b4e27a117bb':
Fix texture corruption
2012-09-30 15:56:39 -07:00
Dianne Hackborn
552412496c
am 2a30547a: Merge "Work on issue #6949468 : android.dpi.cts.ConfigurationScreenLayoutTest..." into jb-mr1-dev
...
* commit '2a30547af44536f6b0e2f7020ac1a435c72afc84':
Work on issue #6949468 : android.dpi.cts.ConfigurationScreenLayoutTest...
2012-09-30 15:55:02 -07:00
Chet Haase
62ea436336
Merge "Fix texture corruption" into jb-mr1-dev
2012-09-30 15:54:10 -07:00
Dianne Hackborn
2a30547af4
Merge "Work on issue #6949468 : android.dpi.cts.ConfigurationScreenLayoutTest..." into jb-mr1-dev
2012-09-30 15:52:47 -07:00
Chet Haase
6a2d17f713
Fix texture corruption
...
When memory gets low on a device, activities flush everything they can.
Hardware-accelerated activites, such as Launcher, flush GL resources and destroy
the GL context. However, some resources were still hanging around, due to deferred
destruction policies (we don't delete layers until the DisplayLists they are in
are finalized, to ensure we don't deref deleted objects). This meant that we were
referring to obsolete GL data in these objects. in particular, it meant that we might
come around later, after a new GL context was created, and delete a texture object
that was incorrect. We use the layer's "texture id" to refer to the texture underlying the
layer. But if there's a new GL context, then this texture ID is no longer valid, and
we may be deleting the texture that a different object (layer, icon, whatever) is referring
to, because the driver may return that same ID under the new GL context.
The fix is to more aggressively delete things that we know will not be used again
when the GL context is destroyed. In particular, we delete all resources being used
by all DisplayLists at GL context destruction time.
Issue #7195815 Textures corruption on all devices, in many apps
Change-Id: I52d2d208173690dbb794a83402d38f14ea4c6c22
2012-09-30 15:35:08 -07:00
rich cannings
6000091663
am 2b58c1b5: Merge "Disable package verification in test harness" into jb-mr1-dev
...
* commit '2b58c1b503334ea20be9de3c2b5654855f9d4669':
Disable package verification in test harness
2012-09-30 15:25:35 -07:00
rich cannings
2b58c1b503
Merge "Disable package verification in test harness" into jb-mr1-dev
2012-09-30 15:23:41 -07:00
Dianne Hackborn
fe37f8f51d
Work on issue #6949468 : android.dpi.cts.ConfigurationScreenLayoutTest...
...
...#testScreenLayout failures on JO
This doesn't actually fix it; I have concluded that the test is broken
(the platform is correctly reporting that this is a NOT LONG device
because in portrait once you account for the status bar and system
bar our size is 880dp high and 600dp wide, which is not enough for us
to be in the LONG config).
However while working on this I noticed that the code for computing
the configuration of the external display was wrong. I have fixed
that by putting this code for computing these parts of the configuration
in a common place that both the window manager and external display
code can use.
Change-Id: Ic6a84b955e9ec345a87f725203a29e4712dac0ad
2012-09-30 15:06:05 -07:00
Adam Cohen
bc0b4313a9
am 2032a120: Merge "Making runway lights appear for correct pages (issue 7232481)" into jb-mr1-dev
...
* commit '2032a12036cf684f8ac6c24406685a7f97d52649':
Making runway lights appear for correct pages (issue 7232481)
2012-09-30 14:54:44 -07:00
rich cannings
a2064df6ab
Disable package verification in test harness
...
Bug: 7233608
Change-Id: I521980728f5fb68b42a3906ff4fd25cd59dbbd7a
2012-09-30 14:52:41 -07:00
Adam Cohen
2032a12036
Merge "Making runway lights appear for correct pages (issue 7232481)" into jb-mr1-dev
2012-09-30 14:52:03 -07:00
Adam Cohen
1d1fb6c5e6
Making runway lights appear for correct pages (issue 7232481)
...
Change-Id: I66a48cc8f14cb9ebfbf032287591565f38cb3606
2012-09-30 14:36:01 -07:00
Adam Powell
135ce20c12
am fb42be77: Merge "Fix UNSPECIFIED measurement in RelativeLayout" into jb-mr1-dev
...
* commit 'fb42be77ea88470c71f2ad1e03bff7fdc3721465':
Fix UNSPECIFIED measurement in RelativeLayout
2012-09-30 14:27:03 -07:00
Adam Powell
fb42be77ea
Merge "Fix UNSPECIFIED measurement in RelativeLayout" into jb-mr1-dev
2012-09-30 14:24:53 -07:00
Jeff Sharkey
32ee831eab
Handle ISE when physical volume isn't mounted.
...
Bug: 7238149
Change-Id: I85081225a1a43a2c1b6f70b6275c6bbca0b3764e
2012-09-30 13:35:33 -07:00
Adam Cohen
21ec73d7fa
am 933a7546: Fix build
...
* commit '933a7546c857dba7704a15b7f7f7847934f14912':
Fix build
2012-09-30 13:03:24 -07:00
Adam Cohen
933a7546c8
Fix build
...
Change-Id: I7642494039edec85f8c690a7854b86f318589ff0
2012-09-30 12:58:45 -07:00
Adam Powell
132a742b94
Fix UNSPECIFIED measurement in RelativeLayout
...
Explicitly handle UNSPECIFIED MeasureSpec mode.
Bug 7258418
Change-Id: Idc7b4f0a4a92505379eb5479a84665f7908fcb83
2012-09-30 12:42:46 -07:00
Dianne Hackborn
b4bca66617
am 2effc77c: Merge "Update APIs to JB MR1 level 17." into jb-mr1-dev
...
* commit '2effc77c9a49f983779dbab656bba490bb7d4ba0':
Update APIs to JB MR1 level 17.
2012-09-30 12:24:08 -07:00