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

127626 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Craig Mautner
ee8a81c4c4 am 4c4b1d65: Merge "Fix build due to bad javadoc link." 
* commit '4c4b1d65ff65ec2a6b45047ff24284989dbeb8b7':
  Fix build due to bad javadoc link.
 2014-04-04 02:00:34 +00:00
Craig Mautner
4c4b1d65ff Merge "Fix build due to bad javadoc link." 2014-04-04 01:57:47 +00:00
Jeff Tinker
c22e5339b6 am 8d0c89ad: Merge "resolved conflicts for merge of 4f342e87 to master" 
* commit '8d0c89ad16193e98c7a96f13d8f03a05e75a0f4a':
  resolved conflicts for merge of 4f342e87 to master
 2014-04-04 01:55:50 +00:00
Christopher Tate
2d79bb2300 am ed3db02c: Significant preconditions are significant 
* commit 'ed3db02c051f52f9ad3770e3c6b5b90c71a04fb1':
  Significant preconditions are significant
 2014-04-04 01:55:44 +00:00
Craig Mautner
529a43f719 Fix build due to bad javadoc link. 
Change-Id: I83ca32611fb72b79be271dc3a5bd848934e9174f
 2014-04-03 18:54:52 -07:00
Deepanshu Gupta
30e59135b1 am c07a48be: Merge "Fix a bug in Nine Patch library. [DO NOT MERGE]" into jb-mr2-dev 
* commit 'c07a48bed2c772dc548423396b208331b22a679a':
  Fix a bug in Nine Patch library. [DO NOT MERGE]
 2014-04-04 01:54:13 +00:00
Deepanshu Gupta
af60289e69 am 70dfe865: Merge "Add missing files to fix libphonenumber for layoutlib. [DO NOT MERGE]" into jb-mr2-dev 
* commit '70dfe865013f0c8fedf2c9468360a41b02fcce0a':
  Add missing files to fix libphonenumber for layoutlib. [DO NOT MERGE]
 2014-04-04 01:54:10 +00:00
Deepanshu Gupta
07d5f94e6b am 2eb5f9e5: Merge "Add libphonenumber to layoutlib.jar. [DO NOT MERGE]" into jb-mr2-dev 
* commit '2eb5f9e5b25dc769e5ba205237097c67fa212fd6':
  Add libphonenumber to layoutlib.jar. [DO NOT MERGE]
 2014-04-04 01:54:08 +00:00
Deepanshu Gupta
5c77c126b2 am b6588c52: Merge "Fix NPE in layoutlib. [DO NOT MERGE]" into jb-mr2-dev 
* commit 'b6588c522451f5015c2cbc902d5a72566f979f2b':
  Fix NPE in layoutlib. [DO NOT MERGE]
 2014-04-04 01:54:05 +00:00
Deepanshu Gupta
ef9f3043f5 am 3bc5b23f: Merge "Fix layoutlib [DO NOT MERGE]" into jb-mr2-dev 
* commit '3bc5b23f8dbb6ecc4eeac4334f94682056d0cb3b':
  Fix layoutlib [DO NOT MERGE]
 2014-04-04 01:54:03 +00:00
Deepanshu Gupta
6094daa262 am ba0ce056: Merge "Fix text size in Fake Action Bar. [DO NOT MERGE]" into jb-mr2-dev 
* commit 'ba0ce05688ff7ebf91e16f5cb741701feb706fc2':
  Fix text size in Fake Action Bar. [DO NOT MERGE]
 2014-04-04 01:54:00 +00:00
Ricardo Cervera
07aac5e346 docs: Moved small section in Build your project with Gradle doc. Bug: 13767801 
Change-Id: Ibf718f6051aabaf1120d4245ffc870fa928138be
 2014-04-03 18:04:41 -07:00
Deepanshu Gupta
c07a48bed2 Merge "Fix a bug in Nine Patch library. [DO NOT MERGE]" into jb-mr2-dev 2014-04-04 00:45:45 +00:00
Deepanshu Gupta
70dfe86501 Merge "Add missing files to fix libphonenumber for layoutlib. [DO NOT MERGE]" into jb-mr2-dev 2014-04-04 00:45:29 +00:00
Deepanshu Gupta
2eb5f9e5b2 Merge "Add libphonenumber to layoutlib.jar. [DO NOT MERGE]" into jb-mr2-dev 2014-04-04 00:45:13 +00:00
Deepanshu Gupta
b6588c5224 Merge "Fix NPE in layoutlib. [DO NOT MERGE]" into jb-mr2-dev 2014-04-04 00:44:02 +00:00
Deepanshu Gupta
3bc5b23f8d Merge "Fix layoutlib [DO NOT MERGE]" into jb-mr2-dev 2014-04-04 00:43:48 +00:00
Deepanshu Gupta
ba0ce05688 Merge "Fix text size in Fake Action Bar. [DO NOT MERGE]" into jb-mr2-dev 2014-04-04 00:43:08 +00:00
Jeff Tinker
8d0c89ad16 Merge "resolved conflicts for merge of 4f342e87 to master" 2014-04-04 00:30:28 +00:00
Christopher Tate
ed3db02c05 Significant preconditions are significant 
If you are going to check whether we've failed yet, make sure that
the default state to test against has been established properly.

