4420 Commits

Author SHA1 Message Date
Irfan Sheriff
a5d24d42ff Merge "Redesign p2p around provision discovery" 2011-11-29 14:52:18 -08:00
Jeff Brown
0475f82c95 am c339fe30: am be6ab576: Merge "Fix application launch shortcuts." into ics-mr1
* commit 'c339fe302bc5083f0a110569eec06676be511088':
  Fix application launch shortcuts.
2011-11-29 13:17:42 -08:00
Jeff Brown
be6ab576ff Merge "Fix application launch shortcuts." into ics-mr1 2011-11-29 13:13:33 -08:00
Jeff Brown
6651a63834 Fix application launch shortcuts.
Improved quick launch bookmarks to support category-based shortcuts
instead of hardcoding package and class names for all apps.

Added a set of Intent categories for typical applications on the
platform.

Added support for some of the HID application launch usages to
reduce reliance on quick launch for special purpose keys.  Some
keyboard vendors have hardcoded launch keys that synthesize
"Search + X" type key combos.  The goal is to encourage them
to stop doing this by implementing more of HID.

Bug: 5674723
Change-Id: I79f1147c65a208efc3f67228c9f0fa5cd050c593
2011-11-29 12:17:22 -08:00
Eric Fischer
9ab3c62499 Merge "Import revised translations. DO NOT MERGE" into ics-mr1 2011-11-29 11:44:59 -08:00
Eric Fischer
fa56c714f2 Import revised translations. DO NOT MERGE
Change-Id: Ia50fd44ea4492188f481e652caae940acaf961e2
2011-11-29 11:42:53 -08:00
Eric Fischer
9b4268697f Merge "Import revised translations." 2011-11-29 11:09:51 -08:00
Eric Fischer
4a97ebfec5 Import revised translations.
Change-Id: Ie43246df49b8f6ef3daef12e0d8fb5c2f573874e
2011-11-29 10:29:25 -08:00
Dianne Hackborn
c0b7f65ae0 am 496f6e2a: am b54980d1: Merge "Fix issue #5588689: Black camera preview after coming back from gmail" into ics-mr1
* commit '496f6e2ad656c5bb8a277e191554d16abd290b58':
  Fix issue #5588689: Black camera preview after coming back from gmail
2011-11-28 16:57:17 -08:00
Dianne Hackborn
6d05fd3c79 Fix issue #5588689: Black camera preview after coming back from gmail
Make surface management between SurfaceView and the window manager
much more controlled, to ensure that SurfaceView always gets to report
the current surface is destroyed before the window manager actually
destroys it.

Also a small tweak to allow windows that have a wallpaper background
to still have a preview window.  This makes launching home after it
has been killed feel much more responsive.

Change-Id: I0d22cf178a499601a770cb1dbadef7487e392d85
2011-11-28 14:45:50 -08:00
Irfan Sheriff
618455f7e7 Redesign p2p around provision discovery
= Provision Discovery:Is an optional discovery technique for figuring out
if a peer supports the specific WPS option. For compatibility reasons,
we will now always use it during connection but at the same time support
devices that request to support connection without it

= State machine and UI redesign around the new interaction

= Specify config methods explicitly for compatibility

Bug: 5599949
Change-Id: Ib79435dda472c43cc0746f56bf79ea896b2e33a4
2011-11-28 11:50:11 -08:00
Adam Cohen
8556439ef9 am 42afab37: am 8ce22f26: Fixing a typo in framework widget padding
* commit '42afab3799c5dba8abccabe231b74c96d5ff0c14':
  Fixing a typo in framework widget padding
2011-11-23 16:42:46 -08:00
Adam Cohen
8ce22f2644 Fixing a typo in framework widget padding
Change-Id: I90733500487b3e9fb1ff19a7b946d6faf526a2c1

Conflicts:

	core/res/res/values-sw600dp/dimens.xml
2011-11-23 16:31:53 -08:00
Eric Fischer
bf1b9778ce Import revised translations. DO NOT MERGE
Change-Id: I4313e0fffeb72b5a78b49770932ad983cfb05f8b
2011-11-21 15:23:51 -08:00
Jeff Brown
48dc15cfc5 Change desk dock to use accelerometer by default.
Change-Id: Ied528685c8db855bc2442574d0b80232aa38752c
2011-11-21 13:30:01 -08:00
Dave Santoro
c5b057f423 am 60e345a9: am 9be49620: Merge "Unhide social stream permissions." into ics-mr1
* commit '60e345a9a95a0f24804f729eeb5216012d1bcbac':
  Unhide social stream permissions.
2011-11-17 15:12:52 -08:00
Dave Santoro
9be4962060 Merge "Unhide social stream permissions." into ics-mr1 2011-11-17 12:26:17 -08:00
Dave Santoro
098d466a25 Unhide social stream permissions.
Bug 5569021

