drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
48,456 Commits 1 Branch 0 Tags
Commit Graph

48456 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Mathias Agopian
0887b8c2e5 am 8e18668d: revert surfaceflinger leak fix as it uncovered a crasher on xoom (DO NOT MERGE) 
* commit '8e18668d14adf601cbe5973030c310ec23d88461':
  revert surfaceflinger leak fix as it uncovered a crasher on xoom (DO NOT MERGE)
 2011-06-15 22:40:07 -07:00
Mathias Agopian
d5244e0a88 am 52a43990: Revert "revert surfaceflinger leak fix as it uncovered a crasher on xoom" 
* commit '52a43990880b27808bcf562afcc4209d34728e6e':
  Revert "revert surfaceflinger leak fix as it uncovered a crasher on xoom"
 2011-06-15 22:09:39 -07:00
Mathias Agopian
8e18668d14 revert surfaceflinger leak fix as it uncovered a crasher on xoom (DO NOT MERGE) 
This reverts commit 52a43990880b27808bcf562afcc4209d34728e6e.

Change-Id: I1856a48f863b051395b8091ddfd1e01292fa1b1e
 2011-06-15 20:45:32 -07:00
Mathias Agopian
52a4399088 Revert "revert surfaceflinger leak fix as it uncovered a crasher on xoom" 
This reverts commit af6edba59e250adbdfa5b3c3be134f70d8c38a16.

Change-Id: I7793d3ca8a4d20a2b188364f47854328ab5f586d
 2011-06-15 20:42:25 -07:00
Mathias Agopian
7ecdeb6e54 am d20d72d1: Merge "revert surfaceflinger leak fix as it uncovered a crasher on xoom" into honeycomb-mr2 
* commit 'd20d72d193ab0d7f33c839d8bf9573b55abfebdc':
  revert surfaceflinger leak fix as it uncovered a crasher on xoom
 2011-06-15 20:18:24 -07:00
Mathias Agopian
d20d72d193 Merge "revert surfaceflinger leak fix as it uncovered a crasher on xoom" into honeycomb-mr2 2011-06-15 20:16:15 -07:00
Mathias Agopian
af6edba59e revert surfaceflinger leak fix as it uncovered a crasher on xoom 
Bug: 4600244
Change-Id: Ia68ebf0f243a051ff6a21b3863e3e5d259bbf7ac
 2011-06-15 19:31:04 -07:00
Dianne Hackborn
413b53b57d am 70921d61: Merge "We must keep up with the Joneses." into honeycomb-mr2 
* commit '70921d615496c5be8a19cbd1454378bb7d0201f3':
  We must keep up with the Joneses.
 2011-06-15 17:10:33 -07:00
Dianne Hackborn
70921d6154 Merge "We must keep up with the Joneses." into honeycomb-mr2 2011-06-15 17:08:04 -07:00
Eric Fischer
c0e84cf321 am 5e451faa: Merge "Import revised translations. DO NOT MERGE" into honeycomb-mr2 
* commit '5e451faa0c22e943fb76d812f699d51fa11c5495':
  Import revised translations.  DO NOT MERGE
 2011-06-15 16:41:44 -07:00
Eric Fischer
5e451faa0c Merge "Import revised translations. DO NOT MERGE" into honeycomb-mr2 2011-06-15 16:38:43 -07:00
Dianne Hackborn
0d4b9c993d We must keep up with the Joneses. 
Change-Id: Ifa2ab0167c09ba18b24c8b6c618db807e17519f5
 2011-06-15 15:09:54 -07:00
Eric Fischer
dbad552d17 Import revised translations. DO NOT MERGE 
Change-Id: Iaff03724a335f856f7d28b1bc2c219f4208c4151
 2011-06-15 15:06:18 -07:00
Justin Ho
c407ef2222 am f4096041: Merge "Updated art for compat mode dialog." into honeycomb-mr2 
* commit 'f409604122f959653fb789e9133e94a51e369693':
  Updated art for compat mode dialog.
 2011-06-15 14:56:03 -07:00
Justin Ho
f409604122 Merge "Updated art for compat mode dialog." into honeycomb-mr2 2011-06-15 14:52:52 -07:00
Wink Saville
1146bddf92 Merge "Always clear settings when entering Inactive state." into honeycomb-LTE 2011-06-15 14:31:16 -07:00
Irfan Sheriff
5af3405f0d am ecda5461: Merge "Fix lease duration handling" into honeycomb-mr2 
* commit 'ecda5461603b6de77beb045dfdf82dad7ae48d61':
  Fix lease duration handling
 2011-06-15 14:04:23 -07:00
