drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
114,907 Commits 1 Branch 0 Tags
Commit Graph

114907 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jean Chalard
424054ba62 am 6a1e32ef: Merge "Don\'t change the text in reaction to a user dict add" into klp-dev 
* commit '6a1e32efb686bd5606f62076c70f399ff3bdc37d':
  Don't change the text in reaction to a user dict add
 2013-09-25 08:11:31 -07:00
Przemyslaw Szczepaniak
58f1665372 Catch MissingResourceException caused by bad locale in TTS. 
Malformed locale objects will throw MissingResourceException
from getISO3Country() and getISO3Language() methods.

This change guard against the case where device default locale is
malformed and user tries to get TTS default locale (b/10814409)
and case where user tries to pass bad locale as argument to
TextToSpeech.getFeatures method (b/10494193).

Bug:10494193,10814409
Change-Id: Ie54d5d30bb042324da0c0d19b77c3a932c5642f7
 2013-09-25 10:01:27 +00:00
Jean Chalard
6a1e32efb6 Merge "Don't change the text in reaction to a user dict add" into klp-dev 2013-09-25 07:50:15 +00:00
Christopher Tate
23051cac04 am 6098618d: am 044fd573: Merge "Don\'t crash when no alarms are scheduled" into klp-dev 
* commit '6098618d8ebabd06b8d1eb8e8fceb60ec68839ed':
  Don't crash when no alarms are scheduled
 2013-09-24 18:25:06 -07:00
Christopher Tate
6098618d8e am 044fd573: Merge "Don\'t crash when no alarms are scheduled" into klp-dev 
* commit '044fd573ce58142309f9fc503cf5d52af447d082':
  Don't crash when no alarms are scheduled
 2013-09-24 18:23:16 -07:00
Christopher Tate
044fd573ce Merge "Don't crash when no alarms are scheduled" into klp-dev 2013-09-25 01:20:38 +00:00
Elliott Hughes
a4fbd6ddca am e713f57a: am d82b1c3b: am 9d8721f8: Merge "Remove dead code." 
* commit 'e713f57a6ebbeb6571226422c42c2c3d6c113a9a':
  Remove dead code.
 2013-09-24 17:56:15 -07:00
Elliott Hughes
e713f57a6e am d82b1c3b: am 9d8721f8: Merge "Remove dead code." 
* commit 'd82b1c3bf2abbc1582c90362267650cf05d38cd5':
  Remove dead code.
 2013-09-24 17:54:42 -07:00
Elliott Hughes
d82b1c3bf2 am 9d8721f8: Merge "Remove dead code." 
* commit '9d8721f8abb018429e3dba2296bce789b776aa0c':
  Remove dead code.
 2013-09-24 17:51:58 -07:00
Elliott Hughes
9d8721f8ab Merge "Remove dead code." 2013-09-25 00:47:54 +00:00
Vinit Deshapnde
6029611e3a Fix an incorrectly created race accessing Wifi Supplicant 
ScanModeState is trying to undo whatever it did in its enter(), in its
exit() function. But doing that is incorrect because it is possible to
transition to multiple states that require different conditions.

In this bug, the state machine transitioned from ScanModeState to
WaitForP2pDisabled state; in response to Stop Supplicant command. Well,
when we are trying to stop supplicant, there is clearly no need to
enable P2P or load all networks. But since this code exists in exit(),
it is executed nonetheless, causing race conditions accessing the
wpa_supplicant (WifiStateMachine is trying to shut it down, but
P2pStateMachine is trying to bring up the p2p interfaces).

We solve that problem by moving this code to the place where we transition
to DisconnectedState - since that's the state that needs this as a
precondition.

Bug: 10761752
Change-Id: Iaf0ffd8056de8533b5d2bfdf8c440fbb7e406dac
 2013-09-24 17:38:09 -07:00
Craig Mautner
e4a0bf8dba am f77c1eb1: am 8488f9fa: Merge "Be less aggressive when not resuming top activity" into klp-dev 
* commit 'f77c1eb1e0160364bb23972238952ee4f7b08c29':
  Be less aggressive when not resuming top activity
 2013-09-24 17:36:56 -07:00
Craig Mautner
f77c1eb1e0 am 8488f9fa: Merge "Be less aggressive when not resuming top activity" into klp-dev 
* commit '8488f9fa2e38e75e7ecbaac7d776900f8f1e5917':
  Be less aggressive when not resuming top activity
 2013-09-24 17:31:57 -07:00
Jason Sams
f684b81580 Merge "Remove hidden API setSurfaceTexture." 2013-09-25 00:29:32 +00:00
Craig Mautner
8488f9fa2e Merge "Be less aggressive when not resuming top activity" into klp-dev 2013-09-25 00:28:20 +00:00
Elliott Hughes
4b395a3625 Remove dead code. 
This hasn't been used since at least 2011, and we're no longer
shipping the data supporting it either.

Change-Id: Ibe42057650b49794c65d6f0d54ed7a492f3b594b
 2013-09-24 17:22:11 -07:00