Change-Id: I35ee70418be0e0286294fef54e194831b5fa3b2c
2011-11-17 11:02:03 -08:00
Daniel Sandler
28b23cdef4 am 8b9ba6fa: am f52a4482: Merge "Add a default Dreams component." into ics-mr1
* commit '8b9ba6fa8806c401c89df88f0a1690fbfd1ebb89':
  Add a default Dreams component.
2011-11-17 07:48:15 -08:00
Marco Nelissen
5a1623b379 am 3de68918: am e937da83: Merge "Change MediaController look b/5584613" into ics-mr1
* commit '3de689186531cebfabcb4b4d4163eae6baac528d':
  Change MediaController look b/5584613
2011-11-17 07:48:01 -08:00
Daniel Sandler
f52a4482dd Merge "Add a default Dreams component." into ics-mr1 2011-11-16 17:13:35 -08:00
Marco Nelissen
cbd4bcaa71 Change MediaController look
b/5584613

Change-Id: I6799753ffff3202e354039b85fdca72e48e6be5d
2011-11-16 13:43:11 -08:00
Eric Fischer
2f8e2e805d Import revised translations. DO NOT MERGE
Change-Id: I4ef67d81f61028da84c51ed0e48231f9cdc62679
2011-11-16 09:55:52 -08:00
Daniel Sandler
c224f76303 Add a default Dreams component.
Currently set to DeskClock's screensaver, but since it's a
(private) string in f/b/c/r/r/values/config.xml any product
could overlay this.

Bug: 5611008
Change-Id: I7a4623c9c667a6cff8ed80ad600a8a4460bfafb7
2011-11-15 22:55:03 -08:00
Jim Miller
953b299d36 am 58c6f1b2: am c57bfa4a: Fix 5581164: Add abbreviated localized date strings
* commit '58c6f1b2e1528cd14bef94ae9c5b922b7751309c':
  Fix 5581164: Add abbreviated localized date strings
2011-11-15 18:25:12 -08:00
Jim Miller
057d48147a am 8622fb34: am 34a62348: Merge "Fix 5581164: Use abbreviated day in lockscreen" into ics-mr1
* commit '8622fb34769dc257a319ce8e7dab652312d6c049':
  Fix 5581164: Use abbreviated day in lockscreen
2011-11-15 18:25:08 -08:00
Jim Miller
c57bfa4a4b Fix 5581164: Add abbreviated localized date strings
Change-Id: I041eef02a67980d3b5c2f2fa12eae717c26e35be
2011-11-15 16:06:37 -08:00
Jim Miller
34a62348be Merge "Fix 5581164: Use abbreviated day in lockscreen" into ics-mr1 2011-11-15 15:42:20 -08:00
Eric Fischer
3524831a63 am 8d00c194: Merge "Import revised translations. DO NOT MERGE" into ics-mr0
* commit '8d00c194c228e67851e5a0cb75c4bf4d99dd40f0':
  Import revised translations.  DO NOT MERGE
2011-11-15 11:51:38 -08:00
Adam Powell
187309bdcc am 5d536c94: am 539bcca9: Merge "Fix bug 5594320 - Overlay action bar decor layout causes two measure passes" into ics-mr1
* commit '5d536c945da075036f151e5dbac86d74d32e2fc9':
  Fix bug 5594320 - Overlay action bar decor layout causes two measure passes
2011-11-15 11:30:13 -08:00
Jim Miller
e5ae019b8c Fix 5581164: Use abbreviated day in lockscreen
This fixes a problem where the alarm status was forced to scroll on phones
when the date string got too long.  We now abbreviate the day on lock screen.

Change-Id: I99990f1568282c65fb6ed4e78d20bb31b3487a8e
2011-11-14 20:13:50 -08:00
Adam Powell
539bcca99d Merge "Fix bug 5594320 - Overlay action bar decor layout causes two measure passes" into ics-mr1 2011-11-14 19:47:55 -08:00
Jim Miller
6162960c1e am 3dd55677: am ff95f657: Merge "Fix 5579440: Add transport control view to tablet unlock screens" into ics-mr1
* commit '3dd5567710168da330741cb4c4263cc03dd942f1':
  Fix 5579440: Add transport control view to tablet unlock screens
2011-11-14 16:21:10 -08:00
Adam Powell
136a10a2b8 Fix bug 5594320 - Overlay action bar decor layout causes two measure passes
The existing action bar overlay decor layouts hit a case in
RelativeLayout that causes two measure passes for the main content. As
this can be expensive, stick the bar and the content overlay into
their own sub-layout and switch things to use a FrameLayout at the top
level instead.

Be explicit about the layout_width/height on ActionBar-containing
decor layouts as the older decor layouts are.

Change-Id: I4330f0f25841dd8058b94a320f93bf67fb56bf17
2011-11-14 15:34:51 -08:00
Jim Miller
faed16030d Fix 5579440: Add transport control view to tablet unlock screens
This updated tablet layouts to support showing album art and transport
control views in PIN, pattern and password screens of lock screen.

It also allows the addition of a background protect asset and
the ability to show the system wallpaper on layouts that define a
transport_bg_protect view.