Bug 13790971

Change-Id: I7fc6ff1bbbd9e569df59dcb65cc30f120c128efa
 2014-04-03 16:21:01 -07:00
Raph Levien
63b3d8c62e Fix extra text appearing after ellipsis 
This is a fix for bug 7615701 TextView: calling setText with long
strings causes ellipsize to not work correctly. The problem is that the
"break" when the last line was ellipsized did not fully break out of
both loops of the processing logic, but only the inner loop. This
caused the outer loop to restart at the next span, causing the next span
boundary to overwrite the line end of the last visible line.

The fix simply returns from the function in that case, as there is no
further processing needing to be done.

Change-Id: I5b34233ffba6f0f6f1c12b9565b4fc53e83a4892
 2014-04-03 15:52:08 -07:00
Xavier Ducrohet
f23e927a67 am 232f7f0e: am 72b2f536: (-s ours) am 76c484de: am d93b0b67: am e448bcf7: Merge "Add missing dependency in layoutlib build file [DO NOT MERGE]" into klp-dev 
* commit '232f7f0e191e07030821ff6ee360fbcc0a83756a':
  Add missing dependency in layoutlib build file [DO NOT MERGE]
 2014-04-03 22:36:05 +00:00
Xavier Ducrohet
232f7f0e19 am 72b2f536: (-s ours) am 76c484de: am d93b0b67: am e448bcf7: Merge "Add missing dependency in layoutlib build file [DO NOT MERGE]" into klp-dev 
* commit '72b2f536908f0f3249c59c630f1a06af371b2bfa':
  Add missing dependency in layoutlib build file [DO NOT MERGE]
 2014-04-03 22:30:44 +00:00
Xavier Ducrohet
72b2f53690 am 76c484de: am d93b0b67: am e448bcf7: Merge "Add missing dependency in layoutlib build file [DO NOT MERGE]" into klp-dev 
* commit '76c484de88317fbadc8a070fc333d4fb14355335':
  Add missing dependency in layoutlib build file [DO NOT MERGE]
 2014-04-03 22:24:47 +00:00
Xavier Ducrohet
76c484de88 am d93b0b67: am e448bcf7: Merge "Add missing dependency in layoutlib build file [DO NOT MERGE]" into klp-dev 
* commit 'd93b0b67754f6d06407086278298f44156458216':
  Add missing dependency in layoutlib build file [DO NOT MERGE]
 2014-04-03 22:17:10 +00:00
Xavier Ducrohet
d93b0b6775 am e448bcf7: Merge "Add missing dependency in layoutlib build file [DO NOT MERGE]" into klp-dev 
* commit 'e448bcf71adec7b94e2a67ed06d0a725b80c31d8':
  Add missing dependency in layoutlib build file [DO NOT MERGE]
 2014-04-03 22:10:38 +00:00
Xavier Ducrohet
e448bcf71a Merge "Add missing dependency in layoutlib build file [DO NOT MERGE]" into klp-dev 2014-04-03 22:05:25 +00:00
Winson Chung
7631b3ee27 am b9a7d8c2: Merge "Adding activity icon to the task view" 
* commit 'b9a7d8c2c46e71f756da69d7682bfc594b2a91ed':
  Adding activity icon to the task view
 2014-04-03 21:11:25 +00:00
Winson Chung
b9a7d8c2c4 Merge "Adding activity icon to the task view" 2014-04-03 21:07:56 +00:00
Craig Mautner
54d5483c28 am eb6387c1: Merge "Add the persistable attribute for Activities" 
* commit 'eb6387c16149e4d84dcb15427bb7ca8d0495554d':
  Add the persistable attribute for Activities
 2014-04-03 20:56:20 +00:00
Dianne Hackborn
d21310ae0f am 5d5902d1: Merge "Don\'t allow -1 uids for wake locks." 
* commit '5d5902d140040936fa6aa7e443220140af0e9843':
  Don't allow -1 uids for wake locks.
 2014-04-03 20:56:17 +00:00
