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

136895 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Aravind Akella
1a68f24ab7 Merge "Adding wakeup sensors, maxDelay to java SDK." 2014-05-27 19:25:41 +00:00
Chris Wren
42db9d0b23 am ba8af498: Merge "Reduce logspam by catching unexpected types ourselves." into lmp-preview-dev 
* commit 'ba8af498f08d4ac2e7712a8d307d24112ca1bc8e':
  Reduce logspam by catching unexpected types ourselves.
 2014-05-27 19:20:56 +00:00
Chris Wren
2ed67e6de7 Merge "Reduce logspam by catching unexpected types ourselves." into lmp-preview-dev 2014-05-27 19:15:25 +00:00
Jorim Jaggi
64554ad5f1 am 554f868c: Merge "Skeleton for Keyguard security method appear animations." into lmp-preview-dev 
* commit '554f868c94ad72ef12b6f2c966bd9709ead5c4e7':
  Skeleton for Keyguard security method appear animations.
 2014-05-27 18:34:38 +00:00
Jorim Jaggi
c41a7a1bb6 am 80aee1d5: Merge "Show bouncer immediately when MOTION_UP is received" into lmp-preview-dev 
* commit '80aee1d5e5d0095551c76fc4d52fa0616b0e5aeb':
  Show bouncer immediately when MOTION_UP is received
 2014-05-27 18:34:33 +00:00
Jorim Jaggi
fbd168331c Merge "Skeleton for Keyguard security method appear animations." into lmp-preview-dev 2014-05-27 18:31:57 +00:00
Jorim Jaggi
37d5c23998 Merge "Show bouncer immediately when MOTION_UP is received" into lmp-preview-dev 2014-05-27 18:31:10 +00:00
Deepanshu Gupta
8c1040f27d Merge "Add multiple dir support to build_font.py" 2014-05-27 18:14:56 +00:00
Etienne Le Grand
ef0b88181e am 7326defe: am d7439d8c: Merge "Add confidence to the heart rate monitor definition and clarify onAccuracyChange" into klp-modular-dev 
* commit '7326defe2de7ace86236bf0c5353fe0687c3f99c':
  Add confidence to the heart rate monitor definition and clarify onAccuracyChange
 2014-05-27 18:10:52 +00:00
Winson Chung
bd742e4694 am 872f0213: (-s ours) Merge "DO NOT MERGE" into lmp-preview-dev 
* commit '872f021357af59f12983c65d30d5cbb4b6dc7958':
  DO NOT MERGE
 2014-05-27 18:08:59 +00:00
Etienne Le Grand
7326defe2d am d7439d8c: Merge "Add confidence to the heart rate monitor definition and clarify onAccuracyChange" into klp-modular-dev 
* commit 'd7439d8c59e4c5a82ad94a5080436cc94f72e0be':
  Add confidence to the heart rate monitor definition and clarify onAccuracyChange
 2014-05-27 18:06:13 +00:00
Winson Chung
5859fc1096 Merge "DO NOT MERGE" into lmp-preview-dev 2014-05-27 18:04:36 +00:00
John Spurlock
6625a27d4c am e09eb7dc: Merge "frameworks/base: Performance tweaks for SeekBarVolumizer." into lmp-preview-dev 
* commit 'e09eb7dcc5b17d913c601aaa49ae12470fed97e6':
  frameworks/base: Performance tweaks for SeekBarVolumizer.
 2014-05-27 18:03:46 +00:00
Etienne Le Grand
d7439d8c59 Merge "Add confidence to the heart rate monitor definition and clarify onAccuracyChange" into klp-modular-dev 2014-05-27 18:03:13 +00:00
John Spurlock
150c07993f Merge "frameworks/base: Performance tweaks for SeekBarVolumizer." into lmp-preview-dev 2014-05-27 17:58:48 +00:00
John Spurlock
e56405c69b am de837355: Merge "Remove airplane, bugreport, and ringer mode global actions." into lmp-preview-dev 
* commit 'de8373552cbbc685bd45e529082c528907405037':
  Remove airplane, bugreport, and ringer mode global actions.
 2014-05-27 17:51:43 +00:00
