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

607 Commits

Author SHA1 Message Date
Yohei Yukawa
cf1b3b4791 am 59fee2d5: Merge "Allow IMEs to start/stop receiving onUpdateCursor callback" 
* commit '59fee2d5534965f0986e68e0c3562da5e65e6c45':
  Allow IMEs to start/stop receiving onUpdateCursor callback
 2014-04-08 05:52:14 +00:00
Yohei Yukawa
59fee2d553 Merge "Allow IMEs to start/stop receiving onUpdateCursor callback" 2014-04-08 05:48:45 +00:00
George Mount
fa3653eafc am f7fbe099: Merge "Allow opaque windows to become translucent." 
* commit 'f7fbe099a80a6955f7c910dbae3c6fecfc0b151a':
  Allow opaque windows to become translucent.
 2014-04-07 23:34:35 +00:00
George Mount
f7fbe099a8 Merge "Allow opaque windows to become translucent." 2014-04-07 23:28:44 +00:00
Craig Mautner
89cca659f9 am 8ea553d0: am 8f2adcb1: am 228cefa8: am 3fb2b713: Merge "[ActivityManager] Reduce report ANR on wrong activity." 
* commit '8ea553d03a84e2fc3ded507dd978fca0dee22e77':
  [ActivityManager] Reduce report ANR on wrong activity.
 2014-04-07 22:30:00 +00:00
Craig Mautner
8ea553d03a am 8f2adcb1: am 228cefa8: am 3fb2b713: Merge "[ActivityManager] Reduce report ANR on wrong activity." 
* commit '8f2adcb10e9ddf2cc06cc4af431c9afb7be9d79a':
  [ActivityManager] Reduce report ANR on wrong activity.
 2014-04-07 22:27:55 +00:00
Craig Mautner
8f2adcb10e am 228cefa8: am 3fb2b713: Merge "[ActivityManager] Reduce report ANR on wrong activity." 
* commit '228cefa83dd7b95e5581f619bb597808af726f80':
  [ActivityManager] Reduce report ANR on wrong activity.
 2014-04-07 22:21:33 +00:00
Christoph Studer
9a762b3eee am d624a443: Merge "Write eventlog entries for notification panel visibility" 
* commit 'd624a443ec5662d2bf812b6992e783bea225d36d':
  Write eventlog entries for notification panel visibility
 2014-04-07 19:20:45 +00:00
Christoph Studer
d624a443ec Merge "Write eventlog entries for notification panel visibility" 2014-04-07 19:15:22 +00:00
Christoph Studer
23c6e078a5 am eceec528: Merge "NoManService: More efficient notification update" 
* commit 'eceec52894f5713b6f772a92fedd0182eab5c6dc':
  NoManService: More efficient notification update
 2014-04-07 18:55:41 +00:00
Christoph Studer
760ea554d0 Write eventlog entries for notification panel visibility 
Change-Id: Ie7e15ed15739cb5f057c900e1cadf90824b2b4ef
 2014-04-07 14:52:17 -04:00
Christoph Studer
d89188d68e NoManService: More efficient notification update 
Instead of removing the old notification and inserting the
updated notification afterwards, replace the old notification
in-place.

Change-Id: I88962fd2452de191c1d63c142719194282568dcc
 2014-04-07 14:49:05 -04:00
Michael Wright
adde87a645 am 118d1134: Merge "Fix size_t format specifier" 
* commit '118d113478a2c58e7997f926a8dd1bc5ca5f5dc8':
  Fix size_t format specifier
 2014-04-04 23:55:46 +00:00
Michael Wright
118d113478 Merge "Fix size_t format specifier" 2014-04-04 23:51:36 +00:00
Ruchi Kandoi
38915a1c4c am 654d75fe: PowerManager: Fix build 
* commit '654d75fec9e04306a3e08e4ef0c3aa0ec9ef96ea':
  PowerManager: Fix build
 2014-04-04 23:40:47 +00:00
Ruchi Kandoi
654d75fec9 PowerManager: Fix build 
fix build breaks by commit 667372e39bfe01bd15f0803d51ef0e9816f18808

Change-Id: I9e6e0f9146f860d27337cef0551c686ba2d60e23
 2014-04-04 16:34:56 -07:00
Michael Wright
9ecba5269b Fix size_t format specifier 
Change-Id: I7d4ce5e0c7bb4d9e0cc19edf68f30f6b2b054bc7
 2014-04-04 15:29:53 -07:00
Leon Scroggins
c1b717fbb4 am 7716b7d8: Merge "Update to call new Skia APIs." 
* commit '7716b7d8ef9addb913bbc4bdd3153fa36bd1aa87':
  Update to call new Skia APIs.
 2014-04-04 20:35:38 +00:00
