37379 Commits

Author SHA1 Message Date
Irfan Sheriff
169dc398ed Merge "Remove config_wifi_p2p_support from config.xml." 2013-01-28 16:01:43 +00:00
Kenny Root
a647281109 am 2e99d3c9: am ebb61ca2: Merge "Track libcore changes for OpenSSLKey"
# Via Android Git Automerger (1) and others
* commit '2e99d3c9646861ca92faf6708c18e36c7530fd93':
  Track libcore changes for OpenSSLKey
2013-01-25 16:41:33 -08:00
Kenny Root
2e99d3c964 am ebb61ca2: Merge "Track libcore changes for OpenSSLKey"
# Via Gerrit Code Review (1) and Kenny Root (1)
* commit 'ebb61ca2ed20472d684ab1490b61482392121051':
  Track libcore changes for OpenSSLKey
2013-01-25 16:39:33 -08:00
Kenny Root
ebb61ca2ed Merge "Track libcore changes for OpenSSLKey" 2013-01-26 00:26:01 +00:00
Kenny Root
4dca394617 am df1498dc: am bf043b50: Merge "Add TLS Channel ID support to SSLCertificateSocketFactory."
# By Alex Klyubin
# Via Alex Klyubin (1) and others
* commit 'df1498dcbac86018b719cda8bf2e9ff3a6dedec8':
  Add TLS Channel ID support to SSLCertificateSocketFactory.
2013-01-25 14:32:04 -08:00
Kenny Root
df1498dcba am bf043b50: Merge "Add TLS Channel ID support to SSLCertificateSocketFactory."
# By Alex Klyubin
# Via Alex Klyubin (1) and Gerrit Code Review (1)
* commit 'bf043b505c945403752227d89b74bacd7fbcd608':
  Add TLS Channel ID support to SSLCertificateSocketFactory.