Baligh Uddin
498cb6282c Merge "Import translations. DO NOT MERGE" 2014-05-27 17:51:34 +00:00
John Spurlock
4bb35da6ce Merge "Remove airplane, bugreport, and ringer mode global actions." into lmp-preview-dev 2014-05-27 17:48:14 +00:00
Christoph Studer
fd76bb5f93 am aafcbc8f: (-s ours) Merge "NoMan: Disable SQLite log DO NOT MERGE" into lmp-preview-dev 
* commit 'aafcbc8f030c6de7fbb77272d588de53a96b9a35':
  NoMan: Disable SQLite log DO NOT MERGE
 2014-05-27 17:45:25 +00:00
Christoph Studer
21b6c49a2d am f626c676: Merge "NoMan: Allow disabling SQLiteLog." into lmp-preview-dev 
* commit 'f626c67604a317bbcb1963a71b66a30b92df2973':
  NoMan: Allow disabling SQLiteLog.
 2014-05-27 17:45:19 +00:00
Christoph Studer
d68200c66b Merge "NoMan: Disable SQLite log DO NOT MERGE" into lmp-preview-dev 2014-05-27 17:41:34 +00:00
Christoph Studer
e397521449 Merge "NoMan: Allow disabling SQLiteLog." into lmp-preview-dev 2014-05-27 17:41:03 +00:00
Wink Saville
ec16a95928 Merge "Hide LogicalChannel operations developer preview." 2014-05-27 17:40:31 +00:00
Eric Laurent
bac10fa652 Merge "AudioManager: audio routing extensions" 2014-05-27 17:35:30 +00:00
John Spurlock
17f3f16c4f Remove airplane, bugreport, and ringer mode global actions. 
Bug:15281315
Change-Id: I16aa759a3269bb7757350edf2330cd72fd99a023
 2014-05-27 13:32:04 -04:00
Baligh Uddin
98b920a8b6 Merge "Import translations. DO NOT MERGE" 2014-05-27 17:28:10 +00:00
Baligh Uddin
3c7b7e8179 Merge "Import translations. DO NOT MERGE" 2014-05-27 17:28:07 +00:00
Baligh Uddin
0b30206fe5 Merge "Import translations. DO NOT MERGE" 2014-05-27 17:28:02 +00:00
Baligh Uddin
6160ff0e9f Merge "Import translations. DO NOT MERGE" 2014-05-27 17:27:58 +00:00
Winson Chung
826ee9eca3 am e5ecd6f8: (-s ours) Merge "DO NOT MERGE " into lmp-preview-dev 
* commit 'e5ecd6f89645af869e647c1a4d84597a67445780':
  DO NOT MERGE
 2014-05-27 17:13:03 +00:00
John Spurlock
95caba1270 frameworks/base: Performance tweaks for SeekBarVolumizer. 
Move ringtone init to the worker thread.  Allow the volumizer
instance to be reused by making the seekbar settable.

Bug:15091992
Change-Id: Ib616ae0fbb9a45c63391f8335e48ec2754dbdcd5
 2014-05-27 13:10:38 -04:00
Winson Chung
2eb4f9c377 DO NOT MERGE 
Removing unnecessary public values. (Bug 14995844)
(cherry picked from commit aa327fc2ce428f939885e1172578ff1dc975214c)

Change-Id: I98672d0ed3120c15bf31ce7a21ab604cfe66273d
 2014-05-27 17:07:52 +00:00
Winson Chung
8f4f2ff5cb Merge "DO NOT MERGE " into lmp-preview-dev 2014-05-27 17:07:10 +00:00
Leon Scroggins III
43e11eca16 Merge "Fix FILTER_BITMAP_FLAG regression in DrawFilter." 2014-05-27 17:01:24 +00:00
Craig Mautner
c40e7dc4fc Merge "resolved conflicts for merge of 754a8c4c to master" 2014-05-27 16:42:39 +00:00
Craig Mautner
39c1f59541 resolved conflicts for merge of 754a8c4c to master 
Change-Id: I750b714248486eb8609951caa10be7a543f624da
 2014-05-27 09:41:52 -07:00
Craig Mautner
667c77e419 am 0b6c8f59: (-s ours) Merge "Do not start tasks on ActivityViews unless explicit. DO NOT MERGE" into lmp-preview-dev 
* commit '0b6c8f599cf33abfe9cd3fe5ea8d0411bbb475c2':
  Do not start tasks on ActivityViews unless explicit. DO NOT MERGE
 2014-05-27 16:40:59 +00:00
