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

113593 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Alan Viverette
607ea331eb am 812b6426: Merge "Fix caption rendering" into klp-dev 
* commit '812b64264176cb8a253a8253074bc9595503d2ac':
  Fix caption rendering
 2013-09-25 15:23:50 -07:00
Alan Viverette
812b642641 Merge "Fix caption rendering" into klp-dev 2013-09-25 22:21:08 +00:00
Jim Miller
964fb590b0 am 3264ec7a: Merge "Fit and finish for navbar camera affordance" into klp-dev 
* commit '3264ec7ab5efe8592523a68d4b69c5f2f8f514da':
  Fit and finish for navbar camera affordance
 2013-09-25 15:07:49 -07:00
Jim Miller
3264ec7ab5 Merge "Fit and finish for navbar camera affordance" into klp-dev 2013-09-25 22:04:49 +00:00
Jim Miller
132540d1f5 am d7fdcad2: Merge "Fix accessibility for all-caps items in keyguard" into klp-dev 
* commit 'd7fdcad22683e6191e92141a7e45e2414fe40a44':
  Fix accessibility for all-caps items in keyguard
 2013-09-25 14:55:31 -07:00
Jim Miller
d7fdcad226 Merge "Fix accessibility for all-caps items in keyguard" into klp-dev 2013-09-25 21:53:41 +00:00
Jeff Sharkey
a0e531bba4 am 82b05f59: Merge "Handle null stacks gracefully." into klp-dev 
* commit '82b05f599bf3c84e53d42599ef257b3e9642855d':
  Handle null stacks gracefully.
 2013-09-25 14:46:33 -07:00
Jeff Sharkey
82b05f599b Merge "Handle null stacks gracefully." into klp-dev 2013-09-25 21:43:44 +00:00
Jeff Sharkey
6a20e57411 Handle null stacks gracefully. 
Bug: 10928395
Change-Id: Ie7c3f7e0eb068ece0cf678a5d6346f18a413856b
 2013-09-25 14:39:14 -07:00
Vinit Deshapnde
3d837d23c5 am e7d6bbd6: Merge "Fix an incorrectly created race accessing Wifi Supplicant" into klp-dev 
* commit 'e7d6bbd67fbf50fdff87d1bee67e3410904867c5':
  Fix an incorrectly created race accessing Wifi Supplicant
 2013-09-25 14:11:04 -07:00
Marco Nelissen
3fa1d013a2 am d7b5f3da: Merge "Fix hang" into klp-dev 
* commit 'd7b5f3dab1c3bc0aa98698314183149426559a3c':
  Fix hang
 2013-09-25 14:11:01 -07:00
Vinit Deshapnde
e7d6bbd67f Merge "Fix an incorrectly created race accessing Wifi Supplicant" into klp-dev 2013-09-25 21:07:51 +00:00
Marco Nelissen
d7b5f3dab1 Merge "Fix hang" into klp-dev 2013-09-25 21:06:47 +00:00
Marco Nelissen
fd2e50086c Fix hang 
b/10855561

Change-Id: I29b046b835ce0ca3644e5c2e8f9bca5c0b380d4b
 2013-09-25 13:45:41 -07:00
Alan Viverette
7fe420f31b Fix caption rendering 
Fixed rendering of captions in regions and incorrect caption width
measurement. Removes minimum-difference line wrapping, since the
results weren't consistent with StaticLayout's rendering.

BUG: 10917766, 10822229
Change-Id: I55ef28cbf383fd6b945c0be62e440781288364f1
 2013-09-25 12:35:00 -07:00
Eino-Ville Talvala
6934e994a0 am 9ca833f4: Merge "Camera2: Add PASSIVE_UNFOCUSED autofocus state." into klp-dev 
* commit '9ca833f4a5eca732b1618bc1a183215c21ae11e5':
  Camera2: Add PASSIVE_UNFOCUSED autofocus state.
 2013-09-25 12:32:53 -07:00
Eino-Ville Talvala
9ca833f4a5 Merge "Camera2: Add PASSIVE_UNFOCUSED autofocus state." into klp-dev 2013-09-25 19:28:03 +00:00
Dianne Hackborn
8715dc1401 am 4213e68f: am 3a7d5f71: Merge "Replace SEAndroid with SELinux." 
* commit '4213e68f67d59c0912d2a8729fcec4539197756a':
  Replace SEAndroid with SELinux.
 2013-09-25 11:45:38 -07:00
