3461 Commits

Author SHA1 Message Date
Philip Milne
e9bb84a920 Merge "Accomodate margins in child measurements." 2011-06-21 10:13:15 -07:00
Narayan Kamath
4d03462b37 New API for TTS settings.
Engines must declare a <meta-data> attribute in their
manifest with name "android.speech.tts". This must reference
an XML resource as per
com.android.internal.R.styleable.TextToSpeechEngine.

Change-Id: I56a6b9f1a360174f98c9f39da901ade83d0f38a7
2011-06-21 10:28:30 +01:00
Philip Milne
b3a8c54389 Accomodate margins in child measurements.
Also:

. Cater for components that are GONE.
. Include code to draw component bounds and margins when in DEBUG mode.

Change-Id: I688f8b638469eb11987ebb207b7db1dc953e84e7
2011-06-20 18:47:54 -07:00
Dianne Hackborn
47d6ef5143 Merge "Stop the holo tabs from sqeezing in to each other." 2011-06-20 17:48:03 -07:00
Eric Fischer
a0bc575b9d Merge "Import revised translations." 2011-06-20 16:02:21 -07:00
Eric Fischer
6d470b7176 Import revised translations.
Change-Id: Ie30d36d7416f687f2d84b0bdf6547cda96446f37
2011-06-20 14:40:53 -07:00
Dianne Hackborn
9812c56b1e Stop the holo tabs from sqeezing in to each other.
Change-Id: I8925daf5c7c21e65f17cc6bc308b1b867047e745
2011-06-20 14:02:18 -07:00
Adam Powell
1be495683c Merge "Match legacy theme colors with gingerbread" 2011-06-20 13:07:39 -07:00
Adam Powell
0adb443ad5 Match legacy theme colors with gingerbread
Change-Id: I57904c0271953fc55d08a8a51be3dfc9ee02e416
2011-06-20 13:06:42 -07:00
Eric Fischer
3106a9b7f5 Merge "Add map center resources for new locales." 2011-06-20 12:03:01 -07:00
Fabrice Di Meglio
466ebb1d8a Merge "Add View paddingStart and paddingEnd" 2011-06-20 11:35:36 -07:00
Eric Fischer
672c5b4662 Add map center resources for new locales.
Change-Id: I892bc8262eb31ea9671e54f84ce91281b9e3c762
2011-06-20 11:27:17 -07:00
Fabrice Di Meglio
d8703a9824 Add View paddingStart and paddingEnd
- use a lazy padding resolution (because layout direction is lazyly resolved too)
- cache resolved layout direction as getResolvedLayoutDirection() will be more called
- enable resetting layout direction cache if needed
- update unit tests

Change-Id: I30ce19e3100cc137f84e60163b60e1577ff61819
2011-06-20 11:11:05 -07:00
Adam Powell
b0cd4e2e7c Merge "Holo dialog formatting" 2011-06-17 21:41:08 -07:00
Adam Powell
6323642880 Holo dialog formatting
Change-Id: I6819871df9456130ec75516f8713af92c0e51750
2011-06-17 21:40:29 -07:00
Mike Lockwood
17b90780e2 Merge "USB connected notification and temporary USB options dialog" 2011-06-17 20:54:38 -07:00
Adam Powell
b3721b9f7d Merge "Allow the action bar title to take on the role of "up" in the absence of a standard "home" icon." 2011-06-17 20:32:49 -07:00
Adam Powell
54c7d7e61c Allow the action bar title to take on the role of "up" in the absence
of a standard "home" icon.

Change-Id: Ie1a9adca674500a29da36956455667bbb55a616f
2011-06-17 20:31:10 -07:00
Jim Miller
6c7f7d8481 Merge "Fix 4584957: remove owner info from phone layouts" 2011-06-17 20:10:20 -07:00
Jim Miller
5b1acf9c3e Temporary workaround for conflict in GridLayout/LockScreen.
Change-Id: I0178c7f44c0fc71e78995a2565844cdb775698dd
2011-06-17 19:53:45 -07:00
Jim Miller
d63fdae48a Fix 4584957: remove owner info from phone layouts
The owner info view was causing PIN unlock to be unuseable because it pushed
the keyboard contents down and partially off the screen.

Owner info will be moved to the status1 area in a future CL.

Change-Id: Id96a4cc1c216d06b9d1fcc18bee9b5519befe0f4
2011-06-17 17:17:02 -07:00
Jim Miller
9c8e735817 Merge "Update pattern unlock and assets to match new UX design spec." 2011-06-17 16:50:34 -07:00
Mike Lockwood
4a15d8c800 Merge "Add string resource for CD installer image path" 2011-06-17 16:50:10 -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
Mike Lockwood
5d27b7a29b Add string resource for CD installer image path
Change-Id: I50eb2d0213f0547e88e9a20ab926726e781b0c0b
2011-06-17 19:49:04 -04:00
Jim Miller
0d244193be Update pattern unlock and assets to match new UX design spec.
Fix bug with LockPatternView measurement.
Clean up forgotPassword/emergencyCall button code.
Lots of layout tweaks. Now uses new GridLayout for many of them.
New assets.