Leon Scroggins
7716b7d8ef Merge "Update to call new Skia APIs." 2014-04-04 20:31:00 +00:00
Ruchi Kandoi
b0c8593d97 am f20a5eb2: PowerManager: add powerHint method 
* commit 'f20a5eb279035d462e1f5d9895f4eb66cc152215':
  PowerManager: add powerHint method
 2014-04-04 20:29:39 +00:00
Ruchi Kandoi
f20a5eb279 PowerManager: add powerHint method 
Add powerHint method to IPowerManager for passing power hints from other
processes.

Change-Id: Ic596ace2ed1796a6da4cddb2163dcc4536115e55
 2014-04-04 20:24:16 +00:00
John Spurlock
83398922ba am 0a0454fd: am 642421aa: am 5c31e487: Merge "Introduce new UI_MODE_TYPE_WATCH and qualifier." into klp-modular-dev 
* commit '0a0454fdcc7aeac6e57f9466da8f39bcf5f3f6ec':
  Introduce new UI_MODE_TYPE_WATCH and qualifier.
 2014-04-04 19:40:10 +00:00
John Spurlock
0a0454fdcc am 642421aa: am 5c31e487: Merge "Introduce new UI_MODE_TYPE_WATCH and qualifier." into klp-modular-dev 
* commit '642421aa7f284817cc1a972a7f9c7a64696a0116':
  Introduce new UI_MODE_TYPE_WATCH and qualifier.
 2014-04-04 19:34:11 +00:00
John Spurlock
642421aa7f am 5c31e487: Merge "Introduce new UI_MODE_TYPE_WATCH and qualifier." into klp-modular-dev 
* commit '5c31e487c4577e1c47ee7c949325d6a13f0d462e':
  Introduce new UI_MODE_TYPE_WATCH and qualifier.
 2014-04-04 19:28:09 +00:00
John Spurlock
6c191299a7 Introduce new UI_MODE_TYPE_WATCH and qualifier. 
Default ui mode to watch if we have FEATURE_WATCH.

Bug:13395758
Change-Id: Ie5ff95de60e69e91ad3612c7d2f1fca7f49061bd
 2014-04-04 15:21:53 -04:00
Leon Scroggins
cc11f15f76 Update to call new Skia APIs. 
I816129d49c0118453222916f3c818eccac33663d merges a new version of
Skia that updates various APIs. Call the new ones.

SkBitmap::copyTo now takes an SkColorType instead of an
SkBitmap::Config, so do the conversion with
SkBitmapConfigToColorType or use the enum when it makes sense.

Call SkImageDecoder::decodeSubset instead of (deprecated)
SkImageDecoder::decodeRegion.

Override SkCanvas::ClipVisitor::clipRRect in ClipCopier.

In Canvas::clip calls, call SkCanvas::isClipEmpty(), which was
previously called inside the clip call, to determine the return value.

For various SkPaint effects, call the new factories (as the constructors
have been made protected).

Implement SkJavaOutputStream::bytesWritten(), overriding a new pure
virtual function on SkWStream.

Update Matrix calls to always return true (since SkMatrix calls no
longer return a value).

Depends on I816129d49c0118453222916f3c818eccac33663d (skia).

Change-Id: I5cdcea827ebff587df0bbddc0965e3e0fbf48002
 2014-04-04 14:42:39 -04:00
Paul Lawrence
4a3285de79 am f17f0e0e: Merge "Save OwnerInfo so CryptKeeper can display at boot time" 
* commit 'f17f0e0eb0eef424401caa122e51a648f5ef3801':
  Save OwnerInfo so CryptKeeper can display at boot time
 2014-04-04 14:12:02 +00:00
Paul Lawrence
f17f0e0eb0 Merge "Save OwnerInfo so CryptKeeper can display at boot time" 2014-04-04 14:05:56 +00:00
Christopher Tate
2d79bb2300 am ed3db02c: Significant preconditions are significant 
* commit 'ed3db02c051f52f9ad3770e3c6b5b90c71a04fb1':
  Significant preconditions are significant
 2014-04-04 01:55:44 +00:00
Christopher Tate
ed3db02c05 Significant preconditions are significant 
If you are going to check whether we've failed yet, make sure that
the default state to test against has been established properly.

Bug 13790971

Change-Id: I7fc6ff1bbbd9e569df59dcb65cc30f120c128efa
 2014-04-03 16:21:01 -07:00
Dianne Hackborn
d21310ae0f am 5d5902d1: Merge "Don\'t allow -1 uids for wake locks." 
* commit '5d5902d140040936fa6aa7e443220140af0e9843':
  Don't allow -1 uids for wake locks.
 2014-04-03 20:56:17 +00:00
