Alan Smithee
9970118485
am 7689edd5: am 0a00cfdb: Merge "Tapping the clock now takes you to date/time settings." into jb-mr1-dev
...
* commit '7689edd5210198352bebf335711070a1d3d43b58':
Tapping the clock now takes you to date/time settings.
2012-10-01 10:17:14 -07:00
Satoshi Kataoka
6ce84e681e
am c97fa8f8: am 135e5fb7: Always accept API calls from processes which have INTERACT_ACROSS_USERS_FULL in InputMethodManagerService
...
* commit 'c97fa8f8a02f1850779cc1e6ff6b67bcdbeecb1b':
Always accept API calls from processes which have INTERACT_ACROSS_USERS_FULL in InputMethodManagerService
2012-10-01 10:17:05 -07:00
Irfan Sheriff
29fce0caec
am e6f9f2a8: am bdac829f: Merge "Make rssi state change sticky" into jb-mr1-dev
...
* commit 'e6f9f2a8a39791922d0e7125ef2a59772a57ce0e':
Make rssi state change sticky
2012-10-01 10:16:44 -07:00
Jeff Sharkey
1586c228f7
am f138e3ce: am 71520a68: Merge "Handle ISE when physical volume isn\'t mounted." into jb-mr1-dev
...
* commit 'f138e3cec9aa6b86a0e614a39ed29f0709ebfabd':
Handle ISE when physical volume isn't mounted.
2012-10-01 10:16:35 -07:00
Chet Haase
1dd002214e
am bcdaf8cb: am 62ea4363: Merge "Fix texture corruption" into jb-mr1-dev
...
* commit 'bcdaf8cb6d75d721507739504732e0e3dc7f437c':
Fix texture corruption
2012-10-01 10:16:25 -07:00
Dianne Hackborn
3645f2ccde
am 55241249: am 2a30547a: Merge "Work on issue #6949468 : android.dpi.cts.ConfigurationScreenLayoutTest..." into jb-mr1-dev
...
* commit '552412496c00c04c9af353785936a89743677d49':
Work on issue #6949468 : android.dpi.cts.ConfigurationScreenLayoutTest...
2012-10-01 10:16:22 -07:00
rich cannings
fdd8a81015
am 60000916: am 2b58c1b5: Merge "Disable package verification in test harness" into jb-mr1-dev
...
* commit '6000091663200e8846f418db99f2b4618cc6a294':
Disable package verification in test harness
2012-10-01 10:16:14 -07:00
Adam Cohen
df1d4c44f7
am bc0b4313: am 2032a120: Merge "Making runway lights appear for correct pages (issue 7232481)" into jb-mr1-dev
...
* commit 'bc0b4313a98b8584a939a5087689117d9ffd1966':
Making runway lights appear for correct pages (issue 7232481 )
2012-10-01 10:16:10 -07:00
Adam Powell
5f260236ed
am 135ce20c: am fb42be77: Merge "Fix UNSPECIFIED measurement in RelativeLayout" into jb-mr1-dev
...
* commit '135ce20c12ef869028aa7d0182960f92840b7cfc':
Fix UNSPECIFIED measurement in RelativeLayout
2012-10-01 10:16:03 -07:00
Adam Cohen
efeb7c86b7
am 21ec73d7: am 933a7546: Fix build
...
* commit '21ec73d7faafe007706aebb6a10655caa393bf72':
Fix build
2012-10-01 10:15:38 -07:00
Dianne Hackborn
eede0f6fe0
am b4bca666: am 2effc77c: Merge "Update APIs to JB MR1 level 17." into jb-mr1-dev
...
* commit 'b4bca6661784ab8087e382765c2e0d53e98d651f':
Update APIs to JB MR1 level 17.
2012-10-01 10:15:27 -07:00
Adam Cohen
c00a311b30
am 6d9c3992: am 0a5bc222: Merge "Integrate keyguard paging hint" into jb-mr1-dev
...
* commit '6d9c3992defced0c0f2779576a10957f7d42c7ff':
Integrate keyguard paging hint
2012-10-01 10:15:22 -07:00
Adam Cohen
2e16cf67c1
am e1430669: am b97a71e8: Merge "Getting rid of keyguard widget flag that isn\'t used" into jb-mr1-dev
...
* commit 'e14306690096fc3a1ae78f411ba9a7b616224df7':
Getting rid of keyguard widget flag that isn't used
2012-10-01 10:15:17 -07:00
Craig Mautner
7b9a263b50
am 61d32c0d: am a6efc965: Merge "Changing debug for b/7094175." into jb-mr1-dev
...
* commit '61d32c0d0f05a394129e03d774589b8d93f5f8fb':
Changing debug for b/7094175.
2012-10-01 10:15:05 -07:00
Fabrice Di Meglio
6065c73e9f
am 1a2fd69a: am ce75fef7: Merge "Fix the build" into jb-mr1-dev
...
* commit '1a2fd69a1b53b990518c73b85e434fd5d08a92f4':
Fix the build
2012-10-01 10:14:53 -07:00
Fabrice Di Meglio
e05c172638
am 3332a701: am 10c84edc: Merge "Fix bug #7199562 UI mirroring for RTL locales (Arabic, Hebrew, Farsi): Play settings" into jb-mr1-dev
...
* commit '3332a701e1cd6453089d7b0c6501c7f37cb69327':
Fix bug #7199562 UI mirroring for RTL locales (Arabic, Hebrew, Farsi): Play settings
2012-10-01 10:14:47 -07:00
Romain Guy
d49faf39ec
am 25c8c198: am 8ed6b6a9: Merge "Perform a long computation to catch bitmap sizes > 32 bits Bug #7257930 " into jb-mr1-dev
...
* commit '25c8c198e6abc053fbba19145ed485e31dc5927e':
Perform a long computation to catch bitmap sizes > 32 bits Bug #7257930
2012-10-01 10:14:40 -07:00
Romain Guy
b9a0a23111
am dd2dd7bb: am 955b66d0: Merge "reset() should reset. Otherwise it would be called something else. Bug #7256095 " into jb-mr1-dev
...
* commit 'dd2dd7bbb0cac897db9406f7271689e36397b80e':
reset() should reset. Otherwise it would be called something else. Bug #7256095
2012-10-01 10:14:37 -07:00
Fabrice Di Meglio
840ea01fcb
am 93cea34a: am f2e5cf48: Merge "Fix bug #6427629 Clean up layout direction APIs" into jb-mr1-dev
...
* commit '93cea34a7f7834f42f921402415f7797b677e442':
Fix bug #6427629 Clean up layout direction APIs
2012-10-01 10:14:31 -07:00
Baligh Uddin
e4fc679d57
am c4e7719c: am ce803d8e: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
...
* commit 'c4e7719c3253074bb06777c41649ec8ff7c50302':
Import translations. DO NOT MERGE
2012-10-01 10:14:23 -07:00
Svetoslav Ganov
798af86dcc
am 82e21b33: am 9ea8f390: Explore by touch enabled when screen magnification is on.
...
* commit '82e21b33bde057ba21dde9ee2023d785b4b5a757':
Explore by touch enabled when screen magnification is on.
2012-10-01 10:14:19 -07:00
Mike Cleron
25bc59dd08
am eb43858e: am a995b6e3: Merge "Getting rid of blue outline in user switcher, instead brighten the user" into jb-mr1-dev
...
* commit 'eb43858ea041dcb61b2de94f8fa9d069be5fc93c':
Getting rid of blue outline in user switcher, instead brighten the user
2012-10-01 10:13:58 -07:00
Jeff Brown
843b014aca
am 489c1e9f: am 7f813202: Merge "Get rid of preventScreenOn()." into jb-mr1-dev
...
* commit '489c1e9f82250770004ec9080778546b040f6146':
Get rid of preventScreenOn().
2012-10-01 10:13:52 -07:00
Jatin Lodhia
6c7169722f
am bf07c7a9: am 7c3586c5: Merge "Make the theme for choose account and choose account type dialogs same." into jb-mr1-dev
...
* commit 'bf07c7a93f7d8ae2d67eecf98ad76e60212e161b':
Make the theme for choose account and choose account type dialogs same.
2012-10-01 10:13:47 -07:00
Jim Miller
7b439a0e11
am 7b4386c6: am 1ed143ea: Merge "Clean up SIM PIN and PUK screens in keyguard." into jb-mr1-dev
...
* commit '7b4386c6177c874208f7f221787fca9079d2b7c4':
Clean up SIM PIN and PUK screens in keyguard.
2012-10-01 10:13:43 -07:00
Irfan Sheriff
97a59e3be1
am bccfd5f2: am d3081bc9: Merge "Revert setting GO idle time out" into jb-mr1-dev
...
* commit 'bccfd5f2dc0674ee8ae3c2fbf1482843393f72d6':
Revert setting GO idle time out
2012-10-01 10:13:34 -07:00
Dianne Hackborn
d698542867
am 66e92752: am 84215565: Merge "Fix issue #7255954 : API Review: rename Dream to DreamService" into jb-mr1-dev
...
* commit '66e92752260e4ef21e77a44379f3a6b8969b4d65':
Fix issue #7255954 : API Review: rename Dream to DreamService
2012-10-01 10:13:25 -07:00
Svetoslav Ganov
8173646ea4
am 45cde607: am c5211780: Merge "Sending interaction end event at the end of a drag." into jb-mr1-dev
...
* commit '45cde607d5c6dfe39675a12d3bc47a0bc74565a2':
Sending interaction end event at the end of a drag.
2012-10-01 10:13:12 -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
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
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
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