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

114915 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Leon Scroggins III
afbd777fda am ae1e8855: am 8e4b16d6: Merge "Update docs to state that mark is no longer called." into klp-dev 
* commit 'ae1e88553fa628dbf22aa5ed2659f5ea2c12793a':
  Update docs to state that mark is no longer called.
 2013-09-25 15:33:54 -07:00
Leon Scroggins III
ae1e88553f am 8e4b16d6: Merge "Update docs to state that mark is no longer called." into klp-dev 
* commit '8e4b16d67851ad5eb91c82955b3c3d59f0770b6b':
  Update docs to state that mark is no longer called.
 2013-09-25 15:30:55 -07:00
Leon Scroggins III
8e4b16d678 Merge "Update docs to state that mark is no longer called." into klp-dev 2013-09-25 22:27:25 +00:00
Alan Viverette
e4b0a9a940 am 607ea331: am 812b6426: Merge "Fix caption rendering" into klp-dev 
* commit '607ea331ebe6f133a7e95a0e37d4c00085646708':
  Fix caption rendering
 2013-09-25 15:26:57 -07:00
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
a18b561dee am 964fb590: am 3264ec7a: Merge "Fit and finish for navbar camera affordance" into klp-dev 
* commit '964fb590b08c53f36c0368c973b6a6b1f2a76bfb':
  Fit and finish for navbar camera affordance
 2013-09-25 15:10:55 -07: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
Leon Scroggins III
321bc46b3c Update docs to state that mark is no longer called. 
BUG:6493544

Change-Id: I97a4d90ce2efcd12f8f1cc5b545f822f8e5a5ab0
 2013-09-25 18:02:32 -04:00
Jim Miller
14176c6c0d am 132540d1: am d7fdcad2: Merge "Fix accessibility for all-caps items in keyguard" into klp-dev 
* commit '132540d1f5656145639f0206076d1ba63183bbfb':
  Fix accessibility for all-caps items in keyguard
 2013-09-25 14:58:28 -07: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
0a953478a6 am a0e531bb: am 82b05f59: Merge "Handle null stacks gracefully." into klp-dev 
* commit 'a0e531bba4716586b17b2cbd99257d1030a974f5':
  Handle null stacks gracefully.
 2013-09-25 14:49:43 -07: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
6add2a8337 am 3d837d23: am e7d6bbd6: Merge "Fix an incorrectly created race accessing Wifi Supplicant" into klp-dev 
* commit '3d837d23c5910123330fbe6d18256ecc56ac7fcb':
  Fix an incorrectly created race accessing Wifi Supplicant
 2013-09-25 14:16:19 -07:00
Marco Nelissen
55a701e923 am 3fa1d013: am d7b5f3da: Merge "Fix hang" into klp-dev 
* commit '3fa1d013a297605db9c8e2a4ef71f5bf9c888a24':
  Fix hang
 2013-09-25 14:16:15 -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
Eino-Ville Talvala
7b388f9035 am 6934e994: am 9ca833f4: Merge "Camera2: Add PASSIVE_UNFOCUSED autofocus state." into klp-dev 
* commit '6934e994a0b7e6c950df151690f0840075fec432':
  Camera2: Add PASSIVE_UNFOCUSED autofocus state.
 2013-09-25 12:38:07 -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
6885d577cb am 8715dc14: am 4213e68f: am 3a7d5f71: Merge "Replace SEAndroid with SELinux." 
* commit '8715dc1401557f5ec068f9214ab0712291a3b403':
  Replace SEAndroid with SELinux.
 2013-09-25 11:48:40 -07: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
Mike Lockwood
90079ba97a Merge "Cleanup Binder interface between sensorservice and BatteryStats" 2013-09-25 16:56:00 +00:00
Mike Lockwood
488bb0ed6a Cleanup Binder interface between sensorservice and BatteryStats 
Change-Id: I6ba542cea242e252864d562ba62f3b8136f09f90
 2013-09-25 09:27:18 -07:00
Baligh Uddin
7ee0edac09 am 39d07b27: (-s ours) am 1b87107b: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev 
* commit '39d07b2748cd388e7b8540a090ef455b965546ba':
  Import translations. DO NOT MERGE
 2013-09-25 09:26:36 -07:00
Baligh Uddin
d073e2de2f am 721e53e8: (-s ours) am 99296322: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev 
* commit '721e53e86b759a77e2f590e3586c76da577df1ae':
  Import translations. DO NOT MERGE
 2013-09-25 09:26:33 -07:00
Baligh Uddin
9f6765eadc am 467b5bee: (-s ours) am cb94b3ee: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev 
* commit '467b5bee65bb1d75b80d88f033c22611e57b429f':
  Import translations. DO NOT MERGE
 2013-09-25 09:26:30 -07:00
Baligh Uddin
6d4c93a907 am 6ba26547: (-s ours) am 9832b08a: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev 
* commit '6ba265479494a369b2c376b5c18d7fd308204b89':
  Import translations. DO NOT MERGE
 2013-09-25 09:26:28 -07:00
Baligh Uddin
36a57267e0 am f7710ea9: (-s ours) am c8321a59: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev 
* commit 'f7710ea93232c4246867d0f639fa16e62a397752':
  Import translations. DO NOT MERGE
 2013-09-25 09:26:25 -07:00
Baligh Uddin
4b896df2a2 am 88421cc4: (-s ours) am 46485d6d: (-s ours) Import translations. DO NOT MERGE 
* commit '88421cc4940879dee64635e724925966572808ed':
  Import translations. DO NOT MERGE
 2013-09-25 09:26:22 -07: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