Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
161,276 Commits 3 Branches 0 Tags
f5c178bdd3fcfe261ea43cbeef5c325a615af0e1
Commit Graph

60149 Commits

Author SHA1 Message Date
Alan Viverette
f5c178bdd3 am 6cb68b46: am 8f438e4c: Merge "Remove Holo fast scroll preview from Material overlay themes" into lmp-mr1-dev 
* commit '6cb68b4637db7cf59e0278d532a1160ff6adc71e':
  Remove Holo fast scroll preview from Material overlay themes
 2014-10-02 13:38:32 +00:00
Dianne Hackborn
7cf6cac507 am 03e173ed: am ded96310: am 796d6ece: am c338784b: Merge "More work on issue #17656716: Unhandled exception in Window Manager" into lmp-dev 
* commit '03e173edce42a5ae0de8a7718330d83664a84a9e':
  More work on issue #17656716: Unhandled exception in Window Manager
 2014-10-02 13:38:23 +00:00
Erik Pasternak
c7cbbe8e82 am d68362b9: am c6646b0c: am 739bf81d: am 4d82c46e: Merge "Implement auto-sleep functionality." into lmp-dev 
* commit 'd68362b962be2237418a1a10ebec7a2f75b9b267':
  Implement auto-sleep functionality.
 2014-10-02 13:38:16 +00:00
Alan Viverette
52bab6e722 am 3c062db9: am a5ecdbb1: Merge "Manage pressed state during drag-to-open" into lmp-mr1-dev 
* commit '3c062db99406f083f8c3529bcc56d042b9cb06b0':
  Manage pressed state during drag-to-open
 2014-10-02 13:37:56 +00:00
ztenghui
79ef48239d am 3fb45865: am 5f243860: am 9ad17521: am f9033048: Merge "+ correcting shadow visual appearance (b/17610926)" into lmp-dev 
* commit '3fb458653e50e350e9e377d071cb79573d531748':
  + correcting shadow visual appearance (b/17610926)
 2014-10-02 13:37:47 +00:00
Neil Fuller
c2a0b4482d resolved conflicts for merge of ee665151 to lmp-mr1-dev-plus-aosp 
Change-Id: I2588c65b7a9fa43f968151a206924a804f0595a7
 2014-10-02 14:32:37 +01:00
Hui Shu
0fdb165193 am 724fe35e: am 5f961157: am 888fd710: am 4e0ad44f: Merge "Revert "Remove WebView DRP Setting from Developer Settings"" into lmp-dev 
* commit '724fe35eac0afd885f3a20ebf846f0429303c157':
  Revert "Remove WebView DRP Setting from Developer Settings"
 2014-10-02 12:40:59 +00:00
Patrick Tjin
21b0fc91e0 am d104aae8: am cae74017: am f7c59190: am dea847c2: Skip over directories when iterating tombstones 
* commit 'd104aae8154ae182d58fc4c2b85fabbbe152faca':
  Skip over directories when iterating tombstones
 2014-10-02 12:38:44 +00:00
John Reck
2b16483ae6 am 3b2f6701: am d644facf: am f408656a: am 8786a962: Merge "Re-allow suppressing onDetachedFromWindow" into lmp-dev 
* commit '3b2f670187fde9079a1f9eaee92415b6a886611f':
  Re-allow suppressing onDetachedFromWindow
 2014-10-02 12:38:26 +00:00
Adam Powell
e18d68d6ab am 4e789dbf: am 8628387c: am b226d295: am c6a06d43: Merge "Revert "Fix issue with using locally defined attrs in a shared lib"" into lmp-dev 
* commit '4e789dbff0bc4d9c259a33d6e8ea595c0f4d5f35':
  Revert "Fix issue with using locally defined attrs in a shared lib"
 2014-10-02 12:38:21 +00:00
Hui Shu
30c284fc46 am 03e73745: am 7ce8d27f: am 9cd616e0: am aee5c9e7: Merge "Remove WebView DRP Setting from Developer Settings" into lmp-dev 
* commit '03e73745c69637efb806e174109410b0192536e7':
  Remove WebView DRP Setting from Developer Settings
 2014-10-02 12:38:15 +00:00
Neil Fuller
ee665151a4 am 0c1faf43: Merge "Switch from FloatMath -> Math and Math.hypot where possible" 
* commit '0c1faf43aecadc37b78c4ad6cb669eb351d21385':
  Switch from FloatMath -> Math and Math.hypot where possible
 2014-10-02 10:18:29 +00:00
