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

186531 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Yang Ni
4470d68a89 Unhide new ScriptGroup API 
This includes the new class ScriptGroup2 and a related change in
class Script to add InvokeID.

Change-Id: I012dc0a32c65803453022fa534ef05f855ea5ace
 2015-03-31 15:00:13 -07:00
Miao Wang
eb9a10c829 Merge "[RenderScript] Remove @hide for setAutoPadding(boolean)." 2015-03-31 19:41:02 +00:00
John Reck
e478f460fe Merge "Fix warn log format" 2015-03-31 19:24:47 +00:00
John Reck
98fa0a322e Fix warn log format 
Change-Id: I7876dd5d0d0f68dde4cb0768699d800daff754f1
 2015-03-31 12:03:51 -07:00
Adrian Roos
1e3e6e99c6 Merge "Fix WindowOrientationListener crash if no sensor present" 2015-03-31 19:02:09 +00:00
Stuart Scott
edd33c8bdf Merge "Move reset network settings into framework." 2015-03-31 18:57:58 +00:00
Simranjit Singh Kohli
3580cd0b52 Merge "[Auth:Last Credentials Timing] : Introducing API" 2015-03-31 18:32:51 +00:00
Yin-Chia Yeh
37ec99b19c Merge "Add RAW12 image format" 2015-03-31 18:27:23 +00:00
Adrian Roos
1274196374 Fix WindowOrientationListener crash if no sensor present 
Bug: 19999145
Change-Id: Ie0c2a2f9ff337a6538e85dc9bd0ef108dd468d28
 2015-03-31 11:20:30 -07:00
Chad Brubaker
7744a25673 am 543189eb: am 826d6357: am 5491ea9e: Merge "Include operation handle in OperationResult" 
* commit '543189eb711c7aeefab9566b74b62c34d35115f5':
  Include operation handle in OperationResult
 2015-03-31 18:16:31 +00:00
Chad Brubaker
543189eb71 am 826d6357: am 5491ea9e: Merge "Include operation handle in OperationResult" 
* commit '826d63572be4b23ad2f70f3004d520d54ef4dc01':
  Include operation handle in OperationResult
 2015-03-31 18:10:02 +00:00
Chad Brubaker
826d63572b am 5491ea9e: Merge "Include operation handle in OperationResult" 
* commit '5491ea9e5bc6ce8eb0dc2e91e46608f6aa3e7dfc':
  Include operation handle in OperationResult
 2015-03-31 18:03:21 +00:00
Raph Levien
b929d65800 Merge "Remove unused constants in android_text_StaticLayout.cpp" 2015-03-31 17:49:31 +00:00
Chad Brubaker
5491ea9e5b Merge "Include operation handle in OperationResult" 2015-03-31 17:49:16 +00:00
Raph Levien
ee101a3c66 Remove unused constants in android_text_StaticLayout.cpp 
The logic for computing line breaking moved to Minikin, and so the
various Unicode characters with special meaning for line breaks are no
longer used in android_text_StaticLayout.cpp (which is now a fairly
thin wrapper that just does JNI glue). This patch deletes the
constants, which makes the warnings-as-errors setting of our current
clang build happy.

Change-Id: I1bb3596ca4f0c78a8e185af9000c0c366fb9b020
 2015-03-31 10:42:05 -07:00
Wale Ogunwale
1252317bdc Merge "Fix not persisting activities with FLAG_ACTIVITY_RETAIN_IN_RECENTS." 2015-03-31 17:20:16 +00:00
Christopher Tate
9e521fa9d1 Merge "Fixes to full-backup scheduling edge cases" 2015-03-31 17:19:39 +00:00
Mady Mellor
d032091fec Merge "Recognizes the stylus scale gesture in ScaleGestureDetector" 2015-03-31 17:11:44 +00:00
Svetoslav
4d42782e8c am becacfb8: (-s ours) am ffd24a58: am 13d8e41d: am c6be7545: am 37661db7: AccessibilityNodeInfo refresh returns a stale state. - DO NOT MERGE 
* commit 'becacfb843f162896600c818bfd753089caef70a':
  AccessibilityNodeInfo refresh returns a stale state. - DO NOT MERGE
 2015-03-31 17:04:31 +00:00
