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

191078 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Geoff Mendal
a6d47cc33d Import translations. DO NOT MERGE 
Change-Id: I953f5c61ff75db1c513013a2023114f5ff4d7b14
Auto-generated-cl: translation import
 2015-05-01 20:02:45 -07:00
Chris Tate
99c4d4a571 am 20fb8187: am a51f14d0: Merge "Fix NPE in JobServiceContext when closing job." 
* commit '20fb8187c41cf0fd926620b9734b9211ce0c8306':
  Fix NPE in JobServiceContext when closing job.
 2015-05-02 01:57:38 +00:00
Bryce Lee
b9b752aac7 am 520b5505: am 176987b7: am 13428b50: am f626c679: am a7f07fc3: Merge "Add configuration to allow animations during low power mode." into lmp-mr1-modular-dev 
* commit '520b550564d9a640de655e10995a4007e836c1fa':
  Add configuration to allow animations during low power mode.
 2015-05-02 01:57:33 +00:00
Rich Slogar
1a4a7c6909 am 40d0be81: am 1705b2fd: am c2180dd5: am 31e49327: am 4e3a9193: am 7e42a822: am a00cf127: am 3e70c6b4: Merge "docs: studio 1.2 download link fix" into lmp-docs 
* commit '40d0be81b720774bb05330952cfdb2d64c371a35':
 2015-05-02 01:57:29 +00:00
Rich Slogar
d4e504861e am e36725b3: am 3daee8a7: am d8417f12: am 906c4f27: am f7ef3edb: am 3e70c6b4: Merge "docs: studio 1.2 download link fix" into lmp-docs 
* commit 'e36725b3581022795562096789bc8f1d4d5c10ba':
  docs: studio 1.2 download link fix
 2015-05-02 01:57:23 +00:00
Chris Tate
20fb8187c4 am a51f14d0: Merge "Fix NPE in JobServiceContext when closing job." 
* commit 'a51f14d00edda3da103585bf7741502e866512e8':
  Fix NPE in JobServiceContext when closing job.
 2015-05-02 01:52:04 +00:00
Bryce Lee
520b550564 am 176987b7: am 13428b50: am f626c679: am a7f07fc3: Merge "Add configuration to allow animations during low power mode." into lmp-mr1-modular-dev 
* commit '176987b7e268aa5becd52f63bf483cff17e93be8':
  Add configuration to allow animations during low power mode.
 2015-05-02 01:46:23 +00:00
Rich Slogar
40d0be81b7 am 1705b2fd: am c2180dd5: am 31e49327: am 4e3a9193: am 7e42a822: am a00cf127: am 3e70c6b4: Merge "docs: studio 1.2 download link fix" into lmp-docs 
* commit '1705b2fd2035fde34947c4baeebc89b7df74ea64':
 2015-05-02 01:46:18 +00:00
Rich Slogar
e36725b358 am 3daee8a7: am d8417f12: am 906c4f27: am f7ef3edb: am 3e70c6b4: Merge "docs: studio 1.2 download link fix" into lmp-docs 
* commit '3daee8a7d16543a1353eedbd7eb04a9bf61e8482':
  docs: studio 1.2 download link fix
 2015-05-02 01:46:12 +00:00
Bryce Lee
176987b7e2 am 13428b50: am f626c679: am a7f07fc3: Merge "Add configuration to allow animations during low power mode." into lmp-mr1-modular-dev 
* commit '13428b5079e5b0c53efb2e5188f542fab1a7f91c':
  Add configuration to allow animations during low power mode.
 2015-05-02 01:37:17 +00:00
Rich Slogar
1705b2fd20 am c2180dd5: am 31e49327: am 4e3a9193: am 7e42a822: am a00cf127: am 3e70c6b4: Merge "docs: studio 1.2 download link fix" into lmp-docs 
* commit 'c2180dd5168af07ef18bafb629c25ea2f3b42138':
 2015-05-02 01:37:13 +00:00
