John Spurlock
08c7116ab9
Remove unused imports in frameworks/base.
...
Change-Id: I031443de83f93eb57a98863001826671b18f3b17
2015-02-28 14:47:49 -05:00
Chris Craik
3062e57072
Merge "Fix glop rendering within unclipped saveLayers"
2015-02-28 00:29:58 +00:00
Chris Craik
6b109c7498
Fix glop rendering within unclipped saveLayers
...
bug:19541881
Additionally, clean up GlopBuilders
and rename onGetSnapshot() for clarity
Change-Id: I0303e4cd61eef87cf80af2d968c4aa67193cd008
2015-02-27 16:13:26 -08:00
Rich Slogar
e88b8b99a5
am 7dc5dd4a: am ac8da5a2: am 7aa654bc: am 37f207e1: am 191131d4: am 50e8b020: am a83f6445: Merge "docs: gradle plugin version update" into lmp-docs
...
* commit '7dc5dd4aef95b800a1a64f4ec7448ee32213731d':
docs: gradle plugin version update
2015-02-27 23:31:23 +00:00
Rich Slogar
7dc5dd4aef
am ac8da5a2: am 7aa654bc: am 37f207e1: am 191131d4: am 50e8b020: am a83f6445: Merge "docs: gradle plugin version update" into lmp-docs
...
* commit 'ac8da5a223f9732ba5dcf45896e0c390f009bc28':
docs: gradle plugin version update
2015-02-27 23:24:27 +00:00
Rich Slogar
ac8da5a223
am 7aa654bc: am 37f207e1: am 191131d4: am 50e8b020: am a83f6445: Merge "docs: gradle plugin version update" into lmp-docs
...
* commit '7aa654bc19699ea6eb7bed74c9dd503e91efb6a1':
docs: gradle plugin version update
2015-02-27 23:18:32 +00:00
Rich Slogar
7aa654bc19
am 37f207e1: am 191131d4: am 50e8b020: am a83f6445: Merge "docs: gradle plugin version update" into lmp-docs
...
* commit '37f207e118f1de7442a8874f7ebc6db643d0edcc':
docs: gradle plugin version update
2015-02-27 23:10:27 +00:00
Rich Slogar
37f207e118
am 191131d4: am 50e8b020: am a83f6445: Merge "docs: gradle plugin version update" into lmp-docs
...
* commit '191131d4494f0b6c51463ae9e771672bad5c970a':
docs: gradle plugin version update
2015-02-27 22:50:34 +00:00
Rich Slogar
191131d449
am 50e8b020: am a83f6445: Merge "docs: gradle plugin version update" into lmp-docs
...
* commit '50e8b020f69687f11a0abce4ec5312697f9a1449':
docs: gradle plugin version update
2015-02-27 22:43:42 +00:00
Rich Slogar
50e8b020f6
am a83f6445: Merge "docs: gradle plugin version update" into lmp-docs
...
* commit 'a83f64451d55882366491e66c7479f194e0625ea':
docs: gradle plugin version update
2015-02-27 22:37:17 +00:00
James Cook
99e6d7a17a
Merge "Add TextView XML attribute for undo support"
2015-02-27 22:35:15 +00:00
Rich Slogar
a83f64451d
Merge "docs: gradle plugin version update" into lmp-docs
2015-02-27 22:31:33 +00:00
Rich Slogar
5fcfe207fe
docs: gradle plugin version update
...
b.android 153270
Change-Id: I0c752fdf28181c50924a1ca946b5110f773659dc
2015-02-27 14:29:24 -08:00
James Cook
bcd42a8d5a
Merge "Reland: Improvements to TextView Ctrl-Z undo support"
2015-02-27 22:02:38 +00:00
Jim Miller
c5ff04cbc4
Merge "Add fingerprint settings support to the framework"
2015-02-27 21:51:27 +00:00
James Cook
f1dad1ea82
Add TextView XML attribute for undo support
...
* Defaults to true, but can easily be changed if we decide that undo
should be off by default.
Bug: 19332904
Change-Id: Ic4f3814a1b0a5e25171a910f2fe628606e16104e
2015-02-27 13:40:56 -08:00
James Cook
471559f129
Reland: Improvements to TextView Ctrl-Z undo support
...
This relands commit 7713d18847c7fe81fb5f34e888aaf8167862f5fd which was
reverted in commit 3ac0bcb095e0067721a5e35d3b4c51e4090842a3.
Original description:
* Undo/redo restores cursor position
* Multiple deletes are consolidated into a single operation
* Don't create undo history for invalid or no-op operations
* Move logic for merging operations into Editor.EditOperation
CTS tests in android.widget.cts.TextViewTest will land separately.
Bug: 19332904
Bug: 19450037
Bug: 19505388
Change-Id: Ice27e3c4e5e421b47be8c4e9964c10844e61b0fc
2015-02-27 13:39:56 -08:00
Roozbeh Pournader
9618c6eee8
Merge "Remove Roboto fonts and their build rules"
2015-02-27 21:14:14 +00:00
Alan Viverette
e1f58a02e4
Merge "Revert "Use ObjectAnimator for fading scrollbars, set initial duration to 1500""
2015-02-27 20:51:41 +00:00
James Cook
7af589995f
Merge "Reland: Add basic support for Ctrl-Z to editable TextViews"
2015-02-27 20:44:45 +00:00
Alan Viverette
25f0e6183b
Revert "Use ObjectAnimator for fading scrollbars, set initial duration to 1500"
...
Bug: 19522833
Bug: 19528265
This reverts commit 72710f11ecd3baf468bf649283453cb7aafe4d74.
Change-Id: I7235ae3ca53696f029cc18f19fe1d373c4f54bbf
2015-02-27 12:34:30 -08:00
Jim Miller
ba67aee02c
Add fingerprint settings support to the framework
...
- cleanup thread issue and simplify native FingerprintService methods
- add new permissions and enforce them
- add fingerprint hardware detection API
Change-Id: I87c2243ea2412061f1e85b044138480d0161bcdf
2015-02-27 12:03:32 -08:00
Mark Salyzyn
07a65f444a
am bbef7cf3: am 012c3b72: am a891d08d: Merge "jni: Add paranoia regarding android_logger_list_read"
...
* commit 'bbef7cf3bbf778dd8ae3b91b140bf4542241093b':
jni: Add paranoia regarding android_logger_list_read
2015-02-27 19:10:11 +00:00
Mark Salyzyn
bbef7cf3bb
am 012c3b72: am a891d08d: Merge "jni: Add paranoia regarding android_logger_list_read"
...
* commit '012c3b723a8e73012444b7f839b363f698725a01':
jni: Add paranoia regarding android_logger_list_read
2015-02-27 19:03:13 +00:00
Chris Craik
cb147e53e4
Merge "Glop TextureLayer support"
2015-02-27 18:53:55 +00:00
Mark Salyzyn
012c3b723a
am a891d08d: Merge "jni: Add paranoia regarding android_logger_list_read"
...
* commit 'a891d08dad829c9aacd29bd2c3b36debe3fc1cc3':
jni: Add paranoia regarding android_logger_list_read
2015-02-27 18:52:36 +00:00
Chris Craik
26bf34200e
Glop TextureLayer support
...
Change-Id: I348a926bd4a2f47be9fdbe74058c0aa2f8dc6276
2015-02-27 10:50:12 -08:00
Mark Salyzyn
a891d08dad
Merge "jni: Add paranoia regarding android_logger_list_read"
2015-02-27 18:46:04 +00:00
Mike Lockwood
238cba3593
Merge "Move ALSA utilities to com.android.internal.alsa package"
2015-02-27 18:42:13 +00:00
Alan Viverette
228fd600ce
Merge "Implement landscape layout for time picker dialog"
2015-02-27 18:13:54 +00:00
James Cook
f59152cf00
Reland: Add basic support for Ctrl-Z to editable TextViews
...
Reland 9201e797833f35b9afb219f88c10d3b6fda02a4e which was reverted in
c8f08e07a47cc259a25caed3f731ee7044328635.
Original description:
* Add an UndoManager to the Editor for each editable TextView
* Record operations as being owned by that Editor
* Parcel the undo state
* Wire hardware keyboard shortcuts Ctrl-Z for undo and Ctrl-Shift-Z
for redo into TextView shortcut handling.
* Expose IDs for "undo" and "redo" for symmetry with cut/copy/paste.
Additional fix:
* Ensure each UndoOwner always has a valid mManager, even after the
UndoManager is parceled and restored.
Bug: 19332904
Bug: 19505388
Change-Id: Iad4476e6e9ca952281e69bf22c07cca915dfa7bd
2015-02-27 10:04:08 -08:00
Mike Reed
912c06fdaa
Merge "don't reference (deprecated) kIgnore_SkAlphaType"
2015-02-27 17:57:38 +00:00
Luan Nguyen
8216729002
am d85224b6: am 25395a7e: am 4490d6b5: am dedba01a: am d57871e0: am 8aa8960e: am a464d409: Merge "docs: Add steps to enable adb debugging on Wear device" into lmp-docs
...
* commit 'd85224b6bd9b14e50163fc05b9ad90ccb9e79ee1':
docs: Add steps to enable adb debugging on Wear device
2015-02-27 17:22:38 +00:00
Ryosuke Matsuuchi
819e57eea0
am c9c0de9e: am 6876209a: am a667bcd6: am d4cdf18e: am b8593133: am c1120b45: am 8f0e9c75: Merge "doc: Add Japanese version of DAC/distribute/ page." into lmp-docs
...
* commit 'c9c0de9e79f2cc381249e6a1551e136f6bb0854c':
doc: Add Japanese version of DAC/distribute/ page.
2015-02-27 17:22:32 +00:00
Andrew Solovay
a39641c896
am be76cc2f: am 35b15f39: am f8ceaa6b: am 3a5b0815: am 3daee377: am 7f26f2b9: am b5e00e5c: docs: Documented new IABv5 sub upgrade/downgrade and manual renewal
...
* commit 'be76cc2f682550a17992467a69513dc4b5838c6d':
docs: Documented new IABv5 sub upgrade/downgrade and manual renewal
2015-02-27 17:22:23 +00:00
Luan Nguyen
d85224b6bd
am 25395a7e: am 4490d6b5: am dedba01a: am d57871e0: am 8aa8960e: am a464d409: Merge "docs: Add steps to enable adb debugging on Wear device" into lmp-docs
...
* commit '25395a7e07caca454bb411492698ea8ce1aaaaa9':
docs: Add steps to enable adb debugging on Wear device
2015-02-27 17:16:49 +00:00
Ryosuke Matsuuchi
c9c0de9e79
am 6876209a: am a667bcd6: am d4cdf18e: am b8593133: am c1120b45: am 8f0e9c75: Merge "doc: Add Japanese version of DAC/distribute/ page." into lmp-docs
...
* commit '6876209ae84ee55d4803f8c32032a89735e76c1f':
doc: Add Japanese version of DAC/distribute/ page.
2015-02-27 17:16:44 +00:00
Andrew Solovay
be76cc2f68
am 35b15f39: am f8ceaa6b: am 3a5b0815: am 3daee377: am 7f26f2b9: am b5e00e5c: docs: Documented new IABv5 sub upgrade/downgrade and manual renewal
...
* commit '35b15f399b9c0140544384115215e08f16659cbb':
docs: Documented new IABv5 sub upgrade/downgrade and manual renewal
2015-02-27 17:16:38 +00:00
Luan Nguyen
25395a7e07
am 4490d6b5: am dedba01a: am d57871e0: am 8aa8960e: am a464d409: Merge "docs: Add steps to enable adb debugging on Wear device" into lmp-docs
...
* commit '4490d6b5706bd839896b3760954a08cb4dc0575d':
docs: Add steps to enable adb debugging on Wear device
2015-02-27 17:10:34 +00:00
Ryosuke Matsuuchi
6876209ae8
am a667bcd6: am d4cdf18e: am b8593133: am c1120b45: am 8f0e9c75: Merge "doc: Add Japanese version of DAC/distribute/ page." into lmp-docs
...
* commit 'a667bcd688a35f7c9184452ffe7eb4bfe2989bf2':
doc: Add Japanese version of DAC/distribute/ page.
2015-02-27 17:10:31 +00:00
Andrew Solovay
35b15f399b
am f8ceaa6b: am 3a5b0815: am 3daee377: am 7f26f2b9: am b5e00e5c: docs: Documented new IABv5 sub upgrade/downgrade and manual renewal
...
* commit 'f8ceaa6b557f59fdd654ce63e35f9b73c0be33b8':
docs: Documented new IABv5 sub upgrade/downgrade and manual renewal
2015-02-27 17:10:27 +00:00
Luan Nguyen
4490d6b570
am dedba01a: am d57871e0: am 8aa8960e: am a464d409: Merge "docs: Add steps to enable adb debugging on Wear device" into lmp-docs
...
* commit 'dedba01ac8b85d535171a910aa6b72ea9ce4498c':
docs: Add steps to enable adb debugging on Wear device
2015-02-27 17:00:18 +00:00
Ryosuke Matsuuchi
a667bcd688
am d4cdf18e: am b8593133: am c1120b45: am 8f0e9c75: Merge "doc: Add Japanese version of DAC/distribute/ page." into lmp-docs
...
* commit 'd4cdf18e1c763c2aaedbb4f0cab3657db2adc097':
doc: Add Japanese version of DAC/distribute/ page.
2015-02-27 17:00:13 +00:00
Andrew Solovay
f8ceaa6b55
am 3a5b0815: am 3daee377: am 7f26f2b9: am b5e00e5c: docs: Documented new IABv5 sub upgrade/downgrade and manual renewal
...
* commit '3a5b08153e432b79e40bc5ddd62db2bb5fcf71e9':
docs: Documented new IABv5 sub upgrade/downgrade and manual renewal
2015-02-27 17:00:10 +00:00
Luan Nguyen
dedba01ac8
am d57871e0: am 8aa8960e: am a464d409: Merge "docs: Add steps to enable adb debugging on Wear device" into lmp-docs
...
* commit 'd57871e00d77bc852948de30a01b6856a6cfeb9b':
docs: Add steps to enable adb debugging on Wear device
2015-02-27 16:53:47 +00:00
Ryosuke Matsuuchi
d4cdf18e1c
am b8593133: am c1120b45: am 8f0e9c75: Merge "doc: Add Japanese version of DAC/distribute/ page." into lmp-docs
...
* commit 'b859313312a85285c2c243a5e58d133e308ee590':
doc: Add Japanese version of DAC/distribute/ page.
2015-02-27 16:53:42 +00:00
Andrew Solovay
3a5b08153e
am 3daee377: am 7f26f2b9: am b5e00e5c: docs: Documented new IABv5 sub upgrade/downgrade and manual renewal
...
* commit '3daee37705d23a0f91680aa954e4bcdb2dfdf4e8':
docs: Documented new IABv5 sub upgrade/downgrade and manual renewal
2015-02-27 16:53:37 +00:00
Luan Nguyen
d57871e00d
am 8aa8960e: am a464d409: Merge "docs: Add steps to enable adb debugging on Wear device" into lmp-docs
...
* commit '8aa8960edb10089570acd5d3b19cfd9be7253fab':
docs: Add steps to enable adb debugging on Wear device
2015-02-27 16:46:56 +00:00
Ryosuke Matsuuchi
b859313312
am c1120b45: am 8f0e9c75: Merge "doc: Add Japanese version of DAC/distribute/ page." into lmp-docs
...
* commit 'c1120b459eb1ecabd54966cef1873f0f0707382d':
doc: Add Japanese version of DAC/distribute/ page.
2015-02-27 16:46:53 +00:00
Andrew Solovay
3daee37705
am 7f26f2b9: am b5e00e5c: docs: Documented new IABv5 sub upgrade/downgrade and manual renewal
...
* commit '7f26f2b96a23f32bca69862b254dbbe8b59049d9':
docs: Documented new IABv5 sub upgrade/downgrade and manual renewal
2015-02-27 16:46:49 +00:00