Kenny Root
fbf4f81179 am 6a2d2b9f: (-s ours) am 5fdb2ea7: (-s ours) am a7645df5: (-s ours) Merge "Revert "Track change to Conscrypt" DO NOT MERGE ANYWHERE" into lmp-mr1-modular-dev 
* commit '6a2d2b9f2b8b3fab6eafe37626a02b0a2f52747f':
  Revert "Track change to Conscrypt" DO NOT MERGE ANYWHERE
 2015-03-31 17:04:26 +00:00
Svetoslav
becacfb843 am ffd24a58: am 13d8e41d: am c6be7545: am 37661db7: AccessibilityNodeInfo refresh returns a stale state. - DO NOT MERGE 
* commit 'ffd24a58c89bcb502e8d6299b4368353b08a45be':
  AccessibilityNodeInfo refresh returns a stale state. - DO NOT MERGE
 2015-03-31 16:54:36 +00:00
Kenny Root
6a2d2b9f2b am 5fdb2ea7: (-s ours) am a7645df5: (-s ours) Merge "Revert "Track change to Conscrypt" DO NOT MERGE ANYWHERE" into lmp-mr1-modular-dev 
* commit '5fdb2ea76a8e0ffe8786a1e92ce565f7380384db':
  Revert "Track change to Conscrypt" DO NOT MERGE ANYWHERE
 2015-03-31 16:54:32 +00:00
Wale Ogunwale
29382d2961 resolved conflicts for merge of 6abcec1d to master 
Change-Id: I28986f8863298a767a8290b02d5418d4d1d42d17
 2015-03-31 09:53:39 -07:00
Svetoslav
ffd24a58c8 am 13d8e41d: am c6be7545: am 37661db7: AccessibilityNodeInfo refresh returns a stale state. - DO NOT MERGE 
* commit '13d8e41d3a866df0899a89c44c6afc4e2eb31bdc':
  AccessibilityNodeInfo refresh returns a stale state. - DO NOT MERGE
 2015-03-31 16:46:44 +00:00
Kenny Root
5fdb2ea76a am a7645df5: (-s ours) Merge "Revert "Track change to Conscrypt" DO NOT MERGE ANYWHERE" into lmp-mr1-modular-dev 
* commit 'a7645df5973cfb26aecabe093409e33eb745df17':
  Revert "Track change to Conscrypt" DO NOT MERGE ANYWHERE
 2015-03-31 16:46:39 +00:00
Clara Bayarri
6cedefa2e4 Merge "Editor: Fix crash when selecting text on a non-editable TextView" 2015-03-31 16:42:33 +00:00
Svetoslav
13d8e41d3a am c6be7545: am 37661db7: AccessibilityNodeInfo refresh returns a stale state. - DO NOT MERGE 
* commit 'c6be7545b4106b9ba586e365f2d2ab911cafea93':
  AccessibilityNodeInfo refresh returns a stale state. - DO NOT MERGE
 2015-03-31 16:41:00 +00:00
Kenny Root
a7645df597 Merge "Revert "Track change to Conscrypt" DO NOT MERGE ANYWHERE" into lmp-mr1-modular-dev 2015-03-31 16:40:15 +00:00
Svetoslav
c6be7545b4 am 37661db7: AccessibilityNodeInfo refresh returns a stale state. - DO NOT MERGE 
* commit '37661db7fa58c0559ef2b73b6f8c38124e3acd4a':
  AccessibilityNodeInfo refresh returns a stale state. - DO NOT MERGE
 2015-03-31 16:33:21 +00:00
Olawale Ogunwale
6abcec1d76 am df736de8: am d052a3d3: Merge "[ActivityManager] Fix index out of bounds when updating next pss time." 
* commit 'df736de8d8165b1aff675d00581ccdf94a7547aa':
  [ActivityManager] Fix index out of bounds when updating next pss time.
 2015-03-31 16:27:48 +00:00