Updated after review.

Change-Id: I52d4ce65c6b6c644ac60eb55bb8eaff8bfeb1071
2011-06-17 16:48:57 -07:00
Chia-chi Yeh
3f3337a662 VPN: avoid leaking file descriptors.
Change-Id: If70f5af3529d79bddb9d72675cf6eb038ff3ff70
2011-06-17 16:34:32 -07:00
Adam Powell
414c4984fd Merge "Create theme attributes for small and large listPreferredItemHeight. Change default holo dialog list items to use them." 2011-06-17 13:57:07 -07:00
Daniel Sandler
d3cdbf0a4f Merge "ICS updates to notification layouts." 2011-06-17 12:43:21 -07:00
Adam Powell
c8834722d5 Create theme attributes for small and large
listPreferredItemHeight. Change default holo dialog list items to use
them.

Tweak dialog button bar style.

Change-Id: I9bf14621aea44b8b7d60c290ecea86e6284ccdaa
2011-06-17 11:56:53 -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
Philip Milne
1e54825135 Change includeMarginsInAlignment flag to aligmentMode property.
Also:

. Change getInteger() to getInt().
. Conditionally compile, Paint() allocation and initialization.
. Correct spelling mistake in javadoc.

Change-Id: I00438a717e635a3917c5324f56063dce2e6041e8
2011-06-16 20:47:29 -07:00
Adam Powell
05c06de73c Merge "Dialog-o-rama!" 2011-06-16 18:31:18 -07:00
Adam Powell
a93347a62e Dialog-o-rama!
New styling for Holo dialogs. Now 76% easier for apps to create
dialog-based layouts! (Less tricky padding and margin rules)

Cancelable AlertDialogs now are canceled when the user touches
outside.

Dialogs in landscape mode will try not to fill the width of the
screen.

Change-Id: I621b5a19780883ee703a8492510451b480a0b8cc
2011-06-16 18:20:54 -07:00
Maarten Hooft
3a3efe7563 am 769bf5d5: am 42781a11: am d76baeb4: Merge "Import revised Croatian translations." into gingerbread
* commit '769bf5d59ef1b6a9bce9d64d9761def735d6af65':
  Import revised Croatian translations.
2011-06-16 17:05:19 -07:00
Maarten Hooft
769bf5d59e am 42781a11: am d76baeb4: Merge "Import revised Croatian translations." into gingerbread
* commit '42781a11ce9e346a24fbb6214f8f214845464213':
  Import revised Croatian translations.
2011-06-16 15:55:14 -07:00
Maarten Hooft
42781a11ce am d76baeb4: Merge "Import revised Croatian translations." into gingerbread
* commit 'd76baeb4d836c33cc68cbb0c2e237c066f368529':
  Import revised Croatian translations.
2011-06-16 15:48:55 -07:00
John Reck
179cfcf654 Merge "Inline SeekBarPreference" 2011-06-16 13:21:52 -07:00
John Wang
1766974b02 am 03cbb58e: am ff42c04d: Merge "Support SIM permanently disabled state." into honeycomb-LTE
* commit '03cbb58e2418dc22ae18a8648404382da4ee46e8':
  Support SIM permanently disabled state.
2011-06-16 12:49:17 -07:00
John Wang
03cbb58e24 am ff42c04d: Merge "Support SIM permanently disabled state." into honeycomb-LTE
* commit 'ff42c04d15e000f6295e796e154cc60c54aa078b':
  Support SIM permanently disabled state.
2011-06-16 12:34:34 -07:00
John Reck
014fea2a66 Inline SeekBarPreference
Dialog-based SeekBarPreference renamed to SeekBarDialogPreference
 New inline SeekBarPreference added

Change-Id: I7a5d8f7aa554c4af4086a9bcc74cf07879c8523c
2011-06-16 12:34:02 -07:00
John Wang
ff42c04d15 Merge "Support SIM permanently disabled state." into honeycomb-LTE 2011-06-16 11:22:53 -07:00
Dave Santoro
7ff1c2aefd Merge "Added profile string descriptions and limits." 2011-06-15 16:56:45 -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
Dave Santoro
7fb888ac89 Added profile string descriptions and limits.
Bug: 4584896
Change-Id: I0b73022a179a850c047a17ea03117f54931a748a
2011-06-15 16:47:26 -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
dbad552d17 Import revised translations. DO NOT MERGE
Change-Id: Iaff03724a335f856f7d28b1bc2c219f4208c4151
2011-06-15 15:06:18 -07:00
Marco Nelissen
181aafd75c am 9c3c3004: am d8f9a83c: resolved conflicts for merge of d027329c to gingerbread-plus-aosp
* commit '9c3c3004c4206da3f2579e863ce89a2f99269dd6':
  Ignore duplicate WAP push PDU source/destination port if configured
2011-06-15 13:44:56 -07:00