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

185256 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Alan Viverette
4a357cd2e5 Replace usages of deprecated Resources.getColor() and getColorStateList() 
Change-Id: I8f64fe6c4c44a92ff6d07250223ba590a1d691b0
 2015-03-18 18:37:18 -07: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, 5e1565ead6dbb7d5c414522591f61b16a23de1c3.
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 ae114d2eb4f2720e0435623e49ff091e2308c18c.

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, 5e1565ead6dbb7d5c414522591f61b16a23de1c3.
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
Kenny Root
2974cb9fb2 am a52b0988: resolved conflicts for merge of c3f497ae to lmp-mr1-dev-plus-aosp 
* commit 'a52b0988f27a0bfe88d38aee5133c25264913f68':
  Track change to Conscrypt
 2015-03-18 18:28:59 +00:00
Kenny Root
a52b0988f2 resolved conflicts for merge of c3f497ae to lmp-mr1-dev-plus-aosp 2015-03-18 11:20:30 -07: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
Kenny Root
7a8c6714ab am 61ecb53e: resolved conflicts for merge of fb9ff42d to lmp-mr1-dev-plus-aosp 
* commit '61ecb53e73747b6400ba1cc2ffa2877c32a68fcd':
  Track change to Conscrypt
 2015-03-18 17:34:36 +00:00
Kenny Root
61ecb53e73 resolved conflicts for merge of fb9ff42d to lmp-mr1-dev-plus-aosp 
Change-Id: Ifff03303c62aeba576974b877988b3a479945aa2
 2015-03-18 10:26:11 -07:00
Alan Viverette
a0f0494059 Remove unnecessary null check in FastScroller 
Bug: 19805564
Change-Id: I12e1a3cadf52038fb480e5694d12b6ec5e0e467b
 2015-03-18 10:25:43 -07:00
Kenny Root
c3f497ae7d am 4ff668d4: Track change to Conscrypt 
* commit '4ff668d47ab9f49ec81606aec6d469ecd6ca37fa':
  Track change to Conscrypt
 2015-03-18 16:54:33 +00:00
Kenny Root
fb9ff42d74 am fbd8805c: Merge "Track change to Conscrypt" into lmp-mr1-ub-dev 
* commit 'fbd8805cd783e34aebf521913aeab6cfd483b7b2':
  Track change to Conscrypt
 2015-03-18 16:54:29 +00: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
Geoff Mendal
bf54a8af3b am 3b419c0f: (-s ours) am c0ca0de7: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-modular-dev 
* commit '3b419c0f5c870960b11c9fde81e9eb8ea8976aad':
  Import translations. DO NOT MERGE
 2015-03-18 15:49:36 +00:00
Geoff Mendal
3b419c0f5c am c0ca0de7: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-modular-dev 
* commit 'c0ca0de76e2a8b72ecc4068fcf5dfbef519e7ca6':
  Import translations. DO NOT MERGE
 2015-03-18 15:43:02 +00:00
Geoff Mendal
c0ca0de76e Merge "Import translations. DO NOT MERGE" into lmp-mr1-modular-dev 2015-03-18 15:37:18 +00:00
Geoff Mendal
77a7308dd1 Merge "Import translations. DO NOT MERGE" 2015-03-18 15:36:23 +00:00
Geoff Mendal
0a3963c7b1 Import translations. DO NOT MERGE 
Change-Id: I20b86613eb30cf53d0a421068cb3a93e63750c9f
Auto-generated-cl: translation import
 2015-03-18 08:00:13 -07:00
Geoff Mendal
7589fb3239 Import translations. DO NOT MERGE 
Change-Id: I77fb875f830ed43eb816f6c1241e36179e880376
Auto-generated-cl: translation import
 2015-03-18 07:54:46 -07:00
Geoff Mendal
44b789ee50 Merge "Import translations. DO NOT MERGE" 2015-03-18 13:53:31 +00:00
Geoff Mendal
05cc0270d8 Import translations. DO NOT MERGE 
Change-Id: I383533e102441de910bcee9f10662cc0dd082e59
Auto-generated-cl: translation import
 2015-03-18 06:49:50 -07:00
Geoff Mendal
db06c5222d Merge "Import translations. DO NOT MERGE" 2015-03-18 13:18:07 +00:00
Geoff Mendal
d253343da0 Import translations. DO NOT MERGE 
Change-Id: I85066a98008872466f6cb03770ceb2ff94abed0e
Auto-generated-cl: translation import
 2015-03-18 06:11:15 -07:00
Geoff Mendal
219f0769dd am 2e5651db: (-s ours) am 8d889a67: (-s ours) Import translations. DO NOT MERGE 
* commit '2e5651dbfd0dbea89657d381f48f0191d3b0558a':
  Import translations. DO NOT MERGE
 2015-03-18 13:01:16 +00:00
Geoff Mendal
2e5651dbfd am 8d889a67: (-s ours) Import translations. DO NOT MERGE 
* commit '8d889a67d079200fac0530542f48dd1d2fdedc4e':
  Import translations. DO NOT MERGE
 2015-03-18 12:54:48 +00:00
Geoff Mendal
8d889a67d0 Import translations. DO NOT MERGE 
Change-Id: I046ce211561d45c3ee6b1763a7578d9ac54f3c90
Auto-generated-cl: translation import
 2015-03-18 05:47:44 -07:00
Jae Seo
47e6c3abcb Merge "TIF: Add a missing comment for the return value of onSelectTrack()" 2015-03-18 01:20:06 +00:00
Jae Seo
c6a1e5d16c TIF: Add a missing comment for the return value of onSelectTrack() 
Bug: 19630395
Change-Id: I2caa9ace23ee003e9662e363538a363ae9a0ced7
 2015-03-17 18:02:51 -07:00
Alan Viverette
0e7c022601 Merge "Add single-arg TextView.setTextAppearance, deprecate two-arg method" 2015-03-18 00:34:38 +00:00
Dianne Hackborn
80d7fbf677 Merge "Fix build." 2015-03-18 00:25:25 +00:00
Dianne Hackborn
4025c96fac Fix build. 
Change-Id: I6797bb2b5c85961c3bcb3fa8950bae121232f592
 2015-03-17 17:22:33 -07:00
Erik Kline
e0b7fa6549 Merge "Fix missing printf argument." 2015-03-18 00:07:45 +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
Skuhne
7438f814f1 Merge "Change resize logic: Use resizeTask and remove stack resize UI/logic" 2015-03-17 23:35:38 +00:00
Skuhne
ece738b5bc Change resize logic: Use resizeTask and remove stack resize UI/logic 
Change-Id: I5af8171a4ca55252c009cf80d180c5d024c0fa03
 2015-03-17 16:31:04 -07:00
Andy Hung
2bec0fe3a7 Merge "Revert "Revert "soundpool: update sample rate when reusing audiotrack""" 2015-03-17 23:14:24 +00:00
Andy Hung
9bd868fe7a Merge "Revert "Revert "soundpool: reuse channel for same sample if available""" 2015-03-17 23:12:38 +00:00
Erik Kline
86a5ce0402 Fix missing printf argument. 
Change-Id: Ifd1eebfbcefa06570882da54a1c410eabf26bce7
 2015-03-18 08:08:57 +09:00
Andy Hung
bc4537393b Revert "Revert "soundpool: update sample rate when reusing audiotrack"" 
This reverts commit b801f73343194cd081f675a5dc2b3e90959cf6d1.

Change-Id: I0f6ee7fc981d65040f32e7852a5f66fd391b329d
 2015-03-17 23:05:12 +00:00