Commit Graph

27939 Commits

Author SHA1 Message Date
Fergus Henderson
8cd9566c84 am 1c2df382: Fix logic error in Pszczepaniak\'s recent change.
# Via Fergus Henderson
* commit '1c2df38242c29cd7f359a6fb13dc13b387264310':
  Fix logic error in Pszczepaniak's recent change.
2013-01-25 07:29:24 -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
Adam Powell
bd0165d186 am 7195c8f2: 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 (4) and others
* commit '7195c8f25b6bfc7564701683d3e2e1ed1bdcfcc6':
  Touch action bar title text: you will go to space today!
2013-01-23 15:54:12 -08: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
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
7af76f20cd am d8ba6cc9: Merge "Add new API to propagate contextual data to the assist action"
# Via Android (Google) Code Review (1) and Dianne Hackborn (1)
* commit 'd8ba6cc9217e2e042106870e9d2e70cfd80426d6':
  Add new API to propagate contextual data to the assist action
2013-01-23 14:51:07 -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
58b33c3d87 am 846dda3f: Merge "Add new disabled state for "optional" built-in apps."
# Via Android (Google) Code Review (1) and Dianne Hackborn (1)
* commit '846dda3fa7a194b57acdb977e443c93c7cddcea1':
  Add new disabled state for "optional" built-in apps.
2013-01-23 14:47:17 -08: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
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
John Reck
02eb6b76fe am f35a5576: am 58fb0002: am ecd3c76f: am 6458d9b1: Merge "Fix for truncated sentence in "Find on Page" field"
* commit 'f35a55769ad81fb138e23f829b40feabc2ec7fc0':
  Fix for truncated sentence in "Find on Page" field
2013-01-22 14:21:21 -08: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
bb42f521dd am 7384db20: Merge "Fix bug #8052320 RelativeLayout is not having the correct width when in RTL mode - part 2"
* commit '7384db20b82b829d0e52642a58475846a27c0ca4':
  Fix bug #8052320 RelativeLayout is not having the correct width when in RTL mode - part 2
2013-01-22 13:21:31 -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
2a17755d0a am 0d7ddce1: Merge "Update version for serialized view (e.g. Saved Page)."
* commit '0d7ddce1784f106077484fee60f0565bc5b979f0':
  Update version for serialized view (e.g. Saved Page).
2013-01-22 12:27:01 -08:00
Derek Sollenberger
0d7ddce178 Merge "Update version for serialized view (e.g. Saved Page)." 2013-01-22 20:21:13 +00:00
Przemyslaw Szczepaniak
437932b972 am 9c4012b3: Make TextToSpeech.shutdown() work before init callback.
* commit '9c4012b31b0c09cb14689bd96a71aae42c8a00cd':
  Make TextToSpeech.shutdown() work before init callback.
2013-01-22 09:25:36 -08: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
Dianne Hackborn
d9c71435ca am cc743347: Merge "New API to get app op information about a single package."
* commit 'cc7433470f00fac3bbe7835de3ded4b9bf121244':
  New API to get app op information about a single package.
2013-01-18 18:51:48 -08: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
Jeff Sharkey
51ee44303f am e95724ae: Merge "Add LongSparseLongArray with tests."
* commit 'e95724aebec3a4a121fde3dfba761b80d2cd6922':
  Add LongSparseLongArray with tests.
2013-01-18 17:10:39 -08: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
02f63f77c2 am 20da885c: Merge "Revert "Second pass tying into dns cache per interface""
* commit '20da885caa27ee8148c61be0ff56451ad6bf8146':
  Revert "Second pass tying into dns cache per interface"
2013-01-18 16:39:07 -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 f60f94a89e

Change-Id: If52dffd5100a6b03275da0eabfa05e24c5ecada9
2013-01-19 00:34:07 +00:00
Dianne Hackborn
c152e16b07 am 8fea4e72: Merge "Rework ParceledListSlice to be much easier to use."
* commit '8fea4e72e4dcff9fa76168b9e26cf5907102f70b':
  Rework ParceledListSlice to be much easier to use.