Rich Slogar
3daee8a7d1 am d8417f12: am 906c4f27: am f7ef3edb: am 3e70c6b4: Merge "docs: studio 1.2 download link fix" into lmp-docs 
* commit 'd8417f1216ec4285b6c9c0ebdd6a441d9f4c94fc':
  docs: studio 1.2 download link fix
 2015-05-02 01:37:07 +00:00
Chris Tate
a51f14d00e Merge "Fix NPE in JobServiceContext when closing job." 2015-05-02 01:29:45 +00:00
Bryce Lee
13428b5079 am f626c679: am a7f07fc3: Merge "Add configuration to allow animations during low power mode." into lmp-mr1-modular-dev 
* commit 'f626c679fdd7e44c6cf0eb2d2f6be786636a90bc':
  Add configuration to allow animations during low power mode.
 2015-05-02 01:22:24 +00:00
Rich Slogar
c2180dd516 am 31e49327: am 4e3a9193: am 7e42a822: am a00cf127: am 3e70c6b4: Merge "docs: studio 1.2 download link fix" into lmp-docs 
* commit '31e493277ada5dc72e6b0bf501fa649307bf6814':
 2015-05-02 01:22:14 +00:00
Rich Slogar
d8417f1216 am 906c4f27: am f7ef3edb: am 3e70c6b4: Merge "docs: studio 1.2 download link fix" into lmp-docs 
* commit '906c4f2719f73263a2c004e110172f41f5fbd67a':
  docs: studio 1.2 download link fix
 2015-05-02 01:22:07 +00:00
Raph Levien
647476a27b am 86de59aa: am 741d6120: am 5c268763: Merge "Expose StaticLayout.Builder publicly" into mnc-dev 
* commit '86de59aa33e109f237e9fc25a2bcf779dc753f0c':
  Expose StaticLayout.Builder publicly
 2015-05-02 01:18:00 +00:00
Raph Levien
e0911854b1 am 151ccb9f: am 96a9c9b5: am 4bf4e4c8: Merge "Make Paint a required field of StaticLayout Builder" into mnc-dev 
* commit '151ccb9f580e0082c571e50e4817ccd1cdd4379d':
  Make Paint a required field of StaticLayout Builder
 2015-05-02 01:17:54 +00:00
Yohei Yukawa
6b5554a7b5 am f436e6e8: am 14a60950: am b6bec1a4: Remove unused methods/variables/fields from Editor.java. 
* commit 'f436e6e8483145d25608b775c1088da4bcdea066':
  Remove unused methods/variables/fields from Editor.java.
 2015-05-02 01:17:48 +00:00
Raph Levien
86de59aa33 am 741d6120: am 5c268763: Merge "Expose StaticLayout.Builder publicly" into mnc-dev 
* commit '741d6120be20200e5ff6484c8b7293dfc4880dba':
  Expose StaticLayout.Builder publicly
 2015-05-02 01:08:00 +00:00
Raph Levien
151ccb9f58 am 96a9c9b5: am 4bf4e4c8: Merge "Make Paint a required field of StaticLayout Builder" into mnc-dev 
* commit '96a9c9b5896aa6a8a956cc5fffca3f98b8c155c0':
  Make Paint a required field of StaticLayout Builder
 2015-05-02 01:07:55 +00:00
Yohei Yukawa
f436e6e848 am 14a60950: am b6bec1a4: Remove unused methods/variables/fields from Editor.java. 
* commit '14a60950b24e0ae40f5fa611eb28f0453c3d583c':
  Remove unused methods/variables/fields from Editor.java.
 2015-05-02 01:07:50 +00:00
Raph Levien
741d6120be am 5c268763: Merge "Expose StaticLayout.Builder publicly" into mnc-dev 
* commit '5c268763049dd56a0e18c1652a671a1ad20978dd':
  Expose StaticLayout.Builder publicly
 2015-05-02 00:46:39 +00:00
Raph Levien
96a9c9b589 am 4bf4e4c8: Merge "Make Paint a required field of StaticLayout Builder" into mnc-dev 
* commit '4bf4e4c80181cd7c4e1a9d26c443dd1d529455e7':
  Make Paint a required field of StaticLayout Builder
 2015-05-02 00:46:34 +00:00
