94949 Commits

Author SHA1 Message Date
Adam Powell
783fe42953 am e305e5f6: Merge "show SELECT ALL icon with text in landscape mode"
# By Sungmin Choi
# Via Gerrit Code Review (1) and Sungmin Choi (1)
* commit 'e305e5f68df8338cb3c4bdcf099d23ec9abce564':
  show SELECT ALL icon with text in landscape mode
2013-01-28 11:37:41 -08:00
Adam Koch
376e707f65 Displaying Bitmaps Efficiently Training - Update sample app
Update sample app zip (see http://ag/268000)

Change-Id: I678b9286552d559358b0e58cbac0475dbe5e10a1
2013-01-28 13:58:14 -05:00
Scott Main
7467a0f002 docs: update adb tool page with am and pm reference
Change-Id: I7b0e5c95a0d98b91c0a8ed39962b52f8ace47c3b
2013-01-28 10:56:39 -08:00
Amith Yamasani
abcb9b96f8 Merge "Added focusable true on search_button for D-pad." 2013-01-28 18:46:38 +00:00
Adam Powell
e305e5f68d Merge "show SELECT ALL icon with text in landscape mode" 2013-01-28 18:44:10 +00:00
Amith Yamasani
c28fde57f0 am 0b515aec: am 3cfca67b: Merge "Fix possible integer overflow in MtpStorage"
# By Henrik Engström
# Via Android Git Automerger (1) and others
* commit '0b515aece642283a25c6a4416f0aecdaf17bdb58':
  Fix possible integer overflow in MtpStorage
2013-01-28 10:31:01 -08:00
Amith Yamasani
0b515aece6 am 3cfca67b: Merge "Fix possible integer overflow in MtpStorage"
# By Henrik Engström
# Via Gerrit Code Review (1) and Henrik Baard (1)
* commit '3cfca67b0f1e3f464274fa5d3b2e31e5288d8f38':
  Fix possible integer overflow in MtpStorage
2013-01-28 10:28:38 -08:00
Amith Yamasani
3cfca67b0f Merge "Fix possible integer overflow in MtpStorage" 2013-01-28 18:09:59 +00:00
Irfan Sheriff
be3d645798 am a56711a0: am 169dc398: Merge "Remove config_wifi_p2p_support from config.xml."
# By Yoshihiko Ikenaga
# Via Android Git Automerger (1) and others
* commit 'a56711a04618bbdcdaecf15e1815a5618e6b4737':
  Remove config_wifi_p2p_support from config.xml.
2013-01-28 08:16:23 -08:00
Irfan Sheriff
a56711a046 am 169dc398: Merge "Remove config_wifi_p2p_support from config.xml."
# By Yoshihiko Ikenaga
# Via Gerrit Code Review (1) and Yoshihiko Ikenaga (1)
* commit '169dc398ed946edae6fffa997e92871b711561d6':
  Remove config_wifi_p2p_support from config.xml.
2013-01-28 08:13:42 -08:00
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
Dirk Dougherty
df9fa4c602 Doc change: Explicitly declare pages that should use the 'sdk' page template. This simplifies the assignment of the 'sdk' hdf var in Doclava.
Change-Id: I0bf0c691db8f190215f95ab8659e28fd73a496d7
2013-01-25 12:55:16 -08: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
Irfan Sheriff
441a90dc72 am 3a0acc03: am 381fb8bd: Merge "Fix WPS configuration method of BSS enrollee."
# By Yoshihiko Ikenaga
# Via Android Git Automerger (1) and others
* commit '3a0acc03bb0f57df23b2c8e859acd37b80f42620':
  Fix WPS configuration method of BSS enrollee.
2013-01-24 16:12:00 -08:00
Irfan Sheriff
3a0acc03bb am 381fb8bd: Merge "Fix WPS configuration method of BSS enrollee."
# By Yoshihiko Ikenaga
# Via Gerrit Code Review (1) and Yoshihiko Ikenaga (1)
* commit '381fb8bdd10e6426f829e90f57686103529adb77':
  Fix WPS configuration method of BSS enrollee.
2013-01-24 10:22:28 -08:00
Irfan Sheriff
381fb8bdd1 Merge "Fix WPS configuration method of BSS enrollee." 2013-01-24 17:38:51 +00:00
Yoshihiko Ikenaga
1201dd9b70 Fix WPS configuration method of BSS enrollee.
Remove keypad from WPS configuration method of BSS enrollee
becuase JB UI does NOT support keypad, only supports pbc and
display.

Change-Id: I9ab6f1514805e8307b46e38261f1c657568aeb59
Signed-off-by: Yoshihiko Ikenaga <yoshihiko.ikenaga@jp.sony.com>
2013-01-24 13:48:58 +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
The Android Automerger
78675d743f merge in jb-mr1.1-release history after reset to jb-mr1.1-dev 2013-01-23 16:28:55 -08: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
17f05497be am c2469500: Merge "Touch action bar title text: you will go to space today!" into jb-mr1.1-dev
# Via Adam Powell (1) and Android (Google) Code Review (1)
* commit 'c246950043c4c48beb51d5b56d94473e77c5fad2':
  Touch action bar title text: you will go to space today!
2013-01-23 15:44:47 -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
6508304918 am 5a32ec32: Merge "Prevent simultaneous interaction with action bar and content" into jb-mr1.1-dev
# Via Adam Powell (1) and Android (Google) Code Review (1)
* commit '5a32ec323784ad7926bb9dc3b3678c9b60d3a4ba':
  Prevent simultaneous interaction with action bar and content
2013-01-23 15:24:18 -08:00
Adam Powell
5a32ec3237 Merge "Prevent simultaneous interaction with action bar and content" into jb-mr1.1-dev 2013-01-23 23:20:57 +00: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
Wink Saville
24dbdc7d0e am 23d85a91: am d84d289f: Merge "Telephony: Consider EVDO ecio zero value as valid."
* commit '23d85a911e46ac00ecaf146ca729aa3a46d17f59':
  Telephony: Consider EVDO ecio zero value as valid.
2013-01-23 09:42:03 -08:00
Wink Saville
23d85a911e am d84d289f: Merge "Telephony: Consider EVDO ecio zero value as valid."
* commit 'd84d289f443f5799fb1a81432428703dadb026dd':
  Telephony: Consider EVDO ecio zero value as valid.
2013-01-23 09:38:19 -08:00
Wink Saville
d84d289f44 Merge "Telephony: Consider EVDO ecio zero value as valid." 2013-01-23 17:15:59 +00:00
Christopher Tate
e93ca308c8 am 0e95685f: am b5a72043: Merge "Fix array index oob in Matrix3f.loadRotate()."
* commit '0e95685ff49c4d189464170cc03d2d74f23da475':
  Fix array index oob in Matrix3f.loadRotate().
2013-01-22 18:42:40 -08:00
Christopher Tate
0e95685ff4 am b5a72043: Merge "Fix array index oob in Matrix3f.loadRotate()."
* commit 'b5a7204313447101ad80c0c6015e930f1e6b1013':
  Fix array index oob in Matrix3f.loadRotate().
2013-01-22 18:39:55 -08:00
Stephen Hines
3983754bbb One more fix for incorrect indices.
Change-Id: I283f2f09cd0a17eefed4a763b08df856bbae76b3
2013-01-22 18:29:41 -08:00
Christopher Tate
b5a7204313 Merge "Fix array index oob in Matrix3f.loadRotate()." 2013-01-23 01:49:59 +00: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