Alan Viverette
6cb68b4637 am 8f438e4c: Merge "Remove Holo fast scroll preview from Material overlay themes" into lmp-mr1-dev 
* commit '8f438e4ccd19da343c37593ec61ba1887a7c304e':
  Remove Holo fast scroll preview from Material overlay themes
 2014-10-02 00:59:50 +00:00
Craig Mautner
bee6dfe09d am 8a33674b: am 3867e4d0: am 9ab8fbbc: am 245645ca: Merge "Don\'t clear visible-behind activity if it is top" into lmp-dev 
* commit '8a33674bed6791c63eee9d798693e25bc07b7cba':
  Don't clear visible-behind activity if it is top
 2014-10-02 00:58:50 +00:00
Alan Viverette
8f438e4ccd Merge "Remove Holo fast scroll preview from Material overlay themes" into lmp-mr1-dev 2014-10-02 00:55:27 +00:00
Dianne Hackborn
03e173edce am ded96310: am 796d6ece: am c338784b: Merge "More work on issue #17656716: Unhandled exception in Window Manager" into lmp-dev 
* commit 'ded96310cfd24b3cea21a814edf8629f592c7014':
  More work on issue #17656716: Unhandled exception in Window Manager
 2014-10-02 00:37:54 +00:00
Dianne Hackborn
ded96310cf am 796d6ece: am c338784b: Merge "More work on issue #17656716: Unhandled exception in Window Manager" into lmp-dev 
* commit '796d6eced1e23217914e639da45d9371baf8a5b0':
  More work on issue #17656716: Unhandled exception in Window Manager
 2014-10-02 00:32:02 +00:00
Dianne Hackborn
796d6eced1 am c338784b: Merge "More work on issue #17656716: Unhandled exception in Window Manager" into lmp-dev 
* commit 'c338784bf6bfcce3cd7db40f46b0e6c815e9ed3a':
  More work on issue #17656716: Unhandled exception in Window Manager
 2014-10-02 00:27:48 +00:00
Dianne Hackborn
c338784bf6 Merge "More work on issue #17656716: Unhandled exception in Window Manager" into lmp-dev 2014-10-02 00:23:18 +00:00
Erik Pasternak
d68362b962 am c6646b0c: am 739bf81d: am 4d82c46e: Merge "Implement auto-sleep functionality." into lmp-dev 
* commit 'c6646b0cb4ca34f1f0842b94367a5b34191f9976':
  Implement auto-sleep functionality.
 2014-10-02 00:14:41 +00:00
Erik Pasternak
c6646b0cb4 am 739bf81d: am 4d82c46e: Merge "Implement auto-sleep functionality." into lmp-dev 
* commit '739bf81dd130957c9bc09abc4e25732af2d675c0':
  Implement auto-sleep functionality.
 2014-10-02 00:09:47 +00:00
Erik Pasternak
739bf81dd1 am 4d82c46e: Merge "Implement auto-sleep functionality." into lmp-dev 
* commit '4d82c46ef5df06e1b92f3574e41b38a62ec0e607':
  Implement auto-sleep functionality.
 2014-10-02 00:04:01 +00:00
Erik Pasternak
4d82c46ef5 Merge "Implement auto-sleep functionality." into lmp-dev 2014-10-02 00:00:40 +00:00
Dianne Hackborn
8d05172112 More work on issue #17656716: Unhandled exception in Window Manager 
Fix Slog.wtf to not acquire the activity manager lock in its code
path, so that it can never deadlock.  This was the original intention
of it, but part was missed.

Now we can put back in the code to detect when strict mode data is
getting large (a little more targeted now to the actual problem),
and use Slog.wtf to report it.  And as a bonus, when this happens
we will now clear all of the collected violations, to avoid getting
in to the bad case where IPCs start failing.  So this should be
good enough for L to fix the problem, with wtf reports for us to
see if the underlying issue is still happening.

Finally, switch a butch of stuff in the system process from Log.wtf
to Slog.wtf, since many of those are deadlocks waiting to happen.

Oh and fix a crash in the settings provider I noticed in APR.

Change-Id: I307d51b7a4db238fd1e5fe2f3f9bf1b9c6f1c041
 2014-10-01 16:58:56 -07:00
