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

1908 Commits

Author SHA1 Message Date
Mike Lockwood
7730ad569d Fix window leak in UsbPreferenceActivity 
Change-Id: I4160e73a4e840662c6ac724e27460853fb259eae
Signed-off-by: Mike Lockwood <lockwood@android.com>
 2011-06-22 12:02:10 -04:00
Daniel Sandler
edbdd3a024 Fix statusbar crash when DeskClock alarms go off. 
Bug: 4723790
Change-Id: Ia819b6a35b5b103d28f6db3b25c815f77827f80f
 2011-06-21 12:57:08 -04:00
Mike Lockwood
422bf6702f USB: Make MTP/PTP toggle in the USB preferences set the default mode 
Change-Id: I438f7f24f06298ad41a99199c26c45bd7884afdd
Signed-off-by: Mike Lockwood <lockwood@android.com>
 2011-06-20 21:54:55 -04:00
Daniel Sandler
e89d4b5d69 am e0da3f3b: am 444336dd: Merge "Fix crazy notification panel background." into honeycomb-mr2 
* commit 'e0da3f3bc9aaefbf3e3737b69e91b7823f639751':
  Fix crazy notification panel background.
 2011-06-20 17:34:33 -07:00
Daniel Sandler
e0da3f3bc9 am 444336dd: Merge "Fix crazy notification panel background." into honeycomb-mr2 
* commit '444336dd5f233c59e5a222d366d2498c888664b5':
  Fix crazy notification panel background.
 2011-06-20 17:30:38 -07:00
Eric Fischer
6d470b7176 Import revised translations. 
Change-Id: Ie30d36d7416f687f2d84b0bdf6547cda96446f37
 2011-06-20 14:40:53 -07:00
Daniel Sandler
f1dd26b6fd Fix crazy notification panel background. 
The compatibility mode dialog (shown only once, ever) was clobbering its layout params.

Bug: 4723617
Change-Id: I7899293b72c8e480a97a10a88f62754ff415f343
 2011-06-20 14:44:35 -04:00
Mike Lockwood
17b90780e2 Merge "USB connected notification and temporary USB options dialog" 2011-06-17 20:54:38 -07:00
Mike Lockwood
5787a2d5b4 USB connected notification and temporary USB options dialog 
This change adds a notification when USB is connected.
Selecting the notification brings up a dialog to allow switching between
MTP and PTP modes, and also allows mounting a CD image for installing AFT.
The UI design is not final - this is a temporary implementation of the UI.

Change-Id: Idd678537aba595fd4cb183ea755bf437f372d826
Signed-off-by: Mike Lockwood <lockwood@android.com>
 2011-06-17 19:49:05 -04:00
Chia-chi Yeh
ced4bb1df7 Merge "VpnDialogs: migrate to VpnConfig." 2011-06-17 15:31:54 -07:00
Chia-chi Yeh
42bd53a9ff VpnDialogs: migrate to VpnConfig. 
Also hide the configure button when configureActivity is not set.

Change-Id: Ic8eeec89970bb67d42397754d1f54a2744183eed
 2011-06-17 15:27:41 -07:00
Daniel Sandler
ebce0115e2 ICS updates to notification layouts. 
Of note:

1. There is no "X" (veto) button anymore. (Well, there is,
   but it's offscreen so it should still be available to
   assistive devices.) Users can use "Clear all" or the new
   swipe-to-veto gesture to clear notifications.

2. As a consequence of #1, your layout goes all the way to
   the right edge of the notifications panel again. Enjoy
   the extra space!

3. The numeric bubble in the notification icon is now capped
   at "999+" like it is in the expanded notification view.
   (Note that this involves a couple of new public framework
   resources: one to indicate the number beyond which the
   substitution string will be used, and one specifying a
   localizable substitution string.)

Bug: 4651514
Bug: 4686329
Bug: 4501990
Change-Id: I0e6bdb6aec4fe5bfc927eb1aba955d444a9414ec
 2011-06-17 13:28:56 -04:00