Dianne Hackborn
5d5902d140 Merge "Don't allow -1 uids for wake locks." 2014-04-03 20:49:57 +00:00
Craig Mautner
a6066bb7a4 am 35fc6a02: Merge "Implement setActivityLabelAndIcon()." 
* commit '35fc6a02aeded9578375af5828e14043164028d5':
  Implement setActivityLabelAndIcon().
 2014-04-03 20:43:44 +00:00
Craig Mautner
35fc6a02ae Merge "Implement setActivityLabelAndIcon()." 2014-04-03 20:37:29 +00:00
Yohei Yukawa
b7b7907fb5 Allow IMEs to start/stop receiving onUpdateCursor callback 
This CL introduces an API which allows IMEs to start/stop
receiving onUpdateCursor callback upon their request.

BUG: 13388665
Change-Id: I987326872def181dda5d9d701b762f088e0d9c39
 2014-04-04 04:34:44 +09:00
Dianne Hackborn
ef640cdfb2 Don't allow -1 uids for wake locks. 
Change-Id: Ia1b412a166f69247be3b047138349e7b4031bd7d
 2014-04-03 11:20:15 -07:00
Jinsuk Kim
53c4d55897 am f6028359: am f2fe3505: am 31518f74: Merge "Use build property for CEC device OSD name" into klp-modular-dev 
* commit 'f60283598751cbbdb65b2a59d2294e23bb4dfb99':
  Use build property for CEC device OSD name
 2014-04-03 02:17:08 +00:00
Jinsuk Kim
f602835987 am f2fe3505: am 31518f74: Merge "Use build property for CEC device OSD name" into klp-modular-dev 
* commit 'f2fe3505dac16dfa990fbab56713abab6ba0bc54':
  Use build property for CEC device OSD name
 2014-04-03 02:11:40 +00:00
Jinsuk Kim
64b1ad5a39 am c9cb9138: am 4c963841: am b1dca162: Merge "Maintain display power status for playback device" into klp-modular-dev 
* commit 'c9cb91388b268608c8b7f588dca8417f2661f0ed':
  Maintain display power status for playback device
 2014-04-03 01:44:24 +00:00
Christopher Tate
4a7000924a am a7d9b937: Merge "Refuse update of a system app if it changes its shared uid" 
* commit 'a7d9b93756c8b1e61a721fe14d941ee7ab975513':
  Refuse update of a system app if it changes its shared uid
 2014-04-03 01:44:20 +00:00
Jinsuk Kim
c9cb91388b am 4c963841: am b1dca162: Merge "Maintain display power status for playback device" into klp-modular-dev 
* commit '4c963841db60ed59fd59a6fba79f8e3e6ec7f349':
  Maintain display power status for playback device
 2014-04-03 01:41:13 +00:00
Christopher Tate
a7d9b93756 Merge "Refuse update of a system app if it changes its shared uid" 2014-04-03 01:39:36 +00:00
Jinsuk Kim
f2fe3505da am 31518f74: Merge "Use build property for CEC device OSD name" into klp-modular-dev 
* commit '31518f745ffa5e832274c332ac957a065948fdaf':
  Use build property for CEC device OSD name
 2014-04-03 00:39:23 +00:00
Christopher Tate
c935d1f111 Refuse update of a system app if it changes its shared uid 
Bug 13657183

Change-Id: I6d8fb9c8810ca896d2d10e5a80a3c4a50c9e4fed
 2014-04-02 17:00:04 -07:00
Jinsuk Kim
60b17cc094 Use build property for CEC device OSD name 
Previously OSD name was based on device type. This CL makes it
independent of device type. CEC spec says "A device that implements
more than one type of CEC functionality should respond with the same
OSD name for each logical address. It is recommended that the name
refers to the complete physical product rather than the individual
CEC functionality".

Now the default name comes from system build property. I removed
setOsdName() from aidl for now since it won't be in use.

Change-Id: I3c9fb877fad4bc5efef56268d155a3f37a865fc2
 2014-04-03 07:59:27 +09:00
Jinsuk Kim
4c963841db am b1dca162: Merge "Maintain display power status for playback device" into klp-modular-dev 
* commit 'b1dca1624dc8d853a52d1918c7672173e9b79836':
  Maintain display power status for playback device
 2014-04-02 22:43:52 +00:00
Jinsuk Kim
b1dca1624d Merge "Maintain display power status for playback device" into klp-modular-dev 2014-04-02 22:39:41 +00:00
Jorim Jaggi
ae6ffcc3c7 Merge "Wait for Keyguard to be drawn after boot." into master-lockscreen-dev 2014-04-02 21:22:59 +00:00
Chris Wren
506fbbfa4c am af31a7d1: Merge "add variance to notification usage stats" 
* commit 'af31a7d1cc26733f138119c43385aa86d0a3c04f':
  add variance to notification usage stats
 2014-04-02 21:07:21 +00:00
Chris Wren
af31a7d1cc Merge "add variance to notification usage stats" 2014-04-02 21:03:00 +00:00