Mike Lockwood
63473869da Merge "Add event scheduling support to USB MIDI Manager code" 2015-03-31 16:23:24 +00:00
Olawale Ogunwale
df736de8d8 am d052a3d3: Merge "[ActivityManager] Fix index out of bounds when updating next pss time." 
* commit 'd052a3d37beffff3735716340745ec7c83efc23d':
  [ActivityManager] Fix index out of bounds when updating next pss time.
 2015-03-31 16:21:03 +00:00
Ben Kwa
3c0439bed6 Merge "Add a "Select All" menu item and code." 2015-03-31 16:19:12 +00:00
Kenny Root
9eed9e962c Revert "Track change to Conscrypt" DO NOT MERGE ANYWHERE 
This reverts commit 4ff668d47ab9f49ec81606aec6d469ecd6ca37fa.

Bug: 19894176
Change-Id: I3cabec555f46b535720c58db73d9116d83a239dd
 2015-03-31 09:15:37 -07:00
Ben Kwa
3bcc9488a1 Add a "Select All" menu item and code. 
Change-Id: I31ed8bff83d8a621a31ea5c2a0d1bb218f53d6e2
 2015-03-31 09:12:37 -07:00
Olawale Ogunwale
d052a3d37b Merge "[ActivityManager] Fix index out of bounds when updating next pss time." 2015-03-31 16:09:16 +00:00
Mike Lockwood
2776133be7 Add event scheduling support to USB MIDI Manager code 
Change-Id: I9fdaaac35c296acc67ee0cf346b0c7b56bf58393
 2015-03-31 08:57:06 -07:00
Doris Liu
9e6afce34a Merge "Fix per-keyframe interpolators" 2015-03-31 15:17:32 +00:00
Clara Bayarri
7fc946eb5d Editor: Fix crash when selecting text on a non-editable TextView 
We are querying the insertion controller, which is null on a
non-editable TextView.

Change-Id: Ie8428c6264385a1283310823c959ecdd63ef5a3f
 2015-03-31 15:13:06 +01:00
Clara Bayarri
3af4330c53 Merge "Editor: Provide the selection content rect to ActionMode.Callback2" 2015-03-31 13:41:58 +00:00
Tom Hudson
f6967e686b Merge "Enter RectangleMode when the clip region is a rectangle" 2015-03-31 11:58:10 +00:00
Clara Bayarri
ea4f150c38 Editor: Provide the selection content rect to ActionMode.Callback2 
This is necessary for the positioning of the floating toolbar.

Change-Id: I790c1f011a7e90c5e315aad77e96569b26b553af
 2015-03-31 12:31:50 +01:00
Clara Bayarri
80d4bd84ed Merge "Editor: Reorder items in the text selection action mode." 2015-03-31 10:38:06 +00:00
Neil Fuller
cea283535c resolved conflicts for merge of 962a11ad to master 
Change-Id: I8c6ac62d7267629c019997bb343d863aa56264eb
 2015-03-31 11:15:39 +01:00
Neil Fuller
962a11ad5b am efd92907: am 25c5296b: Merge "An updater for all timezone data on a device" 
* commit 'efd92907898161efe466889d2229e4acde2e973c':
  An updater for all timezone data on a device
 2015-03-31 09:39:47 +00:00
Neil Fuller
efd9290789 am 25c5296b: Merge "An updater for all timezone data on a device" 
* commit '25c5296b0d85979ad216195000b857dce8127ab1':
  An updater for all timezone data on a device
 2015-03-31 09:31:48 +00:00
Narayan Kamath
b12dcfb1b1 Remove org.apache.http.legacy for declared shared lib lists. 
We currently unconditionally include this shared library in the
boot classpath, so attempts to compile it will fail resulting in
unnecessary logspam.

Change-Id: Iafe9b2e725e10d939cd39dd4a816a146a6031baf
 2015-03-31 08:51:53 +00:00
Neil Fuller
25c5296b0d Merge "An updater for all timezone data on a device" 2015-03-31 08:31:00 +00:00
Craig Mautner
0b037e93fc Merge "Remove one ANR cause and add logging for another" 2015-03-31 05:50:42 +00:00
Craig Mautner
cceeb58c13 Remove one ANR cause and add logging for another 
For bug 19823482.

Change-Id: Ic44c4fd11ef92546118b09526c97446a92a7b4e7
 2015-03-30 22:46:38 -07:00