2013-01-25 14:25:36 -08:00
Kenny Root
bf043b505c Merge "Add TLS Channel ID support to SSLCertificateSocketFactory." 2013-01-25 22:08:52 +00:00
Tim Roes
fd02074fdd Complete documentation of whereArgs (Issue #43061)
Complete the missing documentation for the
whereArgs argument in delete, update and
updateWithOnConflict

Update: Removed trailing spaces

Change-Id: I451ec9e0747c7655c612a4506f40152af0adcf3a
Signed-off-by: Tim Roes <tim.roes88@googlemail.com>
2013-01-25 16:58:47 +00:00
Sungmin Choi
f036920669 show SELECT ALL icon with text in landscape mode
Though set config_allowActionMenuItemTextWithIcon as true,
icon for the "SELECT ALL" menu on ActionBar is not shown as staring
in landscape mode.
To fix it, use "SELECT ALL" icon in onCreateActionMode() to show the
icon and text together.

To show or hide text is decided by updateTextButtonVisibility() of
core/java/com/android/internal/view/menu/ActionMenuItemView.java

STEPS TO REPRODUCE: (please be specific)
1. launch Browser/Chrome and go to google.com
2. rotate to landscape mode
3. long press on URL address

Bug: 8073761
Change-Id: Ie0e0aa45f0dff609ed8c03e4423b163bad5452ed
2013-01-25 22:06:55 +09:00
Sungmin Choi
6d8a99fecc avoid multiple-"0" to exceed the length of upper bound
Limits number of "0"s not to exceed length of maximum number allowed
for the NumberPicker.

Steps to reproduce:
1. Settings -> Date & time -> uncheck "Automatic date & time"
2. Select "Set time"
3. Select Time Area on Set time dialog
4. insert 00000000 via NumberPicker

Bug: 8073759
Change-Id: I0f3f5303d9a4b559217adb436f244407a23e58c0
2013-01-25 18:26:46 +09:00
Yoshihiko Ikenaga
8879343c26 Remove config_wifi_p2p_support from config.xml.
"config_wifi_p2p_support" is no longer used.
It was replaced with PackageManager.FEATURE_WIFI_DIRECT.

Change-Id: Ib57c5246b2ad218e65b4cbbb77fd37c04b5d9682
Signed-off-by: Yoshihiko Ikenaga <yoshihiko.ikenaga@jp.sony.com>
2013-01-25 11:35:33 +09:00
Ki-Hwan Lee
6855733b7f Added focusable true on search_button for D-pad.
To give focus to search_button on ActionBar by using D-pad,
the search_button should be set focusable true.

How to reproduce:
(1) Open "API Demos" application -> App -> Action Bar -> Action Bar Usage
(2) Try to focus the Search View, using the D-pad.

Change-Id: Idc0b8e8d88391c152e0fc20467c23d03ab558f62
2013-01-24 13:15:30 +09:00
Wink Saville
311ef539cf am f0bf29df: am 1842f2ed: Merge "frameworks: Display missing text on SimUnlockScreen"
# By Anju Mathapati
# Via Android Git Automerger (1) and others
* commit 'f0bf29df0cff4b7e370b7c329de92e90a4bab194':
  frameworks: Display missing text on SimUnlockScreen
2013-01-23 17:37:28 -08:00
Wink Saville
f0bf29df0c am 1842f2ed: Merge "frameworks: Display missing text on SimUnlockScreen"
# By Anju Mathapati
# Via Anju Mathapati (1) and Gerrit Code Review (1)
* commit '1842f2ed745af0d0f8cc457d448ba552e40a6b34':
  frameworks: Display missing text on SimUnlockScreen
2013-01-23 17:32:38 -08:00
Wink Saville
1842f2ed74 Merge "frameworks: Display missing text on SimUnlockScreen" 2013-01-24 00:39:38 +00:00
Adam Powell
a41f9cfbbd am 53d49f17: am 17f05497: am c2469500: Merge "Touch action bar title text: you will go to space today!" into jb-mr1.1-dev
# Via Android Git Automerger (2) and others
* commit '53d49f1702df41a4ca342a1df6e720b16e094797':
  Touch action bar title text: you will go to space today!
2013-01-23 15:48:52 -08:00
Adam Powell
53d49f1702 am 17f05497: am c2469500: Merge "Touch action bar title text: you will go to space today!" into jb-mr1.1-dev
# Via Adam Powell (1) and others
* commit '17f05497be90004c0263c6de173af8c19ece07b0':
  Touch action bar title text: you will go to space today!
2013-01-23 15:46:20 -08:00
Adam Powell
c246950043 Merge "Touch action bar title text: you will go to space today!" into jb-mr1.1-dev 2013-01-23 23:42:36 +00:00
Adam Powell
ae041ce83d am ce2f911d: am 65083049: am 5a32ec32: Merge "Prevent simultaneous interaction with action bar and content" into jb-mr1.1-dev
# Via Android Git Automerger (2) and others
* commit 'ce2f911d87927850337dcedda39364d59bd4a7ff':
  Prevent simultaneous interaction with action bar and content
2013-01-23 15:29:02 -08:00
Adam Powell
ce2f911d87 am 65083049: am 5a32ec32: Merge "Prevent simultaneous interaction with action bar and content" into jb-mr1.1-dev
# Via Adam Powell (1) and others
* commit '650830491868b961e98c1837fb4b4ce7917783b5':
  Prevent simultaneous interaction with action bar and content
2013-01-23 15:25:50 -08:00
Adam Powell
27cba38952 Touch action bar title text: you will go to space today!
Title/subtitle text in an action bar is now a full alias for home/up.

Add some prototype ActionBar functionality around titles for future
API consideration.

Bug 7966136

Change-Id: I14377121dcb976d0a5f1e1862f35c3d267eb5458
2013-01-23 15:14:31 -08:00
Adam Powell
d28f30a9e0 Prevent simultaneous interaction with action bar and content
Bug 8034744

Change-Id: I72cf4f5d2443e1cd6e40785b4d06d9bd363ab3e4
2013-01-23 14:23:06 -08:00
Elliott Hughes
ef5d1d6355 am 6bcecb20: am b63e39a0: Merge "fix typo for symbol"
* commit '6bcecb20005bf397169a120e9dc3c91d30dba154':
  fix typo for symbol
2013-01-22 16:21:03 -08:00
Elliott Hughes
6bcecb2000 am b63e39a0: Merge "fix typo for symbol"
* commit 'b63e39a076c0643680f501a1c646bca088b4bbfc':
  fix typo for symbol
2013-01-22 16:18:58 -08:00
Kenny Root
cc1fc6b6ad Track libcore changes for OpenSSLKey
Change-Id: I39f60c34daa9ccc633efb02988ea238a84e6bbf1
2013-01-22 15:22:56 -08:00
Elliott Hughes
b63e39a076 Merge "fix typo for symbol" 2013-01-22 23:19:20 +00:00
John Reck
58fb00025d am ecd3c76f: am 6458d9b1: Merge "Fix for truncated sentence in "Find on Page" field"
* commit 'ecd3c76f6275d0ffb0b36100936cf284ab00bee2':
  Fix for truncated sentence in "Find on Page" field
2013-01-22 13:57:51 -08:00
John Reck
ecd3c76f62 am 6458d9b1: Merge "Fix for truncated sentence in "Find on Page" field"
* commit '6458d9b1b283590b5ced3c8982c4ea2e2a39cf2e':
  Fix for truncated sentence in "Find on Page" field
2013-01-22 13:54:50 -08:00
John Reck
6458d9b1b2 Merge "Fix for truncated sentence in "Find on Page" field" 2013-01-22 21:12:49 +00:00
Masanori Ogino
f449c0c381 fix hover events consume issue
View#onHoverEvent() would always consume hover events over the view
if an application window has the clickable view/widget on it.
That's happened even if accessibility/talkback is disabled.
So those events will not dispatch to activity#onGenericMotionEvent().

The onHoverEvent method should return a real consumed state.

Change-Id: I9cac13b82866e5cdda0b03befb0de752a0a2e741
2013-01-22 18:10:52 +09:00
Dake Gu
85a06152ce am fe88f1be: Merge "Fix bug of SimulatedTrackball" into jb-mr1-aah-dev
* commit 'fe88f1be3d197987a874f6c29fefdeb11db183f6':
  Fix bug of SimulatedTrackball
2013-01-18 13:26:02 -08:00
Alex Klyubin
4ef6c9b6a1 Add TLS Channel ID support to SSLCertificateSocketFactory.
This adds a new method setChannelIdPrivateKey as a hidden API.

See http://tools.ietf.org/html/draft-balfanz-tls-channelid-00 for
more information about the TLS Channel ID extension.

Change-Id: I73c1905afdce01d4831de7faa55ea4496575b5a5
2013-01-18 12:50:39 -08:00
Dake Gu
f8739b992f Fix bug of SimulatedTrackball
Simulated trackball should not generate KeyEvent if dispatchGenericMotionEvent
returns true

b/8022205

Change-Id: I1857e25407c508c98ef4db85fe146b1e25a0803e
2013-01-17 18:15:44 -08:00
Elliott Hughes
8c27d0b309 am 686fad5e: am b1e16f11: Merge "Track a typo fix in hidden libcore API."
* commit '686fad5e2367fe08afe6e219d460be994127fb5e':
  Track a typo fix in hidden libcore API.
2013-01-17 10:32:00 -08:00
Elliott Hughes
686fad5e23 am b1e16f11: Merge "Track a typo fix in hidden libcore API."
* commit 'b1e16f11ffd3a391be1a44a352c122b6dad1e8a5':
  Track a typo fix in hidden libcore API.
2013-01-17 10:28:43 -08:00
Elliott Hughes
26df61683a Track a typo fix in hidden libcore API.
Change-Id: I6fa3c2ef7f4d73bbf6557560e46c7c11bff74a32
2013-01-17 09:24:47 -08:00
Sungmin Choi
05a96d11dd fix typo for symbol
remove duplicated symbol (sliding_layout)

Change-Id: I401de3832328731d554dd4cda991b77b99454579
2013-01-17 10:25:40 +09:00
Scott Kennedy
a8396686a2 docs: Typos and other fixes
External 42844
External 42778
External 42768
External 42730
External 42720
External 42678
External 39381

Change-Id: Ia9d54ce87dc266650d0620fd3adc63137322e20b
2013-01-16 10:07:13 -08:00
Stefan Wysocki
1c15b8d896 Fix for truncated sentence in "Find on Page" field
When typing a text in find on page, then deleting it again the
default text in the field "Find on Page" is truncated by
an invisible view.

This commit fixes the problem by setting the visibility of
mMatches view changes to View.GONE instead of View.INVISIBLE.

Change-Id: I9889f22a254cdabb0cbaba72bff4b14158e5c9ff
2013-01-15 14:02:53 +01:00
Elliott Hughes
a99a9f4f80 am 9fa542a5: am 727adb8b: Merge "Manual fix for some Norwegian format strings."
* commit '9fa542a5032d8adc3f502cef0c5c98d8f10abbc2':
  Manual fix for some Norwegian format strings.
2013-01-14 19:25:56 -08:00
Elliott Hughes
67ae48f325 am fc91d730: am cbfece82: Merge "Switch over to getting 12-/24-hour time formats from CLDR via icu4c."
* commit 'fc91d73067d76e129869fe472238f4c80aa5d435':
  Switch over to getting 12-/24-hour time formats from CLDR via icu4c.
2013-01-14 19:25:52 -08:00
Elliott Hughes
9fa542a503 am 727adb8b: Merge "Manual fix for some Norwegian format strings."
* commit '727adb8b4795dd4eb708c03ecec69ff64fa8d552':
  Manual fix for some Norwegian format strings.
2013-01-14 19:23:51 -08:00
Elliott Hughes
fc91d73067 am cbfece82: Merge "Switch over to getting 12-/24-hour time formats from CLDR via icu4c."
* commit 'cbfece8237cb9cf62547e75ab9572ccbf682369a':
  Switch over to getting 12-/24-hour time formats from CLDR via icu4c.
2013-01-14 19:23:48 -08:00
Elliott Hughes
bfcd162cc2 Manual fix for some Norwegian format strings.
Fixing these properly (by removing these donottranslate-cldr.xml files
completely) is blocked on icu4c, so manually fix a few strings in the
meantime.

Bug: http://code.google.com/p/android/issues/detail?id=21859
Change-Id: If91ec70ad4c9e0944deee1cb55382e94ac1b7278
2013-01-14 17:48:30 -08:00
Jeff Brown
31ea5707fa am 9afb2e1a: Optimize focused input event dispatch in view root. DO NOT MERGE
* commit '9afb2e1a95b92d5dfb0612bbb606a09aa528ee5d':
  Optimize focused input event dispatch in view root. DO NOT MERGE
2013-01-14 17:26:22 -08:00
Elliott Hughes
cbfece8237 Merge "Switch over to getting 12-/24-hour time formats from CLDR via icu4c." 2013-01-14 17:01:52 -08:00
Jeff Brown
9afb2e1a95 Optimize focused input event dispatch in view root. DO NOT MERGE
The efficiency of key, trackball and generic motion event
dispatch is greatly influenced by the IME dispatch cycle.
This change simplifies the dispatch of focused input events
and avoids causing event processing to be requeued on the
handler and delayed unnecessarily.

Bug: 7984576
Change-Id: Id82624a3f32c05efe6ee5c322bd55bf2ab21525d
2013-01-14 15:55:35 -08:00
Elliott Hughes
4caba61ea0 Switch over to getting 12-/24-hour time formats from CLDR via icu4c.
I removed the duplication in DateTimeView rather than fix that copy
of the code.

Bug: 7924970
Change-Id: I60c205d06ad3b50fd2f5d5fc432e4eb186f9c0e7
2013-01-14 15:48:27 -08:00
Scott Kennedy
aebeea4cf3 am 5d6d6aab: am 8e45679a: am 026f9191: am 08342698: Merge "docs: Fix a bunch of issues" into jb-mr1-dev
* commit '5d6d6aab255aa17fde979d954c839402837b4243':
  docs: Fix a bunch of issues
2013-01-14 11:15:55 -08:00
Scott Kennedy
5d6d6aab25 am 8e45679a: am 026f9191: am 08342698: Merge "docs: Fix a bunch of issues" into jb-mr1-dev
* commit '8e45679adfe03271dd1cc627d6c4542649a0446a':
  docs: Fix a bunch of issues
2013-01-14 11:13:25 -08:00