2013-01-18 16:20:40 -08:00
Dianne Hackborn
8fea4e72e4 Merge "Rework ParceledListSlice to be much easier to use." 2013-01-19 00:18:40 +00:00
Kristian Monsen
53277e977d am 21af9258: Merge "Better detecting if current threasd is main thread"
* commit '21af9258f37dd9ea9e9ae66ce609d104faac48d6':
  Better detecting if current threasd is main thread
2013-01-18 16:01:50 -08:00
Kristian Monsen
21af9258f3 Merge "Better detecting if current threasd is main thread" 2013-01-18 23:58:33 +00:00
Ben Murdoch
ba900bf947 am 03d366e8: Merge "Refactor FindActionModeCallback."
* commit '03d366e89c11352aa0ba3ff7038f371211d1ce4e':
  Refactor FindActionModeCallback.
2013-01-18 15:29:13 -08:00
Ben Murdoch
03d366e89c Merge "Refactor FindActionModeCallback." 2013-01-18 23:26:12 +00:00
Ben Murdoch
52c9f7f950 Refactor FindActionModeCallback.
Refactor FindActionModeCallback to make it more suitable
for sharing between WebViewClassic and WebViewChromium.

Bug=5006564

Change-Id: Ic3156eb50f99033a17ba3f83d0b4f39ba992afa8
2013-01-18 23:18:09 +00:00
Kristian Monsen
0a30328c10 Better detecting if current threasd is main thread
Old approach got broken after:
https://googleplex-android-review.googlesource.com/#/c/266421/2

Change-Id: I12ae23efdbaebd8ba24acb1b7eff75c912d24f1d
2013-01-18 14:50:07 -08:00
Dake Gu
ef1215d98b am ebf7c743: am 85a06152: am fe88f1be: Merge "Fix bug of SimulatedTrackball" into jb-mr1-aah-dev
* commit 'ebf7c74361baefb826591bd90cdacd9244a2eb59':
  Fix bug of SimulatedTrackball
2013-01-18 14:08:22 -08:00
Dake Gu
ebf7c74361 am 85a06152: am fe88f1be: Merge "Fix bug of SimulatedTrackball" into jb-mr1-aah-dev
* commit '85a06152ce9b7d3a198639eb1918a9c2a3fd34d4':
  Fix bug of SimulatedTrackball
2013-01-18 14:01:57 -08: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
Dianne Hackborn
d8e1dbb6bc Rework ParceledListSlice to be much easier to use.
Take advantage of this to return better information about
packages filtered by permissions -- include the permissions
they have in the requested array.

Also fix issue #8026793 (Contact picture shows default pic
while searching for a contact in qsb) by using the base
package name of the Context when reporting the app name
of an operation.  Otherwise you could make a resource-only
context for another application and do calls through that
and get reported as the wrong app.

Change-Id: I5e0488bf773acea5a3d22f245641828e1a106fb8
2013-01-18 13:02:26 -08:00
Jeff Sharkey
37afa4a4ed am 5a0252da: Merge changes Ib8b18f1b,I0d799d82,Ia6222322
* commit '5a0252da779a98b98c0ef5053c2d20b7bd66de34':
  Always give ContentResolver a valid Context.
  Define failed connections column, and reset.
  Add method to get process group.
2013-01-17 18:48:22 -08:00
Jeff Sharkey
5a0252da77 Merge changes Ib8b18f1b,I0d799d82,Ia6222322
* changes:
  Always give ContentResolver a valid Context.
  Define failed connections column, and reset.
  Add method to get process group.
2013-01-18 02:44:50 +00:00
Jeff Sharkey
66a017b634 Always give ContentResolver a valid Context.
Also add MockContentResolver constructor to provide a Context, and
move to singleton ActivityThread, since there is only one inside
each process.  This makes ActivityThread accessible from threads like
InstrumentationThread.

Change-Id: Ib8b18f1b9bba8820ff412d782a43511066eabf24
2013-01-17 18:25:47 -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
Jeff Sharkey
54781207d3 Define failed connections column, and reset.
When retrying a download, always reset the failed connections count.

Bug: 8022478
Change-Id: I0d799d82dc7a04fe788b8c5faee0045d1e1a9c60
2013-01-17 17:27:33 -08:00