Robert Greenwalt
5a3e91f870 DO NOT MERGE 
backport of change 113518 from honeycomb-LTE.  Fixes NPE in the
statusbar.

bug:4518551
Change-Id: I9a85e6799d12052e7bc8c54d651bee789d885a2f
 2011-06-16 14:21:04 -07:00
Chia-chi Yeh
b2eeb05889 Merge "VpnDialogs: use IConnectivityManager instead or ConnectivityManager." 2011-06-15 17:07:09 -07:00
Chia-chi Yeh
f530da67b4 VpnDialogs: use IConnectivityManager instead or ConnectivityManager. 
Change-Id: I8870a43ecbffa606d2e29f6c4b1b1a605b2b79e5
 2011-06-15 17:05:25 -07:00
Michael Jurka
d727cf7e3f Merge "Port recent apps from tablet to phone" 2011-06-15 16:51:22 -07:00
Michael Jurka
3b1fc47d00 Port recent apps from tablet to phone 
- wire up to long press on home
- remove unused recents activity
- remove duplicate recents resources in -large directories (using -sw600dp instead)
- fix issue with zoom/scale translation when recents was brought up

Change-Id: I45538ccaff49b46ac3659c4828f9e2b0cd075241
 2011-06-15 16:50:04 -07:00
Eric Fischer
a5608e3a67 am c0e84cf3: am 5e451faa: Merge "Import revised translations. DO NOT MERGE" into honeycomb-mr2 
* commit 'c0e84cf3210fc6b5929d024fafbe75f08167c44e':
  Import revised translations.  DO NOT MERGE
 2011-06-15 16:47:08 -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
Eric Fischer
dbad552d17 Import revised translations. DO NOT MERGE 
Change-Id: Iaff03724a335f856f7d28b1bc2c219f4208c4151
 2011-06-15 15:06:18 -07:00
Justin Ho
f4b56eaaba am 40fc6e0d: am c407ef22: am f4096041: Merge "Updated art for compat mode dialog." into honeycomb-mr2 
* commit '40fc6e0de578198c9cc5d9a493cb7db77bc938b8':
  Updated art for compat mode dialog.
 2011-06-15 15:01:42 -07:00
Justin Ho
40fc6e0de5 am c407ef22: am f4096041: Merge "Updated art for compat mode dialog." into honeycomb-mr2 
* commit 'c407ef22222f8f7e6f82abd081ecb65149336f99':
  Updated art for compat mode dialog.
 2011-06-15 14:58:56 -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
Dianne Hackborn
abfb5f95cc am 27f889d0: am 3dc1b5e2: am ed31bbf6: Clean up some edge cases in the compat mode UI: 
* commit '27f889d07ced48fbc7fa61c41a4a32ec3e1a95f3':
  Clean up some edge cases in the compat mode UI:
 2011-06-15 14:00:29 -07:00
Dianne Hackborn
27f889d07c am 3dc1b5e2: am ed31bbf6: Clean up some edge cases in the compat mode UI: 
* commit '3dc1b5e26fac2c6a6161d617f99fd901ee2ffc9e':
  Clean up some edge cases in the compat mode UI:
 2011-06-15 13:44:16 -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
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
Daniel Sandler
af4cec33a0 Merge "Swipe to veto in notifications." 2011-06-15 10:21:44 -07:00
Daniel Sandler
d7c8b6d2a4 am 2897fc4c: am fbb09347: am 5994bff9: Merge "One-time-only compatibility mode explanation dialog." into honeycomb-mr2 
* commit '2897fc4cc320d9fea2c6a81d7e2b05b6b820acf0':
  One-time-only compatibility mode explanation dialog.
 2011-06-15 06:36:56 -07:00
Daniel Sandler
2932645d99 am d163a616: am 2fdf5880: am 97d5081a: Merge "Final UI for compatibility mode." into honeycomb-mr2 
* commit 'd163a6162891f0e14d4536460d839262d2693e9a':
  Final UI for compatibility mode.
 2011-06-15 06:36:35 -07:00