Irfan Sheriff
ecda546160 Merge "Fix lease duration handling" into honeycomb-mr2 2011-06-15 14:00:23 -07:00
Wink Saville
4d6233b2ed Merge "Clean up some debug statements." into honeycomb-LTE 2011-06-15 13:55:06 -07:00
Wink Saville
eddc3a579c Clean up some debug statements. 
Change-Id: Id60020f09dd858f2d2c83bdd8f8d4384e5bfc934
 2011-06-15 13:45:29 -07:00
Daniel Sandler
e25f8336a0 Updated art for compat mode dialog. 
Also finalizes on the following language & ordering in the menu:

  ( ) Stretch to fill screen
  ( ) Zoom to fill screen

Bug: 4595256
Change-Id: Ie92b1e0d829341fd73043a562e78437af2b128ec
 2011-06-15 16:14:55 -04:00
Irfan Sheriff
56878760c3 Fix lease duration handling 
Convert lease time in seconds to long before alarm
set up and add sanity check

Change-Id: I99524c97d9a643ffa8234d016d0e819a284977a1
 2011-06-15 12:58:18 -07:00
Dianne Hackborn
3dc1b5e26f am ed31bbf6: Clean up some edge cases in the compat mode UI: 
* commit 'ed31bbf65267c1f383dd0dff37acd034f3b9b59f':
  Clean up some edge cases in the compat mode UI:
 2011-06-15 12:35:57 -07:00
Dianne Hackborn
ed31bbf652 Clean up some edge cases in the compat mode UI: 
- Don't put up multiple dialogs if a switch happens between activities
  that both can use compat mode.
- Remove the help dialog if the user switches away from an app that
  can use compat mode.
- Don't set the "don't show" preference until the user explicitly hits
  the button.
- Hide the compat mode switch UI if the compat mode button is hidden.

Change-Id: I8dd2aab1385a264232a9256284d4a75b8e058e47
 2011-06-15 11:24:07 -07:00
Wink Saville
0e765f8b73 Always clear settings when entering Inactive state. 
Change-Id: I500b60a8122b790d60dbff5960b8c32500704b40
 2011-06-15 06:41:21 -07:00
Daniel Sandler
fbb0934793 am 5994bff9: Merge "One-time-only compatibility mode explanation dialog." into honeycomb-mr2 
* commit '5994bff92472b3bdcd5754d8a9156b49269a9c1d':
  One-time-only compatibility mode explanation dialog.
 2011-06-15 06:15:11 -07:00
Daniel Sandler
2fdf588061 am 97d5081a: Merge "Final UI for compatibility mode." into honeycomb-mr2 
* commit '97d5081ac331884fe0f6f2e5814d4862a974fbe3':
  Final UI for compatibility mode.
 2011-06-15 06:15:07 -07:00
Daniel Sandler
5994bff924 Merge "One-time-only compatibility mode explanation dialog." into honeycomb-mr2 2011-06-15 06:10:32 -07:00
Daniel Sandler
97d5081ac3 Merge "Final UI for compatibility mode." into honeycomb-mr2 2011-06-15 06:10:27 -07:00
Daniel Sandler
552b1f0d22 One-time-only compatibility mode explanation dialog. 
Don't miss it!

Bug: 4595256
Change-Id: I80c0949e6118e3ea3af089d4cad160ce63e7d8ce
 2011-06-15 01:03:02 -04:00
Dianne Hackborn
abe5bd23c3 am a9551706: Testing done, compatibility mode no longer on by default. 
* commit 'a9551706a279a798c91d8ef593b2acb16a30c682':
  Testing done, compatibility mode no longer on by default.
 2011-06-14 21:47:51 -07:00
Daniel Sandler
3b0543acf1 Final UI for compatibility mode. 
Bug: 4595256
Change-Id: Idaa96393fb809c828b5f661f29e8b687fdf3d104
 2011-06-15 00:12:01 -04:00
Dianne Hackborn
a9551706a2 Testing done, compatibility mode no longer on by default. 
Change-Id: I5bcc98d2b3a1a02ca788ab61440f0aa5d4f7fb4e
 2011-06-14 21:05:03 -07:00
Dianne Hackborn
baa89d3839 am f930232f: Fix a major problem in fragment lifecycle. 
* commit 'f930232fd1c8d301d91853c8fe5dca43979ac807':
  Fix a major problem in fragment lifecycle.
 2011-06-14 20:54:40 -07:00
Dianne Hackborn
f930232fd1 Fix a major problem in fragment lifecycle. 
When animating away a fragment, we were not putting it through
the last part of its lifecycle (onDestroy() etc).

Also, retained fragments that have a target were broken.  Oops.

Change-Id: I5a669b77a2f24b581cde2a0959acf62edb65e326
 2011-06-14 20:47:44 -07:00