Alan Viverette
d3cf7420ee Remove Holo fast scroll preview from Material overlay themes 
These were supposed to be removed when we updated the fast scroll
preview background for Material.

BUG: 17765143
Change-Id: I596398ea2e105fef9c92545d16955e684d980f73
 2014-10-01 16:54:19 -07:00
Alan Viverette
3c062db994 am a5ecdbb1: Merge "Manage pressed state during drag-to-open" into lmp-mr1-dev 
* commit 'a5ecdbb1a82f93a4feeefb2a905cb3881ab3bc3a':
  Manage pressed state during drag-to-open
 2014-10-01 23:46:58 +00:00
ztenghui
3fb458653e am 5f243860: am 9ad17521: am f9033048: Merge "+ correcting shadow visual appearance (b/17610926)" into lmp-dev 
* commit '5f243860a79ec158fc9f769bda7202dfd202da59':
  + correcting shadow visual appearance (b/17610926)
 2014-10-01 23:46:50 +00:00
Alan Viverette
a5ecdbb1a8 Merge "Manage pressed state during drag-to-open" into lmp-mr1-dev 2014-10-01 23:43:03 +00:00
Alan Viverette
62a8b61f92 Manage pressed state during drag-to-open 
BUG: 17573390
Change-Id: Ia85d7b51d6e4a18dcbf99b930f9f7c045697a31b
 2014-10-01 16:41:31 -07:00
ztenghui
5f243860a7 am 9ad17521: am f9033048: Merge "+ correcting shadow visual appearance (b/17610926)" into lmp-dev 
* commit '9ad17521ac073562991cddb78f14d6df8d5fd05a':
  + correcting shadow visual appearance (b/17610926)
 2014-10-01 23:41:00 +00:00
ztenghui
9ad17521ac am f9033048: Merge "+ correcting shadow visual appearance (b/17610926)" into lmp-dev 
* commit 'f903304896809039430c5e52bd0c24052f51b14f':
  + correcting shadow visual appearance (b/17610926)
 2014-10-01 23:35:45 +00:00
ztenghui
f903304896 Merge "+ correcting shadow visual appearance (b/17610926)" into lmp-dev 2014-10-01 23:29:32 +00:00
ztenghui
8def74de33 + correcting shadow visual appearance (b/17610926) 
+ adjusting spot and ambient shadow opacity constants to achieve desired appearance
+ reducing ambient scale ratio back to 1.0 to address over-lightening at higher elevations
+ partially revert ag/546290

Change-Id: I9d7f664f73a7b9b83df73b739103c97054bd4f6e
 2014-10-01 16:12:28 -07:00
Hui Shu
724fe35eac am 5f961157: am 888fd710: am 4e0ad44f: Merge "Revert "Remove WebView DRP Setting from Developer Settings"" into lmp-dev 
* commit '5f961157c4480e3abbde0f80e5f682da4224b528':
  Revert "Remove WebView DRP Setting from Developer Settings"
 2014-10-01 22:38:53 +00:00
Hui Shu
5f961157c4 am 888fd710: am 4e0ad44f: Merge "Revert "Remove WebView DRP Setting from Developer Settings"" into lmp-dev 
* commit '888fd710cd9ae569d47e1795f47e2ad909b5c8df':
  Revert "Remove WebView DRP Setting from Developer Settings"
 2014-10-01 22:25:53 +00:00
Patrick Tjin
d104aae815 am cae74017: am f7c59190: am dea847c2: Skip over directories when iterating tombstones 
* commit 'cae740173f2797209bea31f3df23e6b664754498':
  Skip over directories when iterating tombstones
 2014-10-01 22:23:28 +00:00
John Reck
3b2f670187 am d644facf: am f408656a: am 8786a962: Merge "Re-allow suppressing onDetachedFromWindow" into lmp-dev 
* commit 'd644facfcd415b0ced337c6c2ef116fc4f1e1f63':
  Re-allow suppressing onDetachedFromWindow
 2014-10-01 22:23:12 +00:00
Adam Powell
4e789dbff0 am 8628387c: am b226d295: am c6a06d43: Merge "Revert "Fix issue with using locally defined attrs in a shared lib"" into lmp-dev 
* commit '8628387c604168ccd1ae9c20b8b8d34c68e5f526':
  Revert "Fix issue with using locally defined attrs in a shared lib"
 2014-10-01 22:23:08 +00:00