Craig Mautner
c752919c7c Merge "Do not start tasks on ActivityViews unless explicit. DO NOT MERGE" into lmp-preview-dev 2014-05-27 16:37:45 +00:00
Craig Mautner
b539b3aafb Do not start tasks on ActivityViews unless explicit. DO NOT MERGE 
New tasks were being started on ActivityViews because they
matched packages. This fix enforces a rule that new tasks
can only be started on ActivityViews if they are explicitly
targeted for that ActivityView.

Fixes bug 15162447.

Change-Id: I9ccb72171b5cda0897a0b9ffe4cbebfbb0d92c2c

Conflicts:
	services/core/java/com/android/server/am/ActivityStackSupervisor.java
 2014-05-27 09:22:55 -07:00
Craig Mautner
754a8c4c95 am 1b4bf857: Do not start tasks on ActivityViews unless explicit 
* commit '1b4bf857d34dc58a4ef84f5f0761bb7685051fbb':
  Do not start tasks on ActivityViews unless explicit
 2014-05-27 16:22:39 +00:00
Craig Mautner
1b4bf857d3 Do not start tasks on ActivityViews unless explicit 
New tasks were being started on ActivityViews because they
matched packages. This fix enforces a rule that new tasks
can only be started on ActivityViews if they are explicitly
targeted for that ActivityView.

Fixes bug 15162447.

Change-Id: I9ccb72171b5cda0897a0b9ffe4cbebfbb0d92c2c
 2014-05-27 09:19:28 -07:00
Craig Mautner
bcede43413 am b984a072: Merge "Add more error checking to xml restore" into lmp-preview-dev 
* commit 'b984a072a7addc2404ea9ae2f67ccfa85e686167':
  Add more error checking to xml restore
 2014-05-27 16:16:47 +00:00
Leon Scroggins III
5f6aa983d6 Fix FILTER_BITMAP_FLAG regression in DrawFilter. 
Skia removed the corresponding kFilterBitmapFlag, replacing it with a
separate function: setFilterLevel. If the flag is set, turn it into a
call to setFilterLevel.

Corresponds to changes in I2736f3f68683651574d79a169ff0ab563e0a469e to
fix Paint.setFlags().

BUG:15112859
Change-Id: I269cbd7a624e5dde5688305e1ba97075ba73f4fd
 2014-05-27 12:15:32 -04:00
Craig Mautner
5d0045835b Merge "Add more error checking to xml restore" into lmp-preview-dev 2014-05-27 16:13:28 +00:00
ztenghui
9d8ef24cbb am 48454e7f: (-s ours) Merge "DO NOT MERGE: Hide the VectorDrawable" into lmp-preview-dev 
* commit '48454e7f16b7cca7989b377f608227b6ed8c9ced':
  DO NOT MERGE: Hide the VectorDrawable
 2014-05-27 16:12:48 +00:00
ztenghui
427a15a0f0 Merge "DO NOT MERGE: Hide the VectorDrawable" into lmp-preview-dev 2014-05-27 16:09:05 +00:00
Eric Laurent
a198a29250 AudioManager: audio routing extensions 
Added API and classes allowing framework components
to have direct control over audio routing and volumes.

Change-Id: I28225a6ebad86a7836e1ed749d93c0e964e215f1
 2014-05-27 08:46:56 -07:00
Adrian Roos
76ce460f70 am da1d6c3c: Merge "Initialize background visibility of ActivatableNotificationView" into lmp-preview-dev 
* commit 'da1d6c3c8a7e80fce5d0e1f3552ccd1f22039e47':
  Initialize background visibility of ActivatableNotificationView
 2014-05-27 15:39:28 +00:00
Adrian Roos
a33ea18dc6 Merge "Initialize background visibility of ActivatableNotificationView" into lmp-preview-dev 2014-05-27 15:37:38 +00:00
John Spurlock
1285b95173 am 3bfd2404: (-s ours) Merge "DO NOT MERGE Hide vibrator streamHint overloads for preview." into lmp-preview-dev 
* commit '3bfd24041ae8cb9adbe1f8f54792e0bebe33a3be':
  DO NOT MERGE Hide vibrator streamHint overloads for preview.
 2014-05-27 15:16:40 +00:00