Yohei Yukawa
14a60950b2 am b6bec1a4: Remove unused methods/variables/fields from Editor.java. 
* commit 'b6bec1a403fd3efc59acb2c2206aaf6b6840c2f1':
  Remove unused methods/variables/fields from Editor.java.
 2015-05-02 00:46:30 +00:00
Raph Levien
5c26876304 Merge "Expose StaticLayout.Builder publicly" into mnc-dev 2015-05-02 00:42:18 +00:00
Raph Levien
4bf4e4c801 Merge "Make Paint a required field of StaticLayout Builder" into mnc-dev 2015-05-02 00:41:51 +00:00
Svet Ganov
1d294f49bd am 107cd552: am 17daa3d0: am 574f5379: Merge "Add body sensors app op - framework base" into mnc-dev 
* commit '107cd552f1d88ae22fde0284f4a64f78eaadfbc1':
  Add body sensors app op - framework base
 2015-05-01 23:45:22 +00:00
Svet Ganov
107cd552f1 am 17daa3d0: am 574f5379: Merge "Add body sensors app op - framework base" into mnc-dev 
* commit '17daa3d02c6427b086710ca6d386202cde47c6ae':
  Add body sensors app op - framework base
 2015-05-01 23:34:54 +00:00
Yohei Yukawa
b6bec1a403 Remove unused methods/variables/fields from Editor.java. 
This CL does nothing but remove unused code.

Change-Id: Ibe7c7aa1b9bdfd4117e27cb198082e307f4d68a4
 2015-05-01 23:30:35 +00:00
Svet Ganov
17daa3d02c am 574f5379: Merge "Add body sensors app op - framework base" into mnc-dev 
* commit '574f53793d6441ebf55ca8811588ad37d9451a9a':
  Add body sensors app op - framework base
 2015-05-01 23:21:47 +00:00
Svet Ganov
574f53793d Merge "Add body sensors app op - framework base" into mnc-dev 2015-05-01 23:09:52 +00:00
Chris Craik
2eff3571b6 am 6e51a707: am 378510c3: am 106f88c8: Merge "Revert "Revert "Merge getDisplayList and updateDisplayListIfDirty""" into mnc-dev 
* commit '6e51a707ea986102fb507bfdf00d2a4dddee70f7':
  Revert "Revert "Merge getDisplayList and updateDisplayListIfDirty""
 2015-05-01 22:17:17 +00:00
Raph Levien
531c30c62b Expose StaticLayout.Builder publicly 
Expose the new Builder pattern for creating StaticLayout. This allows
access to a number of features that have been available to TextView
through a hidden constructor. Some of these features have existed
for a while (mostly maxLines), while others are new (breakStrategy,
indents).

The builder is cleaner and has a better upgrade path than the old
pattern of lots of constructors with varying numbers of arguments.

Bug: 20190561
Change-Id: Ia3cd124825ab0cb469d22d1fc576ad26454545b8
 2015-05-01 15:15:48 -07:00
Chris Craik
6e51a707ea am 378510c3: am 106f88c8: Merge "Revert "Revert "Merge getDisplayList and updateDisplayListIfDirty""" into mnc-dev 
* commit '378510c3aecf958871e4d9b35b9bb5e80f5e9ea2':
  Revert "Revert "Merge getDisplayList and updateDisplayListIfDirty""
 2015-05-01 22:05:57 +00:00
Fabrice Di Meglio
042b6c7dcd am f157249b: am 6ae03f34: am 4eb03f8f: Merge "Remove obsolete code for App Links IntentFilterVerifier" into mnc-dev 
* commit 'f157249b63ea77d568856cfc4961156ae23f236c':
  Remove obsolete code for App Links IntentFilterVerifier
 2015-05-01 22:01:27 +00:00
Fabrice Di Meglio
f157249b63 am 6ae03f34: am 4eb03f8f: Merge "Remove obsolete code for App Links IntentFilterVerifier" into mnc-dev 
* commit '6ae03f34d5f8d5dd10f47c62ee291e9fc149809e':
  Remove obsolete code for App Links IntentFilterVerifier
 2015-05-01 21:50:44 +00:00
