98784 Commits

Author SHA1 Message Date
Wink Saville
36b8d75f48 am 311ef539: (-s ours) am f0bf29df: am 1842f2ed: Merge "frameworks: Display missing text on SimUnlockScreen"
# By Anju Mathapati
# Via Android Git Automerger (2) and others
* commit '311ef539cffa35163eae64a93700ab049ceaf827':
  frameworks: Display missing text on SimUnlockScreen
2013-01-23 20:52:28 -08: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
Adam Powell
7195c8f25b am a41f9cfb: 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 (3) and others
* commit 'a41f9cfbbd1d137bf1baab49e0d453a40a0ecd33':
  Touch action bar title text: you will go to space today!
2013-01-23 15:52:28 -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
7868d748ad am ae041ce8: am ce2f911d: am 65083049: am 5a32ec32: Merge "Prevent simultaneous interaction with action bar and content" into jb-mr1.1-dev
# Via Android Git Automerger (3) and others
* commit 'ae041ce83d32c7b34d7c513e077165764e97871d':
  Prevent simultaneous interaction with action bar and content
2013-01-23 15:31:15 -08: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
Dianne Hackborn
d8ba6cc921 Merge "Add new API to propagate contextual data to the assist action" 2013-01-23 22:47:57 +00:00
Dianne Hackborn
51ff575d1b Merge "Fix issue #7649720: ANR occur when OTA with lower version..." 2013-01-23 22:46:01 +00:00
Dianne Hackborn
846dda3fa7 Merge "Add new disabled state for "optional" built-in apps." 2013-01-23 22:43:11 +00:00
Dianne Hackborn
f9c5e0fe83 Add new API to propagate contextual data to the assist action
When launching an assist, we have a new API allowing the
current foreground activity/application to provide additional
arbitrary contextual information that is stuffed in the
assist intent before it is launched.

Change-Id: I0b2a6f5a266dc42cc0175327fa76774f814af3b4
2013-01-23 14:39:13 -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
Baligh Uddin
00dcbf8f58 Merge "Import translations. DO NOT MERGE" 2013-01-23 22:15:52 +00:00
Winson Chung
79703fa00c Merge "Cleaning up listeners and AsyncTasks." 2013-01-23 22:08:37 +00:00
Baligh Uddin
455bf078cd Import translations. DO NOT MERGE
Change-Id: Ibe1bebc4f75eb892503bb29519aa62574aa82c7e
Auto-generated-cl: translation import
2013-01-23 10:04:41 -08:00
Wink Saville
d0c4ce4c3d am 24dbdc7d: am 23d85a91: am d84d289f: Merge "Telephony: Consider EVDO ecio zero value as valid."
* commit '24dbdc7d0e1e20b5c598561e7f5ed9c4dd335b7b':
  Telephony: Consider EVDO ecio zero value as valid.
2013-01-23 09:44:04 -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
7b3b2cfc29 am e93ca308: am 0e95685f: am b5a72043: Merge "Fix array index oob in Matrix3f.loadRotate()."
* commit 'e93ca308c8792b231ec921ba8a00e6c78e87f9ad':
  Fix array index oob in Matrix3f.loadRotate().
2013-01-22 18:45:50 -08: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
Dianne Hackborn
c4d27a7d55 Fix issue #7649720: ANR occur when OTA with lower version...
...of Play Store is included