Dianne Hackborn
027e9e28b2 am 4e04380d: Merge "Fix issue #4592768: Xoom display does not resize when..." into honeycomb-mr2 
* commit '4e04380d0a42347013808ee2058c786582ad548f':
  Fix issue #4592768: Xoom display does not resize when...
 2011-06-14 19:19:25 -07:00
Dianne Hackborn
4e04380d0a Merge "Fix issue #4592768: Xoom display does not resize when..." into honeycomb-mr2 2011-06-14 19:16:46 -07:00
Robert Ly
b481a6007f am c7731e07: Merge "cherrypick from hc mr1 Change-Id: I2d17c5ea710964b0fe57e6adea4383f30d74bf7d" into honeycomb-mr2 
* commit 'c7731e070e09007fdd002fd44dfe35bdeffbaac5':
  cherrypick from hc mr1 Change-Id: I2d17c5ea710964b0fe57e6adea4383f30d74bf7d
 2011-06-14 17:47:51 -07:00
Robert Ly
4963cd0bd1 am 1a3e7cf2: Merge "cherry pick from hc mr1 Change-Id: I6f48d245e2837226096fe42d08fb0243e416dbbc" into honeycomb-mr2 
* commit '1a3e7cf259ef8eecdea236b3cba1608e1bd871e3':
  cherry pick from hc mr1 Change-Id: I6f48d245e2837226096fe42d08fb0243e416dbbc
 2011-06-14 17:46:07 -07:00
Robert Ly
c7731e070e Merge "cherrypick from hc mr1 Change-Id: I2d17c5ea710964b0fe57e6adea4383f30d74bf7d" into honeycomb-mr2 2011-06-14 17:45:04 -07:00
Robert Ly
1a3e7cf259 Merge "cherry pick from hc mr1 Change-Id: I6f48d245e2837226096fe42d08fb0243e416dbbc" into honeycomb-mr2 2011-06-14 17:43:38 -07:00
Dianne Hackborn
dad0e40221 Fix issue #4592768: Xoom display does not resize when... 
...plugging in HDMI cable connected to a HDMI monitor

Change-Id: If3394e972131aa5124db2d1abf23b2214512773a
 2011-06-14 16:45:21 -07:00
Robert Ly
1dbb707592 am 8467cd7f: Merge "cherrypick from hc mr1 Change-Id: I0685106aba681a429ce92c0ec1a4fab592d186ac" into honeycomb-mr2 
* commit '8467cd7f90a23c345b41cfcdcc62f1f8e3716c37':
  cherrypick from hc mr1 Change-Id: I0685106aba681a429ce92c0ec1a4fab592d186ac
 2011-06-14 16:38:08 -07:00
Robert Ly
17cddaf2a6 am 409b9a4c: Merge "Revert "cherrypick from hc mr1 Change-Id: I23143ecaa0eeab68d55d007b8594a51bf90fbab7"" into honeycomb-mr2 
* commit '409b9a4cad1d2dad43e647fc63a4ab1f3435d437':
  Revert "cherrypick from hc mr1 Change-Id: I23143ecaa0eeab68d55d007b8594a51bf90fbab7"
 2011-06-14 16:38:05 -07:00
Robert Ly
b5c31b8a11 am 194f4745: Merge "Revert "cherrypick from hc mr1 Change-Id: I507c9b98289b873cb5c40e0e34be433e4eb0d4cb"" into honeycomb-mr2 
* commit '194f47451ce3a0d346e362dfd8753057f41c765d':
  Revert "cherrypick from hc mr1 Change-Id: I507c9b98289b873cb5c40e0e34be433e4eb0d4cb"
 2011-06-14 16:38:02 -07:00
Robert Ly
8467cd7f90 Merge "cherrypick from hc mr1 Change-Id: I0685106aba681a429ce92c0ec1a4fab592d186ac" into honeycomb-mr2 2011-06-14 16:36:17 -07:00
Robert Ly
409b9a4cad Merge "Revert "cherrypick from hc mr1 Change-Id: I23143ecaa0eeab68d55d007b8594a51bf90fbab7"" into honeycomb-mr2 2011-06-14 16:35:22 -07:00
Robert Ly
194f47451c Merge "Revert "cherrypick from hc mr1 Change-Id: I507c9b98289b873cb5c40e0e34be433e4eb0d4cb"" into honeycomb-mr2 2011-06-14 16:35:12 -07:00
Amith Yamasani
eb5e633a24 am 608a200d: Merge "Stability fixes for PreferenceFragments." into honeycomb-mr2 
* commit '608a200d2ed19540bb356d54e96f72c8c6b089b1':
  Stability fixes for PreferenceFragments.
 2011-06-14 15:38:31 -07:00
Amith Yamasani
608a200d2e Merge "Stability fixes for PreferenceFragments." into honeycomb-mr2 2011-06-14 15:35:13 -07:00