Craig Mautner
eb6387c161 Merge "Add the persistable attribute for Activities" 2014-04-03 20:51:22 +00:00
Dianne Hackborn
5d5902d140 Merge "Don't allow -1 uids for wake locks." 2014-04-03 20:49:57 +00:00
Craig Mautner
a6066bb7a4 am 35fc6a02: Merge "Implement setActivityLabelAndIcon()." 
* commit '35fc6a02aeded9578375af5828e14043164028d5':
  Implement setActivityLabelAndIcon().
 2014-04-03 20:43:44 +00:00
Craig Mautner
35fc6a02ae Merge "Implement setActivityLabelAndIcon()." 2014-04-03 20:37:29 +00:00
Jorim Jaggi
18d084698c resolved conflicts for merge of 93160828 to master-lockscreen-dev 
Change-Id: Ief6d6b8b8cc9ae2eb38442a3ba9ecae4637b75d6
 2014-04-03 21:07:39 +02:00
Jeff Tinker
9de8c1d82b resolved conflicts for merge of 4f342e87 to master 
Change-Id: I2cdb238759beb49fede2de703df8defee92d316f
 2014-04-03 11:51:37 -07:00
Dianne Hackborn
ef640cdfb2 Don't allow -1 uids for wake locks. 
Change-Id: Ia1b412a166f69247be3b047138349e7b4031bd7d
 2014-04-03 11:20:15 -07:00
Selim Cinek
9316082809 Merge "Enabled the new notification shade and improved expanding logic" 2014-04-03 17:58:47 +00:00
Glenn Kasten
78cbd451fd Simplify and document AudioTrack gain 
also deprecate setStereoVolume

Bug: 12534920
Change-Id: I009ab91c5b73b93fbd961691e5764744ce37cae6
 2014-04-03 17:45:29 +00:00
Craig Mautner
4cfa8dc77a Add the persistable attribute for Activities 
This is used for documents to allow them to be persisted across
reboots.

Fixes bug 13735406.

Change-Id: I5655ac99589d58ed5716429cf7a1ffeee677aee1
 2014-04-03 10:40:43 -07:00
Chris Craik
a66a735dc6 am ef4c0c9f: Merge "Move most TransformationInfo properties to RenderNode" 
* commit 'ef4c0c9fd5db395b2eea0a246b93bce9cc9e859a':
  Move most TransformationInfo properties to RenderNode
 2014-04-03 17:20:10 +00:00
Chris Craik
ef4c0c9fd5 Merge "Move most TransformationInfo properties to RenderNode" 2014-04-03 17:14:53 +00:00
Raph Levien
89bebfc7c7 am 537be409: am c333381b: am 24a2f20f: am c420ce34: Merge "Marquee text RTL improvements" 
* commit '537be409f281d4a872cbcebb6ac3a4d767ded4da':
  Marquee text RTL improvements
 2014-04-03 17:13:12 +00:00
Raph Levien
537be409f2 am c333381b: am 24a2f20f: am c420ce34: Merge "Marquee text RTL improvements" 
* commit 'c333381b4c1b46f13f75388099cafb740844c497':
  Marquee text RTL improvements
 2014-04-03 17:09:26 +00:00
Narayan Kamath
1db17807f8 am c6f6ba32: am 71ae2bd4: am f87b3a25: am 374db6c3: Merge "Remove ProcessState::mArgc,mArgV,mArgLen" 
* commit 'c6f6ba3265d2b07649277682fd3ca0f9ce4d011a':
  Remove ProcessState::mArgc,mArgV,mArgLen
 2014-04-03 17:00:47 +00:00
Ben Murdoch
2be2f478bb am 33822312: am 55da6228: (-s ours) am 14424043: am 369a0057: Merge "Update ViewRootImpl for 64bit functor type." 
* commit '33822312e65a38400b189c6deda59b8d047b89cf':
  Update ViewRootImpl for 64bit functor type.
 2014-04-03 17:00:41 +00:00
Selim Cinek
b6d85ebfe4 Enabled the new notification shade and improved expanding logic 
Made the NotificationStackScroller now the default and only shade.
When the notification shade is expanded, the NotificationStackScroller
now also expands revealing the notifications.

Change-Id: If989ed848f684b3ac4e687d9642289db4599553b
 2014-04-03 18:59:37 +02:00
Narayan Kamath
c6f6ba3265 am 71ae2bd4: am f87b3a25: am 374db6c3: Merge "Remove ProcessState::mArgc,mArgV,mArgLen" 
* commit '71ae2bd42be21de6d25d1f8c52e3973c172462df':
  Remove ProcessState::mArgc,mArgV,mArgLen
 2014-04-03 16:56:32 +00:00
Ben Murdoch
33822312e6 am 55da6228: (-s ours) am 14424043: am 369a0057: Merge "Update ViewRootImpl for 64bit functor type." 
* commit '55da62288dcec75c34721a59d71f917dcb8a62b4':
  Update ViewRootImpl for 64bit functor type.
 2014-04-03 16:56:24 +00:00