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
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
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
Daniel Sandler
ad6352be88
Swipe to veto in notifications.
...
Yeah, it's pretty cool.
Change-Id: I2a4405a413ba9d1e521aa52a9a8c8e459583f9d0
2011-06-13 14:33:56 -04:00
Daniel Sandler
08d08f667e
Use the new animated notification layout on tablets.
...
(See change Ib46b2d3e.)
Change-Id: I46635ed97596bf1ebe65cd29ef80f3b189102d8a
2011-06-13 10:28:28 -04:00
Daniel Sandler
d42497e516
Rebuilt notification list using a new custom layout.
...
This will allow what is currently impossible with
layoutTransition: smoothly animating container bounds.
Current enter animation: alpha fade
Current exit animation: fade + slide right
Change-Id: Ib46b2d3ee982a276ca2142d360e62538e52b0897
Next: replace "X" with swipe-to-cancel.
2011-06-12 00:11:09 -04:00
Dianne Hackborn
6b592723c9
resolved conflicts for merge of f51ded0f to master
...
Change-Id: Ida356524a68aeb2b9b0013dfbb6ab4bd11e616e2
2011-06-10 12:45:36 -07:00
Dianne Hackborn
7bbf6f7d11
am 8297f669: am 3aabdeac: am 5ba2e872: Merge "Fix for not reporting correct "sw" in compat mode." into honeycomb-mr2
...
* commit '8297f669356ee997c5faa745815e8b9a7009fba7':
Fix for not reporting correct "sw" in compat mode.
2011-06-09 18:42:55 -07:00
Dianne Hackborn
f51ded0f8f
am a8d7ea06: am 220cd77d: Merge "Enforce public resource restriction on bag parents." into honeycomb-mr2
...
* commit 'a8d7ea067cf22baeee2ff0a33e5a8c5a35936942':
Enforce public resource restriction on bag parents.
2011-06-09 16:06:07 -07:00
Dianne Hackborn
a8d7ea067c
am 220cd77d: Merge "Enforce public resource restriction on bag parents." into honeycomb-mr2
...
* commit '220cd77de62956eb76c5084e1d1341d69bfd214a':
Enforce public resource restriction on bag parents.
2011-06-09 16:02:02 -07:00
Dianne Hackborn
426431adcc
Enforce public resource restriction on bag parents.
...
Need to put some more styles in the SDK to avoid breaking apps.
Also, welcome Android 3.2.
Change-Id: Ia31d07c9b1b91ad868d8630437fdc1b5ae24f37d
2011-06-09 15:27:39 -07:00
Wink Saville
0231804095
am 0da86d4f: am a558fdf1: Merge "Fix default preferred network." into honeycomb-LTE
...
* commit '0da86d4fef70f94a02a504f8500df2833719da6b':
Fix default preferred network.
2011-06-09 11:55:30 -07:00
Dianne Hackborn
8297f66935
am 3aabdeac: am 5ba2e872: Merge "Fix for not reporting correct "sw" in compat mode." into honeycomb-mr2
...
* commit '3aabdeaceff8405406d90c329a6691552559556d':
Fix for not reporting correct "sw" in compat mode.
2011-06-08 22:38:03 -07:00
Dianne Hackborn
3aabdeacef
am 5ba2e872: Merge "Fix for not reporting correct "sw" in compat mode." into honeycomb-mr2
...
* commit '5ba2e872fa684c0f1b992a95df00854b58f2cd8c':
Fix for not reporting correct "sw" in compat mode.
2011-06-08 22:35:25 -07:00
Dianne Hackborn
48a7651823
Fix for not reporting correct "sw" in compat mode.
...
Change-Id: Ia225c94b36ccc3589d417aafd5680247678eddfd
2011-06-08 22:26:33 -07:00