Daniel Sandler
2897fc4cc3 am fbb09347: am 5994bff9: Merge "One-time-only compatibility mode explanation dialog." into honeycomb-mr2 
* commit 'fbb093479362865da833b89643a8f58347278bc3':
  One-time-only compatibility mode explanation dialog.
 2011-06-15 06:25:35 -07:00
Daniel Sandler
d163a61628 am 2fdf5880: am 97d5081a: Merge "Final UI for compatibility mode." into honeycomb-mr2 
* commit '2fdf5880611c333e172d4e0cc2c4259bca324699':
  Final UI for compatibility mode.
 2011-06-15 06:25:24 -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
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
Daniel Sandler
3b0543acf1 Final UI for compatibility mode. 
Bug: 4595256
Change-Id: Idaa96393fb809c828b5f661f29e8b687fdf3d104
 2011-06-15 00:12:01 -04:00
Dianne Hackborn
7f8d2a63e0 am ca2832bc: am 027e9e28: am 4e04380d: Merge "Fix issue #4592768: Xoom display does not resize when..." into honeycomb-mr2 
* commit 'ca2832bc60b986db245ced0e4a2b8a77d4982f32':
  Fix issue #4592768: Xoom display does not resize when...
 2011-06-14 20:57:15 -07:00
Dianne Hackborn
ca2832bc60 am 027e9e28: am 4e04380d: Merge "Fix issue #4592768: Xoom display does not resize when..." into honeycomb-mr2 
* commit '027e9e28b2880b8e50912d7c25e68e8f196bb66b':
  Fix issue #4592768: Xoom display does not resize when...
 2011-06-14 19:22:42 -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
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
Dianne Hackborn
3fe9cc5ea6 resolved conflicts for merge of e95c07bd to master 
Change-Id: I9af0c08a9f1c1f68661efe051a66835e850b76f6
 2011-06-14 16:13:26 -07:00
Dianne Hackborn
e95c07bd8a am 7c7f8e18: am 0a8a2324: Merge "Fix issue #4603422: Compatibility mode button doesn\'t always update" into honeycomb-mr2 
* commit '7c7f8e18dee8b582ec8e30a1412903ceec2ef5f5':
  Fix issue #4603422: Compatibility mode button doesn't always update
 2011-06-14 15:22:12 -07:00
Dianne Hackborn
7c7f8e18de am 0a8a2324: Merge "Fix issue #4603422: Compatibility mode button doesn\'t always update" into honeycomb-mr2 
* commit '0a8a2324239d7604e2a68349585aa67b59b25f4c':
  Fix issue #4603422: Compatibility mode button doesn't always update
 2011-06-14 15:14:34 -07:00
Dianne Hackborn
7d04932ef5 Fix issue #4603422: Compatibility mode button doesn't always update 
We now tell the system bar every time the top activity has changed for
it to re-evaluate its UI state.

Also fix issue #: 4607102 Low rider notifications.  It turns out this
was due to the change in the dialog asset; the notification UI was relying
on this having a lot of padding to make it sit above the status bar.
Now we have an explicitly mechanism to set how much it overlaps (or doesn't)
the status bar.

Change-Id: Iab5ebd86e620ff4fc4cd77206e18af962ec2830e
 2011-06-14 15:05:16 -07:00
Jeff Brown
3e234ba1fb Merge "Allow touches to slide out of the navigation bar." 2011-06-13 20:30:09 -07:00
Mike Lockwood
fa77931784 Merge "Settings: Remove unused USE_PTP_INTERFACE setting" 2011-06-13 19:50:37 -07:00
Mike Lockwood
1324f22d8d Settings: Remove unused USE_PTP_INTERFACE setting 
Change-Id: I743b81379053caece38c19c59bc76d6cda763d45
Signed-off-by: Mike Lockwood <lockwood@android.com>
 2011-06-13 22:21:01 -04:00
Jeff Brown
98db5fabda Allow touches to slide out of the navigation bar. 
Change-Id: I73cabba3d62f47829bf6217700ace56a27c42b1d
 2011-06-13 18:05:18 -07:00