Chris Craik
378510c3ae am 106f88c8: Merge "Revert "Revert "Merge getDisplayList and updateDisplayListIfDirty""" into mnc-dev 
* commit '106f88c890bd128ef89aa4f0dee591c2ad38fa6b':
  Revert "Revert "Merge getDisplayList and updateDisplayListIfDirty""
 2015-05-01 21:48:44 +00:00
Chris Craik
85dd91ac88 am 9eeb725d: am 3deb109a: am 5c705c59: Merge "Fix build." into mnc-dev 
* commit '9eeb725d91beeaec6631ec73e5856795dcdada73':
  Fix build.
 2015-05-01 21:38:20 +00:00
Fabrice Di Meglio
6ae03f34d5 am 4eb03f8f: Merge "Remove obsolete code for App Links IntentFilterVerifier" into mnc-dev 
* commit '4eb03f8fd28e757bd636a899c8679731c7eed0a9':
  Remove obsolete code for App Links IntentFilterVerifier
 2015-05-01 21:37:12 +00:00
Chris Craik
106f88c890 Merge "Revert "Revert "Merge getDisplayList and updateDisplayListIfDirty""" into mnc-dev 2015-05-01 21:36:06 +00:00
Chris Craik
31a2d063df Revert "Revert "Merge getDisplayList and updateDisplayListIfDirty"" 
Fixes breakage from HwAccelerationTest

This reverts commit b2847afde24aac22c8fb804cdce0c24b8a7c40c4.

Change-Id: I762b3c9020fc1d06bac61ffa8b956049147515b1
 2015-05-01 14:30:15 -07:00
Chris Craik
9eeb725d91 am 3deb109a: am 5c705c59: Merge "Fix build." into mnc-dev 
* commit '3deb109a7423eddf51b6242378123f09cd56c69e':
  Fix build.
 2015-05-01 21:25:36 +00:00
Fabrice Di Meglio
4eb03f8fd2 Merge "Remove obsolete code for App Links IntentFilterVerifier" into mnc-dev 2015-05-01 21:25:30 +00:00
Fabrice Di Meglio
7d7094fd2b Remove obsolete code for App Links IntentFilterVerifier 
- the intent filter verification is now done by the StatementService

See bug #20759587

Change-Id: Icee668819feffc282b3986873c9d13abbe03e92b
 2015-05-01 14:24:02 -07:00
Chris Craik
255951e204 am e920b145: am 2551857f: am f4ff8f70: Merge "Merge getDisplayList and updateDisplayListIfDirty" into mnc-dev 
* commit 'e920b1459a0ecd4240df78a616b56c0230446c5c':
  Merge getDisplayList and updateDisplayListIfDirty
 2015-05-01 21:14:55 +00:00
Chris Craik
07c801d712 am ed862369: am 3059dbb6: am 04c0f415: Merge "Update alpha documentation" into mnc-dev 
* commit 'ed8623690b710ccb601373a622b09d96d7d15904':
  Update alpha documentation
 2015-05-01 21:14:49 +00:00
Jorim Jaggi
7a3e77fbee am 83fb90f6: am 3f5f1cb6: am 0629a5d5: Merge "Rename supportsAssistGesture to supportsAssist" into mnc-dev 
* commit '83fb90f61fa24ba7cc2b69ce91ad03b95d9d6024':
  Rename supportsAssistGesture to supportsAssist
 2015-05-01 21:14:44 +00:00
Chris Craik
3deb109a74 am 5c705c59: Merge "Fix build." into mnc-dev 
* commit '5c705c595d6adbb4b6e8ad5dee29205246cd5cc4':
  Fix build.
 2015-05-01 21:12:27 +00:00
Chris Craik
e920b1459a am 2551857f: am f4ff8f70: Merge "Merge getDisplayList and updateDisplayListIfDirty" into mnc-dev 
* commit '2551857feed723c30759a40ae9429110c453d2d3':
  Merge getDisplayList and updateDisplayListIfDirty
 2015-05-01 21:03:49 +00:00