Also updated layout to use new ICS-style buttons on lock screen and
fixed bug with "forgot pattern" button where we were showing the
emergency call icon.

To avoid problems with leading ones in the mono-space clock font,
we now right-justify status text on tablet and remove the AM/PM
indicator.

Status font size adjusted by UX.

Added background protection drop shadow to transport control.

Fixed portrait mode to be right-justified when transport is showing.

Change-Id: I790292fc39f4588f87adc9d9241706817ae6baab
2011-11-14 14:09:05 -08:00
Eric Fischer
9645720556 Import revised translations. DO NOT MERGE
Change-Id: I287b6b70df6795513fc1fc98d2fddaf310042e98
2011-11-14 13:24:28 -08:00
John Wang
196c215a8b am 6504d74b: am 72a31ab9: Merge "[maguro] Fix STK issues" into ics-mr1
* commit '6504d74b8f7b98f7c2d5fb550042c644510d5f34':
  [maguro] Fix STK issues
2011-11-14 12:14:09 -08:00
dujin.cha
e81932e92a [maguro] Fix STK issues
1. Fix Bug 5574160 (Abnormal Setup menu)
2. Fix Bug 5558273 (GetInkey issue)
3. Fix BUg 5558612 (No default alpha id)
4. Fix Vodafone UK ALS issue.

Bug : 5574160, 5558273, 5558612

Change-Id: Ief74d0e4f4f28dff7a435e9dab1fab1ca1d9bfaf
Signed-off-by: dujin.cha <dujin.cha@samsung.com>
2011-11-14 10:46:19 -08:00
Peter Ng
628709f031 am 08158c55: am bce7812b: Merge "Cleaning up tablet assets by deleting drawable-xlarge and large folders" into ics-mr1
* commit '08158c5526ded5599b183e5d8380809571e5c56a':
  Cleaning up tablet assets by deleting drawable-xlarge and large folders
2011-11-10 22:30:51 +00:00
Peter Ng
37ae1fe005 Cleaning up tablet assets by deleting drawable-xlarge and large folders
-keeping default wallpaper in xlarge-nodpi

Bug:5596158

Change-Id: I18ec8b0aa648fa95a1f6ebb4380c630f05e24ecb
2011-11-10 14:22:05 -08:00
Eric Fischer
c926911386 Merge "Import revised translations." 2011-11-10 14:06:21 -08:00
Eric Fischer
334f691fa3 Import revised translations.
Change-Id: Iac6e1ff785d898d65934cdfdaf3d92a56324282c
2011-11-10 11:20:21 -08:00
Jim Miller
524a0adeb5 am 5943c1dc: am 270826a8: Merge "Fix 5555408: allow emergency button to be disabled on SIM/PUK unlock screen" into ics-mr1
* commit '5943c1dc406574b360e9cb1343a5dab00a84a8e2':
  Fix 5555408: allow emergency button to be disabled on SIM/PUK unlock screen
2011-11-10 16:15:14 +00:00
Jean-Michel Trivi
d43759f0bc am 036da419: am 20cf0916: Merge "Bug 5585323 New system permission for media decode" into ics-mr1
* commit '036da41922c936d25b36fbc4b5927a0097ece330':
  Bug 5585323 New system permission for media decode
2011-11-10 05:42:39 +00:00
Jim Miller
270826a887 Merge "Fix 5555408: allow emergency button to be disabled on SIM/PUK unlock screen" into ics-mr1 2011-11-09 15:19:31 -08:00
Adam Powell
c55a4262f3 am b7dc4a33: am 650a3e88: Merge "Fix the action bar menu layout to use the correct divider drawable." into ics-mr1
* commit 'b7dc4a33166bd24cc1ce5fa8c3ef27618a54e274':
  Fix the action bar menu layout to use the correct divider drawable.
2011-11-09 21:51:06 +00:00
Adam Cohen
dcf7cf4ca4 am 068b7f02: am 75b20380: Merge "Making default widget padding public API" into ics-mr1
* commit '068b7f02a35e969c1607f8a35c422c93ee72c8a3':
  Making default widget padding public API
2011-11-09 21:50:54 +00:00
Robert Greenwalt
75f9808e55 am 604019c8: Merge "Fix build." into ics-mr1
* commit '604019c8d45b8c56cf48b03dbd92cfbdd29c48c1':
  Fix build.
2011-11-09 19:34:50 +00:00
Adam Powell
c31c42abb6 am 8689afbd: Merge "Fix bug 5544103 - Spinner text doesn\'t look dimmed when disabled" into ics-mr1
* commit '8689afbd63db3b1af6058709da843ea9d6433b21':
  Fix bug 5544103 - Spinner text doesn't look dimmed when disabled
2011-11-09 19:34:47 +00:00
Robert Greenwalt
c1b3cbe164 resolved conflicts for merge of ea54b760 to master
Change-Id: Ifcdfd6ffd82db1293936a8a3b5715dd767fb43f8
2011-11-09 09:03:59 -08:00