The issue is that the name of the play store apk on the system
image has changed, and the package manager has a bug when this
happens and it is being hidden by an updated version of the
application that is still a newer version.  In this case it
doesn't do the normal scan of the system apk, but just leaves
its old disabled state.  However if the code path has changed,
this will trip up other code that thinks the system apk has
disappeared (since when it checks for the existence of the apk
with the stored code path, it doesn't find anything).

The fix here is to add a special case to make sure the code
path is updated even if we are otherwise ignoring the hidden
system image package data.

Change-Id: Ic5118f94c078da7a30b53b9cadf7c9844f7ba866
2013-01-22 18:30:17 -08:00
Christopher Tate
b5a7204313 Merge "Fix array index oob in Matrix3f.loadRotate()." 2013-01-23 01:49:59 +00:00
Jeff Sharkey
56dc0e02fc Merge "Tests to assert correct January behavior." 2013-01-23 01:35:21 +00:00
Jeff Sharkey
1539905b46 Tests to assert correct January behavior.
Change-Id: I162102b6f1b892b79e2f5b96cb0184abb85d00bc
2013-01-22 17:32:53 -08:00
Siva Velusamy
f9455fafb6 Support invoking view methods from hierarchy viewer
This CL adds support for invoking any view method with
primtive arguments, and setting layout parameters from
the debugger (hierarchy viewer).

requestLayout() and invalidate() are now just implemented
using the more generic invokeMethod() command.

Change-Id: Icffda251728a4963b35266786b0b6143bae7fe8e
2013-01-22 17:25:46 -08:00
Dianne Hackborn
fd7adedebf Add new disabled state for "optional" built-in apps.
The disabled state allows you to make an app disabled
except for whatever parts of the system still want to
provide access to them and automatically enable them
if the user want to use it.

Currently the input method manager service is the only
part of the system that supports this, so you can put
an IME in this state and it will generally look disabled
but still be available in the IME list and once selected
switched to the enabled state.

Change-Id: I77f01c70610d82ce9070d4aabbadec8ae2cff2a3
2013-01-22 17:10:23 -08:00
Baligh Uddin
6c6317a8ca Merge "Import translations. DO NOT MERGE" 2013-01-23 00:33:36 +00:00
Wink Saville
40c8c770e6 Merge "Add debug and some cleanup" 2013-01-23 00:24:47 +00:00
Elliott Hughes
ba7e0922c0 am ef5d1d63: am 6bcecb20: am b63e39a0: Merge "fix typo for symbol"
* commit 'ef5d1d635585b155ffc7882c916beee2a91e2ef2':
  fix typo for symbol
2013-01-22 16:23:36 -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
Wink Saville
91e8659aba Add debug and some cleanup
Change-Id: I866676a1ec4a338dcfe089cbf0483e5e546ded85
2013-01-22 16:01:58 -08:00
Stephen Hines
0ce7cdaffd Fix array index oob in Matrix3f.loadRotate().
https://code.google.com/p/android/issues/detail?id=42860

Change-Id: Idbf18576da3ad5b84b4209147dad34cc2f9044d2
2013-01-22 16:01:44 -08:00
Amith Yamasani
172175fea9 am 05f1f0ec: am 555b07df: am 2c64b539: am 596532d9: Properly initialize recognition service if the recognizer component changed.
* commit '05f1f0ece8f39e77c96825fb2e3451ebd388adad':
  Properly initialize recognition service if the recognizer component changed.
2013-01-22 15:51:14 -08:00
Amith Yamasani
05f1f0ece8 am 555b07df: am 2c64b539: am 596532d9: Properly initialize recognition service if the recognizer component changed.
* commit '555b07df08dd4c2472374d0767926ebab928dede':
  Properly initialize recognition service if the recognizer component changed.
2013-01-22 15:48:10 -08:00
Amith Yamasani
555b07df08 am 2c64b539: am 596532d9: Properly initialize recognition service if the recognizer component changed.
* commit '2c64b53976a99f28bc7c0612648581f9b93bf8b0':
  Properly initialize recognition service if the recognizer component changed.
2013-01-22 15:46:25 -08:00
Amith Yamasani
2c64b53976 am 596532d9: Properly initialize recognition service if the recognizer component changed.
* commit '596532d9dbea3460dbc989b0316c721ca69f4915':
  Properly initialize recognition service if the recognizer component changed.
2013-01-22 15:43:53 -08:00
Jason Sams
806f133e41 Merge "Turn off vector code for tests where this reduces performance." 2013-01-22 23:38:36 +00:00