Hui Shu
03e73745c6 am 7ce8d27f: am 9cd616e0: am aee5c9e7: Merge "Remove WebView DRP Setting from Developer Settings" into lmp-dev 
* commit '7ce8d27fcd83a4e193765f1814fb8f47d7ebf372':
  Remove WebView DRP Setting from Developer Settings
 2014-10-01 22:23:03 +00:00
Patrick Tjin
cae740173f am f7c59190: am dea847c2: Skip over directories when iterating tombstones 
* commit 'f7c59190f7f0ece82b98ed61ca16d5f7ab20dc0d':
  Skip over directories when iterating tombstones
 2014-10-01 22:18:04 +00:00
John Reck
d644facfcd am f408656a: am 8786a962: Merge "Re-allow suppressing onDetachedFromWindow" into lmp-dev 
* commit 'f408656a731328694b3ffee2f588263d60349dc3':
  Re-allow suppressing onDetachedFromWindow
 2014-10-01 22:16:43 +00:00
Adam Powell
8628387c60 am b226d295: am c6a06d43: Merge "Revert "Fix issue with using locally defined attrs in a shared lib"" into lmp-dev 
* commit 'b226d2951c8641f9851e40b4e13b4ae25cb1a482':
  Revert "Fix issue with using locally defined attrs in a shared lib"
 2014-10-01 22:15:56 +00:00
Hui Shu
7ce8d27fcd am 9cd616e0: am aee5c9e7: Merge "Remove WebView DRP Setting from Developer Settings" into lmp-dev 
* commit '9cd616e067b9049c87ad5064d3cf4b8cc380ddfa':
  Remove WebView DRP Setting from Developer Settings
 2014-10-01 22:15:52 +00:00
Hui Shu
888fd710cd am 4e0ad44f: Merge "Revert "Remove WebView DRP Setting from Developer Settings"" into lmp-dev 
* commit '4e0ad44fcac48b2be77bd116ffdb696cb6490829':
  Revert "Remove WebView DRP Setting from Developer Settings"
 2014-10-01 22:15:20 +00:00
Hui Shu
4e0ad44fca Merge "Revert "Remove WebView DRP Setting from Developer Settings"" into lmp-dev 2014-10-01 22:10:23 +00:00
Narayan Kamath
170444599c am 870c3553: am 13705ca9: am d480147f: am 7dc7f676: Merge "Set Build.CPU_ABI{2} from SUPPORTED_{32,64}_BIT_ABIS" into lmp-dev 
* commit '870c3553f15d9d085bb30b063563143c2fd09322':
  Set Build.CPU_ABI{2} from SUPPORTED_{32,64}_BIT_ABIS
 2014-10-01 22:02:44 +00:00
Brian Carlstrom
37fdb6e981 am b3ab7b95: am c9e46543: am ae214fac: am 7123bd69: Merge "Use VMRuntime.isBootClassPathOnDisk" into lmp-dev 
* commit 'b3ab7b95a687e4de13d06822fb295ee726b4b42f':
  Use VMRuntime.isBootClassPathOnDisk
 2014-10-01 22:02:36 +00:00
Jerome Poichet
c2ece4228d am 87ed0483: am 0d71155d: am a5fa02df: am 72079f7f: Merge "Make sure cancel is called on tear down." into lmp-dev 
* commit '87ed04832c7562260c3a87506286d63b137daee1':
  Make sure cancel is called on tear down.
 2014-10-01 22:02:16 +00:00
Jeff Brown
05af6adb8d Implement auto-sleep functionality. 
Added a new SLEEP_TIMEOUT setting which governs how long the device will
remain awake or dreaming without user activity.  By default this
value is set to -1 which maintains today's existing behavior.

We basically represent the time we are allowed to be dreaming as a new
kind of user activity summary state called DREAM, similar to BRIGHT
and DIM.  When the sleep timeout expires, the state is cleared and
the dream ends.

Bug: 17665809
Change-Id: I59aa7648dcec215f1285464fc1134934a09230e5
 2014-10-01 15:01:10 -07:00
Hui Shu
2267177279 Revert "Remove WebView DRP Setting from Developer Settings" 
This reverts commit eb487c6301.

Change-Id: Ie38a24efe2ea015b971cb0a05eca321299898538
 2014-10-01 21:41:07 +00:00