Dianne Hackborn
4213e68f67 am 3a7d5f71: Merge "Replace SEAndroid with SELinux." 
* commit '3a7d5f71456b57f712b0f878beb5317f0ce6d564':
  Replace SEAndroid with SELinux.
 2013-09-25 11:42:07 -07:00
Dianne Hackborn
3a7d5f7145 Merge "Replace SEAndroid with SELinux." 2013-09-25 18:39:58 +00:00
Baligh Uddin
39d07b2748 am 1b87107b: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev 
* commit '1b87107bb37be580888f1617d047ca9009c18a7f':
  Import translations. DO NOT MERGE
 2013-09-25 09:23:24 -07:00
Baligh Uddin
721e53e86b am 99296322: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev 
* commit '99296322bc5ae3aabf89bd2b424492ec93b35c1a':
  Import translations. DO NOT MERGE
 2013-09-25 09:23:21 -07:00
Baligh Uddin
467b5bee65 am cb94b3ee: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev 
* commit 'cb94b3ee54df1485cc6a0757d91f0af01651fa1a':
  Import translations. DO NOT MERGE
 2013-09-25 09:23:18 -07:00
Baligh Uddin
6ba2654794 am 9832b08a: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev 
* commit '9832b08a49adaee5c3bb7c51ce0f6db78ccf11e2':
  Import translations. DO NOT MERGE
 2013-09-25 09:23:15 -07:00
Baligh Uddin
f7710ea932 am c8321a59: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev 
* commit 'c8321a59a30b9fd5d3adfde30e95a9a827f4f554':
  Import translations. DO NOT MERGE
 2013-09-25 09:23:12 -07:00
Baligh Uddin
88421cc494 am 46485d6d: (-s ours) Import translations. DO NOT MERGE 
* commit '46485d6df60e11d04d976bc7ec5c9c8cdec14900':
  Import translations. DO NOT MERGE
 2013-09-25 09:23:09 -07:00
Baligh Uddin
1b87107bb3 Merge "Import translations. DO NOT MERGE" into klp-dev 2013-09-25 16:19:07 +00:00
Baligh Uddin
99296322bc Merge "Import translations. DO NOT MERGE" into klp-dev 2013-09-25 16:18:59 +00:00
Baligh Uddin
cb94b3ee54 Merge "Import translations. DO NOT MERGE" into klp-dev 2013-09-25 16:18:50 +00:00
Baligh Uddin
9832b08a49 Merge "Import translations. DO NOT MERGE" into klp-dev 2013-09-25 16:18:39 +00:00
Baligh Uddin
c8321a59a3 Merge "Import translations. DO NOT MERGE" into klp-dev 2013-09-25 16:18:14 +00:00
Baligh Uddin
18b7abffef Import translations. DO NOT MERGE 
Change-Id: Id86ce8166f481fa6a360ebb479f2e420ead1ee15
Auto-generated-cl: translation import
 2013-09-25 09:13:10 -07:00
Baligh Uddin
6cdfb390b0 Import translations. DO NOT MERGE 
Change-Id: Iea99a461037b5ef6dc3cd573b594b483692222ef
Auto-generated-cl: translation import
 2013-09-25 09:11:27 -07:00
Baligh Uddin
86d7136377 Import translations. DO NOT MERGE 
Change-Id: Ifaa3920e5a0d002b7bdb9eb668acf5cbc36729fc
Auto-generated-cl: translation import
 2013-09-25 09:07:42 -07:00
Baligh Uddin
a529729f2c Import translations. DO NOT MERGE 
Change-Id: If20827776d647c8120b53065eb304b7d01409cd6
Auto-generated-cl: translation import
 2013-09-25 09:06:40 -07:00
Baligh Uddin
916dc3dcae Import translations. DO NOT MERGE 
Change-Id: I16a7cfc8d9c5926a40a4ddca551f4281accb415f
Auto-generated-cl: translation import
 2013-09-25 08:43:59 -07:00
Baligh Uddin
46485d6df6 Import translations. DO NOT MERGE 
Change-Id: Id5391f651538cc46ad7455dedaa3426e29efc9c9
Auto-generated-cl: translation import
 2013-09-25 08:42:54 -07:00
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
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
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
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
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
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
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