38727 Commits

Author SHA1 Message Date
Kenny Root
572ec703d5 am a6472811: am 2e99d3c9: am ebb61ca2: Merge "Track libcore changes for OpenSSLKey"
# Via Android Git Automerger (2) and others
* commit 'a647281109584d96ba2265c0faa14432deeb9815':
  Track libcore changes for OpenSSLKey
2013-01-25 17:12:08 -08:00
Kenny Root
e7e0a07270 am 4dca3946: am df1498dc: am bf043b50: Merge "Add TLS Channel ID support to SSLCertificateSocketFactory."
# By Alex Klyubin
# Via Android Git Automerger (2) and others
* commit '4dca3946177aaea54d78d39273324caacf74a7bb':
  Add TLS Channel ID support to SSLCertificateSocketFactory.
2013-01-25 17:11:57 -08: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
Dianne Hackborn
b9781fe08c Merge "App ops: you can now turn off operations." 2013-01-25 19:33:11 +00:00
Dianne Hackborn
5e45ee6752 App ops: you can now turn off operations.
Also add new ops for calendar and wi-fi scans, finish
implementing rejection of content provider calls, fix
issues with rejecting location calls, fix bug in the
new pm call to retrieve apps with permissions.

Change-Id: I29d9f8600bfbbf6561abf6d491907e2bbf6af417
2013-01-25 11:25:48 -08:00
Fergus Henderson
1c2df38242 Fix logic error in Pszczepaniak's recent change.
Also improve wording of error message.

Bug: 7666482
Change-Id: I2d2316b10fdf394bec8963327529723cbd5fbb32
2013-01-25 14:59:59 +00: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
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
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
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
455bf078cd Import translations. DO NOT MERGE
Change-Id: Ibe1bebc4f75eb892503bb29519aa62574aa82c7e
Auto-generated-cl: translation import
2013-01-23 10:04:41 -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
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
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
f35a55769a am 58fb0002: am ecd3c76f: am 6458d9b1: Merge "Fix for truncated sentence in "Find on Page" field"
* commit '58fb00025daa78360a3d033b223d15364d49086f':
  Fix for truncated sentence in "Find on Page" field
2013-01-22 14:00:05 -08: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
Fabrice Di Meglio
7384db20b8 Merge "Fix bug #8052320 RelativeLayout is not having the correct width when in RTL mode - part 2" 2013-01-22 21:17:36 +00:00
Fabrice Di Meglio
547261320c Fix bug #8052320 RelativeLayout is not having the correct width when in RTL mode - part 2
This is a fix for  RelativeLayout in RTL mode

- visible effect: wrong positioning of components
- the width computation (first pass) in RTL mode was wrong: it was missing the application
of the horizontal rules before measuring the children horizontally. This is now doing the
same as the normal LTR pass (except positioning the component which is done in the second
pass)

See related issue:

bug #8051633 Recent Apps thumbnails in RTL mode (Arabic / Hebrew / Farsi) should be aligned

Change-Id: I710de1a504bec8743f8e3c13f6ff850055edb2d2
2013-01-22 13:14:08 -08:00
John Reck
6458d9b1b2 Merge "Fix for truncated sentence in "Find on Page" field" 2013-01-22 21:12:49 +00:00
Derek Sollenberger
0d7ddce178 Merge "Update version for serialized view (e.g. Saved Page)." 2013-01-22 20:21:13 +00:00
Przemyslaw Szczepaniak
9c4012b31b Make TextToSpeech.shutdown() work before init callback.
TextToSpeech.shutdown() never worked properly if was called before receiving
onServiceConnected in connection object. Also, due to recent changes,
TextToSpeech.shutdown() did not work until async task created in
onServiceConnected returned its result to the main thread.

This change makes .shutdown() work in all those cases. To allow that
runAction can now execute code with connection that's not fully setuped
- so we can shutt it down. Also, newly created connection is now hold in
new member variable mConnectingServiceConnection, so it can be closed
before receiving onServiceConnected callback.

Also, I changed name of OnServiceConnectedAsyncTask to
SetupConnectionAsyncTask, I find it more descriptive.

Bug: 8003757
Change-Id: I41d84cfdb8fa28fe44235fb4a9764fa8f3d0643c
2013-01-22 17:20:37 +00:00
Baligh Uddin
5e3ea0d01c Import translations. DO NOT MERGE
Change-Id: Iaa7f52a909d7b09c3863a823d103e03568b5ac58
Auto-generated-cl: translation import
2013-01-22 08:15:39 -08:00
Dianne Hackborn
cc7433470f Merge "New API to get app op information about a single package." 2013-01-19 02:47:29 +00:00
Dianne Hackborn
72e3983d38 New API to get app op information about a single package.
Change-Id: I986453d9bb4161da467fb820b12502464e936483
2013-01-18 18:36:09 -08:00
Michael Wright
7bf6a5c3c7 Merge "Adds enum value for KEYCODE_ASSIST" 2013-01-19 02:19:09 +00:00
Jeff Sharkey
e95724aebe Merge "Add LongSparseLongArray with tests." 2013-01-19 01:07:54 +00:00
Jeff Sharkey
dda73b5dcd Add LongSparseLongArray with tests.
Change-Id: Iae32ba7647601c587e30834379d7d3c2235c75b0
2013-01-18 16:59:14 -08:00
Robert Greenwalt
20da885caa Merge "Revert "Second pass tying into dns cache per interface"" 2013-01-19 00:36:12 +00:00
Robert Greenwalt
63837f455d Revert "Second pass tying into dns cache per interface"
This reverts commit f60f94a89e49c125f4aff6496710a0fb66579545

Change-Id: If52dffd5100a6b03275da0eabfa05e24c5ecada9
2013-01-19 00:34:07 +00:00