Andreas Gampe
870c4ba78a
am 1eca7d66: am 2a247b36: Merge "Frameworks/base: Fix visibility flag in Editor"
...
* commit '1eca7d66ee3da87c622259544794b8fe998cdb92':
Frameworks/base: Fix visibility flag in Editor
2015-03-18 23:50:35 +00:00
Clara Bayarri
10ff56ec6d
Merge "Editor: Make the Insertion handle start/finish the selection action mode on tap."
2015-03-18 23:02:58 +00:00
Clara Bayarri
452fa75207
Editor: Make the Insertion handle start/finish the selection action mode on tap.
...
The Insertion handle used to show/hide the paste popup, not that we are
unifying it with the selection action mode it should start/finish the mode.
There are no other use cases of the popup with the insertion handle, so that
code is cleaned up.
Change-Id: I40703bc8316f217edaf97aff72436935de60500c
2015-03-18 22:41:39 +00:00
Andreas Gampe
1eca7d66ee
am 2a247b36: Merge "Frameworks/base: Fix visibility flag in Editor"
...
* commit '2a247b361089c0744202b604e22f9a79d239b92c':
Frameworks/base: Fix visibility flag in Editor
2015-03-18 22:33:09 +00:00
James Cook
f2560e62cf
Merge "Improve undo support for text entered with IME"
2015-03-18 21:39:03 +00:00
Chris Craik
43c410eaac
Merge "Remove HardwareCanvas"
2015-03-18 21:36:56 +00:00
James Cook
d202668670
Improve undo support for text entered with IME
...
Use span properties to detect:
* Composing text - don't record undo operations
* Completing a composition - record an insert undo operation
* Canceling a composition - don't record
Save the composition state on parcel/unparcel.
Stop using begin/end batch edit to try to detect when a TextWatcher
is modifying the text. IMEs trigger multiple InputFilter passes in
a single batch edit. Use SpannableStringBuilder to determine when
we're in a TextWatcher callback because it is the authority on that
state.
Fix a bug in undo manager where it doesn't forget undos correctly if
there are more than one in the stack.
Bug: 19332904
Change-Id: Iaa9b0b2a7bf6683302cc85e7616e5d5fcc9fa202
2015-03-18 14:36:41 -07:00
Alan Viverette
dd0d4b7579
Merge "Enable/disable hardware rendering on windows by application tag"
2015-03-18 21:32:19 +00:00
Alan Viverette
9b0ab65ed4
Enable/disable hardware rendering on windows by application tag
...
Previously, hardware rendering cannot be enabled or disabled
on windows created without a parent activity (e.g. by services)
by setting the <application> tag, "android:hardwareAccelerated"
in AndroidManifest.xml. It's enabled by default in Android L
from the commit, 5e1565ead6 .
This patch provides a way of setting hardware rendering for
that case.
Change-Id: I60ee9566e99db39cd661fe6f196f43c3968b311a
Signed-off-by: Dohyun Lee <dohyun.lee@lge.com >
2015-03-18 14:21:04 -07:00
Ed Heyl
07459a3617
Merge "Fix build: Revert "Enable/disable hardware rendering on windows by application tag""
2015-03-18 20:40:47 +00:00
Ed Heyl
1445469b9e
Fix build: Revert "Enable/disable hardware rendering on windows by application tag"
...
This reverts commit ae114d2eb4 .
Change-Id: I5400c9aa121491164e8739892408c377b99f3980
2015-03-18 20:39:37 +00:00
Clara Bayarri
532c8e9b35
Merge "Editor: Fire the selection Action Mode when long pressing on an empty space"
2015-03-18 20:21:08 +00:00
Alan Viverette
78d9de97a6
Merge "Enable/disable hardware rendering on windows by application tag"
2015-03-18 20:01:50 +00:00
Alan Viverette
ae114d2eb4
Enable/disable hardware rendering on windows by application tag
...
Previously, hardware rendering cannot be enabled or disabled
on windows created without a parent activity (e.g. by services)
by setting the <application> tag, "android:hardwareAccelerated"
in AndroidManifest.xml. It's enabled by default in Android L
from the commit, 5e1565ead6 .
This patch provides a way of setting hardware rendering for
that case.
Change-Id: I08ce58a8644970a2a18407e83ad317a72a2dad10
Signed-off-by: Dohyun Lee <dohyun.lee@lge.com >
2015-03-18 12:43:08 -07:00
Alan Viverette
8c9d897534
Merge "Remove unnecessary null check in FastScroller"
2015-03-18 19:36:53 +00:00
Jose Lima
77c39392ff
New ContentInfoExtender for Notifications
...
Added a new Extender to add Content Info data to notification objects.
Change-Id: I29a84915ad0c0bb724c2fcdc53d9a4c4db95ba93
2015-03-18 19:26:34 +00:00
John Spurlock
a212e6b5b1
Merge "Update package manager documentation."
2015-03-18 19:23:17 +00:00
Ricky Wai
ac1496a1c9
Merge "Add Email.ENTERPRISE_CONTENT_LOOKUP_URI"
2015-03-18 18:43:54 +00:00
Clara Bayarri
29d2b5aa48
Editor: Fire the selection Action Mode when long pressing on an empty space
...
This used to fire the "paste" popup instead. It is a tiny step towards
unifying the cut/copy/paste action mode and paste popup.
Change-Id: I03dfcc294d4453e92464fc4f714468f58c692f24
2015-03-18 18:01:42 +00:00
Alan Viverette
a0f0494059
Remove unnecessary null check in FastScroller
...
Bug: 19805564
Change-Id: I12e1a3cadf52038fb480e5694d12b6ec5e0e467b
2015-03-18 10:25:43 -07:00
John Spurlock
38e6425bb4
Update package manager documentation.
...
Out lists are required to be non null.
Change-Id: I87b586a90f9f221bbea6f6f18135bfcdd65680c2
2015-03-18 12:09:32 -04:00
Alan Viverette
0e7c022601
Merge "Add single-arg TextView.setTextAppearance, deprecate two-arg method"
2015-03-18 00:34:38 +00:00
Dianne Hackborn
27eac1d58f
Add ability to get a screenshot for assist.
...
New flag you pass in to startSession() to say you want it,
new callback on VoiceInteractionSession to receive it.
Change-Id: I61fdcfdee41a60d46036a2ef16681a9b4181115a
2015-03-17 16:45:51 -07:00
Andreas Gampe
4976e2de8d
Frameworks/base: Fix visibility flag in Editor
...
Fix double check.
Bug: 19797138
Change-Id: I95e694f384f1f25d6cf3b6a1669052940385e41d
2015-03-17 16:08:43 -07:00
Andreas Gampe
9a9b45c285
am d6f25364: am 9568772a: Merge "Frameworks/base: Fix format string in Geofence"
...
* commit 'd6f25364eed09d39b493488cd6adaa02e0d8a252':
Frameworks/base: Fix format string in Geofence
2015-03-17 22:02:29 +00:00
Andreas Gampe
d6f25364ee
am 9568772a: Merge "Frameworks/base: Fix format string in Geofence"
...
* commit '9568772acbf5b36f2edb41f7c5b06d499329add0':
Frameworks/base: Fix format string in Geofence
2015-03-17 21:42:55 +00:00
Andreas Gampe
9568772acb
Merge "Frameworks/base: Fix format string in Geofence"
2015-03-17 21:30:49 +00:00
Andreas Gampe
1414a6291d
Frameworks/base: Fix format string in Geofence
...
%p is not a valid conversion in format strings. It is also superfluous,
as it is already known that location is null.
Bug: 19797138
Change-Id: I5784e28b05b4ca9aac57e0fc9da4a7f01d9b3247
2015-03-17 21:30:20 +00:00
Andreas Gampe
1938a389e7
am 3814163b: am aae42eb2: Merge "Frameworks/base: Fix format string in Camera"
...
* commit '3814163b6ddc35292f6b25f782ad7a858c703c24':
Frameworks/base: Fix format string in Camera
2015-03-17 21:12:25 +00:00
Andreas Gampe
3814163b6d
am aae42eb2: Merge "Frameworks/base: Fix format string in Camera"
...
* commit 'aae42eb26176482b09f0846e6acf7efa844a0d23':
Frameworks/base: Fix format string in Camera
2015-03-17 21:05:48 +00:00
Andreas Gampe
b95d079c80
am e4bdf3c1: am be549f9b: Merge "Frameworks/base: Fix precedence bug"
...
* commit 'e4bdf3c1c9e7be06b68cc32f9a492d512bf87528':
Frameworks/base: Fix precedence bug
2015-03-17 20:56:02 +00:00
Andreas Gampe
aae42eb261
Merge "Frameworks/base: Fix format string in Camera"
2015-03-17 20:52:21 +00:00
Andreas Gampe
02ffb2aad9
Frameworks/base: Fix format string in Camera
...
One cannot print a boolean with %d. That will result in an exception.
Bug: 19797138
Change-Id: I86c42ea834cebebaecff8463637cc9de14d1fc88
2015-03-17 20:51:38 +00:00
Andreas Gampe
e4bdf3c1c9
am be549f9b: Merge "Frameworks/base: Fix precedence bug"
...
* commit 'be549f9b8e01f884a2cc2d668457c6b1c12ff4cc':
Frameworks/base: Fix precedence bug
2015-03-17 20:49:18 +00:00
Andreas Gampe
0fdfe72088
am c8484abb: am 0ae488e1: Merge "Frameworks/base: Use || instead of |"
...
* commit 'c8484abbbde02171023f159491ca342186ae095c':
Frameworks/base: Use || instead of |
2015-03-17 20:47:41 +00:00
Andreas Gampe
d75a3b4d2c
am 17eda7d0: am 4d907643: Merge "Frameworks/base: Fix trivial equals implementation"
...
* commit '17eda7d0bed1d32a9b8f4a6a9d572aeabb43810a':
Frameworks/base: Fix trivial equals implementation
2015-03-17 20:47:33 +00:00
Andreas Gampe
c8484abbbd
am 0ae488e1: Merge "Frameworks/base: Use || instead of |"
...
* commit '0ae488e1cb64318906397a40d8be4866e81e4860':
Frameworks/base: Use || instead of |
2015-03-17 20:41:04 +00:00
Andreas Gampe
17eda7d0be
am 4d907643: Merge "Frameworks/base: Fix trivial equals implementation"
...
* commit '4d9076437c0270cd863493f505e734a3108e89ea':
Frameworks/base: Fix trivial equals implementation
2015-03-17 20:40:58 +00:00
Andreas Gampe
be549f9b8e
Merge "Frameworks/base: Fix precedence bug"
2015-03-17 20:36:21 +00:00
Andreas Gampe
869d26fda0
Frameworks/base: Fix precedence bug
...
Explicit cast has higher precedence than shift.
Bug: 19797138
Change-Id: Ifcf569bf774fbf65ee50c078f736ad167bcc6b8c
2015-03-17 20:31:22 +00:00
Andreas Gampe
0ae488e1cb
Merge "Frameworks/base: Use || instead of |"
2015-03-17 20:28:53 +00:00
Andreas Gampe
e1b9262084
Frameworks/base: Use || instead of |
...
Nothing wrong with | in this case, but || is canonical.
Bug: 19797138
Change-Id: I5f145736a5470f7cde06efce9a217d86eda2135f
2015-03-17 20:27:42 +00:00
Andreas Gampe
4d9076437c
Merge "Frameworks/base: Fix trivial equals implementation"
2015-03-17 20:25:20 +00:00
Andreas Gampe
610b2c778c
Frameworks/base: Fix trivial equals implementation
...
The comparator's equal implementation doesn't satisfy the constraints
of an equals method, namely being reflexive. Use the standard Object
implementation instead.
Bug: 19797138
Change-Id: I74f888e99533e1945aab7ab10fe8ee3ded6388f4
2015-03-17 20:24:45 +00:00
John Spurlock
d799f70187
Merge "Audio: Flag volume adjustments from hardware keys."
2015-03-17 19:19:01 +00:00
Ruben Brunk
db2b5f4472
Merge "camera2: Release surface in ImageReader#close and fix legacy cleanup"
2015-03-17 19:11:33 +00:00
Filip Gruszczynski
a483a1d85e
am 81c47fc2: am 86318d76: Merge "Option for going home when going to sleep for devices without physical button." into lmp-mr1-modular-dev
...
* commit '81c47fc23a0a15dddf37d96d28305e8b5e5ca2da':
Option for going home when going to sleep for devices without physical button.
2015-03-17 19:06:58 +00:00
Filip Gruszczynski
81c47fc23a
am 86318d76: Merge "Option for going home when going to sleep for devices without physical button." into lmp-mr1-modular-dev
...
* commit '86318d768a2c5043e1261e9daacf1497d1e4a732':
Option for going home when going to sleep for devices without physical button.
2015-03-17 18:35:17 +00:00
John Spurlock
b94f2d6cad
Audio: Flag volume adjustments from hardware keys.
...
Bug: 19793279
Change-Id: If20d70c13c9e7d1f8a6b31e0069564073d30e2bc
2015-03-17 14:15:02 -04:00
Ruben Brunk
443ab2c7db
camera2: Release surface in ImageReader#close and fix legacy cleanup
...
Bug: 19694090
Change-Id: I344ad707dbd414db023e4770769b5237bd3bbb4e
2015-03-17 17:49:29 +00:00