Christopher Tate
6578ad17ca Don't crash when no alarms are scheduled 
Backing until you hear glass is generally contraindicated.

Bug 10056484

Change-Id: Ie1331fbbc5fbb5d6384a6cfc975aa1840a5c9a2d
 2013-09-24 17:12:46 -07:00
Jean-Michel Trivi
8a7ae6708d am 6dda4984: am 80e8a28c: Merge "Fix artwork not received in RemoteController metadata update." into klp-dev 
* commit '6dda4984cf636c2804ee6c6b109bcbb69d4baa04':
  Fix artwork not received in RemoteController metadata update.
 2013-09-24 16:42:49 -07:00
Jean-Michel Trivi
6dda4984cf am 80e8a28c: Merge "Fix artwork not received in RemoteController metadata update." into klp-dev 
* commit '80e8a28c339e88b59b681eff20d5438526d6b699':
  Fix artwork not received in RemoteController metadata update.
 2013-09-24 16:40:03 -07:00
Jean-Michel Trivi
80e8a28c33 Merge "Fix artwork not received in RemoteController metadata update." into klp-dev 2013-09-24 23:37:22 +00:00
Craig Mautner
6ff6d010d1 Be less aggressive when not resuming top activity 
The previous fix for keeping activities from running on startup,
ag/363992, was keeping the home task from launching when the
keyguard should have allowed it.

This fix permits the home activity to launch in such situations.

Fixes bug 10916877.

Change-Id: I429f0d5a13e06a247b9b6b7241f9a3514044c371
 2013-09-24 16:21:54 -07:00
Svetoslav
62034df44d am de31fbe0: am b55afe8b: Merge "User should not be able to select unavailable printers." into klp-dev 
* commit 'de31fbe04a75d9a8c3c163fbebeacd052ce54e72':
  User should not be able to select unavailable printers.
 2013-09-24 16:21:31 -07:00
Svetoslav
de31fbe04a am b55afe8b: Merge "User should not be able to select unavailable printers." into klp-dev 
* commit 'b55afe8b835da2d0ebe596877bf93076e4726724':
  User should not be able to select unavailable printers.
 2013-09-24 16:17:43 -07:00
Svetoslav
b55afe8b83 Merge "User should not be able to select unavailable printers." into klp-dev 2013-09-24 23:15:58 +00:00
Jim Miller
e38c8e28ba Fix accessibility for all-caps items in keyguard 
This fixes a bug where TTS on all-caps items doesn't work for
Buttons.  The fix is to use translation (ala. TextView.setAllCaps()),
which just affects rendering and not the original text string.

Fix bug 10912259

Change-Id: Id8cba927819c979fe699353219d45f8b0f9f5aac
 2013-09-24 15:54:04 -07:00
Rob Tsuk
ab80dc43c9 am f86598e6: am 198a7b5c: Merge "Replace blue highlight feedback with gray." into klp-dev 
* commit 'f86598e6eca5375e0312b5ec72e8da0e8fcca094':
  Replace blue highlight feedback with gray.
 2013-09-24 15:50:59 -07:00
Rob Tsuk
f86598e6ec am 198a7b5c: Merge "Replace blue highlight feedback with gray." into klp-dev 
* commit '198a7b5cb1ddb4c4e7c24537a7d3451913f7dd4c':
  Replace blue highlight feedback with gray.
 2013-09-24 15:47:35 -07:00
Svetoslav
2a708617df User should not be able to select unavailable printers. 
1. If the printer is unavailable we should not allow the user
   to select it. Rather, show it grayed out.

2. Some string changes requeted by translators.

bug:10917222

Change-Id: I370f05f9c8e70e3f077db7eb02cf48e19a59925d
 2013-09-24 15:46:17 -07:00
Rob Tsuk
198a7b5cb1 Merge "Replace blue highlight feedback with gray." into klp-dev 2013-09-24 22:44:38 +00:00
Michael Wright
7235ae06a1 am f8ea6dd6: am 870cb435: Merge "Mirror DocumentsUI assets for RTL layouts" into klp-dev 
* commit 'f8ea6dd6cb974499b66a8cf1262e34ff0e789e15':
  Mirror DocumentsUI assets for RTL layouts
 2013-09-24 15:44:04 -07:00
Adam Powell
51d6615af4 am 8dcc0e7d: am 7ef9b612: Merge "Fix monkey bugs in ListView" into klp-dev 
* commit '8dcc0e7dfb05a50ca306942037015244060862b8':
  Fix monkey bugs in ListView
 2013-09-24 15:44:01 -07:00
Adam Powell
4900f13ee4 am 7be7d86c: am 5ded30c9: Merge "Asset import from ux-assets" into klp-dev 
* commit '7be7d86ce9d15ab94ace2e69fc192c226ad18a3b':
  Asset import from ux-assets
 2013-09-24 15:43:58 -07:00
Michael Wright
f8ea6dd6cb am 870cb435: Merge "Mirror DocumentsUI assets for RTL layouts" into klp-dev 
* commit '870cb43585b2432622c807e762dd7992de4eb0f1':
  Mirror DocumentsUI assets for RTL layouts
 2013-09-24 15:40:47 -07:00
Adam Powell
8dcc0e7dfb am 7ef9b612: Merge "Fix monkey bugs in ListView" into klp-dev 
* commit '7ef9b612412a2169c8c0e0b3506b06516cb012b5':
  Fix monkey bugs in ListView
 2013-09-24 15:40:44 -07:00
Adam Powell
7be7d86ce9 am 5ded30c9: Merge "Asset import from ux-assets" into klp-dev 
* commit '5ded30c9b780c584c9d1984cc019f7d1d0b38fe5':
  Asset import from ux-assets
 2013-09-24 15:40:41 -07:00
Michael Wright
870cb43585 Merge "Mirror DocumentsUI assets for RTL layouts" into klp-dev 2013-09-24 22:39:07 +00:00
Adam Powell
7ef9b61241 Merge "Fix monkey bugs in ListView" into klp-dev 2013-09-24 22:38:37 +00:00
Adam Powell
5ded30c9b7 Merge "Asset import from ux-assets" into klp-dev 2013-09-24 22:38:22 +00:00
Adam Powell
31986b5b69 Fix monkey bugs in ListView 
* Don't run item click listeners as part of touch mode reset if the
  ListView is being detached from its window. Some calling code makes
  assumptions around this.

* Remove redundant state tracking for window attachment from
  AbsListView now that we have View#isAttachedToWindow(). The timing
  of View's mechanism is closer to what we want here anyway -
  subclasses calling super.onDetachedFromWindow() as the first line of
  an overridden onDetachedFromWindow() method will see the window as
  being in a detached state while the rest of the method runs,
  resulting in the behavior described in the first bullet point above.

Bug 10834897

Change-Id: Ic9fdff3c5cfc4996361a7fb1a863547b4d1a2c9c
 2013-09-24 15:20:07 -07:00
Jason Sams
3a1b8e4116 Remove hidden API setSurfaceTexture. 
Change-Id: Ib6a3c5b84550932168f314375e74059507fc01ae
 2013-09-24 15:18:52 -07:00
Adam Powell
2878b06d4a Asset import from ux-assets 
Import changed assets as detailed in bug 10496653

Change-Id: I53fd9479031e7eabb6480c58a26da6312fdb7ec7
 2013-09-24 15:10:25 -07:00
Dianne Hackborn
23ff9f6128 am 9b7d1484: am 5f86b90b: Merge "Fix issue #10848916: "Always" button is not working." into klp-dev 
* commit '9b7d148466b1aedb24187294e0c59718afb104a0':
  Fix issue #10848916: "Always" button is not working.
 2013-09-24 14:51:06 -07:00
Dianne Hackborn
9b7d148466 am 5f86b90b: Merge "Fix issue #10848916: "Always" button is not working." into klp-dev 
* commit '5f86b90b8a224e21db89bacf78d4bd4d3f44342d':
  Fix issue #10848916: "Always" button is not working.
 2013-09-24 14:49:17 -07:00
Jim Miller
8de9e443d8 Fit and finish for navbar camera affordance 
- fix potential event dispatch bug where camera events weren't always propagated
- fix DelegateViewHelper to always propagate events, even when disabled

Bug 10332383

Change-Id: Ie082d3074fc6497ee3633dcc0a51a6b08bcf0037
 2013-09-24 14:46:50 -07:00
Dianne Hackborn
5f86b90b8a Merge "Fix issue #10848916: "Always" button is not working." into klp-dev 2013-09-24 21:46:17 +00:00
Alan Viverette
e3b71bc910 am 4e10483d: am 6bc7cacf: Merge "Fix NPE in PopupMenu.getDragToOpenListener()" into klp-dev 
* commit '4e10483de3a28041e1108633752581cb0fc77483':
  Fix NPE in PopupMenu.getDragToOpenListener()
 2013-09-24 14:38:51 -07:00
Alan Viverette
4e10483de3 am 6bc7cacf: Merge "Fix NPE in PopupMenu.getDragToOpenListener()" into klp-dev 
* commit '6bc7cacfc8c34512278460028b7f6f0a4be220b4':
  Fix NPE in PopupMenu.getDragToOpenListener()
 2013-09-24 14:33:50 -07:00
Rob Tsuk
dbef227670 Replace blue highlight feedback with gray. 
Change-Id: Idf95742261cdc19b25b0aa5e1e8c8cb9685e7fe5
 2013-09-24 14:33:12 -07:00
Alan Viverette
6bc7cacfc8 Merge "Fix NPE in PopupMenu.getDragToOpenListener()" into klp-dev 2013-09-24 21:28:56 +00:00
John Spurlock
caf2afc1fd am 8d87227c: am 0ab7d4d1: Merge "Remove Rect allocation in each layout pass." into klp-dev 
* commit '8d87227c02f31ee63f80b20b0fd6bb8212d34997':
  Remove Rect allocation in each layout pass.
 2013-09-24 14:21:12 -07:00