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

124362 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Chris Craik
5be83edd15 Add Path.isConvex, and force View outlines to be convex 
Change-Id: Idf3f1ee44240d77f7a7ddd0da898da8aa5d41864
 2014-03-03 16:16:19 -08:00
Chris Craik
adbd2ba1bc Call correct MaskFilter factory method 
Change-Id: Ibc30361427cc484443579930f729145ef19c6916
 2014-02-28 12:47:47 -08:00
Chris Craik
411d13985f Merge "Fix use of Skia deprecated methods" 2014-02-28 20:39:57 +00:00
Chris Craik
6786252405 Fix use of Skia deprecated methods 
Change-Id: Ib89c20fc94bcce29b7490d6f55c73492735befda
 2014-02-28 12:26:34 -08:00
Alan Viverette
5523db2ea3 Merge "Don't smooth scroll if the adapter is null" 2014-02-28 20:22:53 +00:00
Tim Kilbourn
ce601aee4c am 7489271c: am c405bae9: am 7071786e: Clear child FragmentManagers when destroying Fragments. 
* commit '7489271cd12ef04ba19cd2ea31a1e79251b10a08':
  Clear child FragmentManagers when destroying Fragments.
 2014-02-28 20:19:16 +00:00
Alan Viverette
2ac93ae919 Don't smooth scroll if the adapter is null 
BUG: 13235508
Change-Id: I1ca8a5675aa07b9a987e47a6eacdc0a1e4adde74
 2014-02-28 12:18:38 -08:00
Tim Kilbourn
7489271cd1 am c405bae9: am 7071786e: Clear child FragmentManagers when destroying Fragments. 
* commit 'c405bae90d861a2487367c34b1a2ebd695da340d':
  Clear child FragmentManagers when destroying Fragments.
 2014-02-28 20:16:09 +00:00
Tim Kilbourn
c405bae90d am 7071786e: Clear child FragmentManagers when destroying Fragments. 
* commit '7071786e0074bea42b01236f817383cab69c1b63':
  Clear child FragmentManagers when destroying Fragments.
 2014-02-28 20:13:11 +00:00
Chad Brubaker
f87b224849 Merge "Remove SO_BINDTODEVICE from VPN protect" 2014-02-28 19:28:45 +00:00
Chris Wren
9f6a372ca0 Merge "create a synthetic 2U heads up notification" 2014-02-28 16:28:53 +00:00
Chris Wren
595c2c58d5 Merge "use ticker text as a criterion for heads up" 2014-02-28 16:28:39 +00:00
Chris Wren
8fd39ec46b create a synthetic 2U heads up notification 
combine the 1U with the action buttons to make a mid-sized notification
bounded to 128dp by the system ui
used for the heads up

Bug: 13208692
Change-Id: I382bb0bd1ce73f35295f05ca2606195986cff1d3
 2014-02-28 11:20:11 -05:00
Glenn Kasten
1489b09b64 Merge "AudioTrack constructor/set parameter frameCount is size_t" 2014-02-28 16:18:07 +00:00
Narayan Kamath
317f5119f8 Merge "Fix bad link tag in javadoc." 2014-02-28 14:07:33 +00:00
Narayan Kamath
80009c0298 Fix bad link tag in javadoc. 
Java7 javadoc tools seem to accept this without complaint
but not all targets use java7 yet.

Change-Id: Ib025d12550f5fd68edce5760747f9225a2be50c6
 2014-02-28 14:06:44 +00:00
Narayan Kamath
e0d10cd923 am d8ccf8b7: am be094d89: am 8fb22ae7: am eee2c72f: Merge "Various format string fixes for 64bit" 
* commit 'd8ccf8b789461e1706d10df44d109849fa974fc5':
  Various format string fixes for 64bit
 2014-02-28 13:53:15 +00:00
Narayan Kamath
d8ccf8b789 am be094d89: am 8fb22ae7: am eee2c72f: Merge "Various format string fixes for 64bit" 
* commit 'be094d89db01387f773786435e110bbe166f3c65':
  Various format string fixes for 64bit
 2014-02-28 13:50:57 +00:00
Narayan Kamath
be094d89db am 8fb22ae7: am eee2c72f: Merge "Various format string fixes for 64bit" 
* commit '8fb22ae772fc62a10db6a06f283140d9233e8704':
  Various format string fixes for 64bit
 2014-02-28 13:46:53 +00:00
Narayan Kamath
8fb22ae772 am eee2c72f: Merge "Various format string fixes for 64bit" 
* commit 'eee2c72f96cd4e6228c50c8b461b4dd84a9f4538':
  Various format string fixes for 64bit
 2014-02-28 05:45:01 -08:00
Narayan Kamath
eee2c72f96 Merge "Various format string fixes for 64bit" 2014-02-28 13:41:58 +00:00
Narayan Kamath
11e4317555 am 62d675c2: am 0d3548be: am d138029d: am 14420e29: Merge "AArch64: Use long[] for RS id array" 
* commit '62d675c240fd87cb987c86ae4f6ac17dc13374c8':
  AArch64: Use long[] for RS id array
 2014-02-28 13:35:07 +00:00
Narayan Kamath
62d675c240 am 0d3548be: am d138029d: am 14420e29: Merge "AArch64: Use long[] for RS id array" 
* commit '0d3548bea9986bb7446156699e200ffa147a3a02':
  AArch64: Use long[] for RS id array
 2014-02-28 13:31:58 +00:00
Narayan Kamath
0d3548bea9 am d138029d: am 14420e29: Merge "AArch64: Use long[] for RS id array" 
* commit 'd138029d92e1d4657815747f30004323061d34de':
  AArch64: Use long[] for RS id array
 2014-02-28 13:28:30 +00:00
Narayan Kamath
d138029d92 am 14420e29: Merge "AArch64: Use long[] for RS id array" 
* commit '14420e29abc0f16f818ddaf606515861ba69ae68':
  AArch64: Use long[] for RS id array
 2014-02-28 05:26:30 -08:00
Derek Sollenberger
fc92763408 Merge "Fix includes so that they no longer rely on the global Skia includes directories." 2014-02-28 13:23:15 +00:00
Narayan Kamath
14420e29ab Merge "AArch64: Use long[] for RS id array" 2014-02-28 13:22:26 +00:00
Narayan Kamath
ef23865154 Merge "API changes for 64 bit platforms." 2014-02-28 13:21:22 +00:00
Jeff Brown
ddb90b65f7 am 098bed6f: am bb689496: am 4c7e6900: Make meaning of PowerManager.isScreenOn() more consistent. 
* commit '098bed6f27b05c16ecc30f9d39005e5995f14263':
  Make meaning of PowerManager.isScreenOn() more consistent.
 2014-02-28 09:47:12 +00:00
Jeff Brown
098bed6f27 am bb689496: am 4c7e6900: Make meaning of PowerManager.isScreenOn() more consistent. 
* commit 'bb6894964b30d02dc3545f07b45140646ef17581':
  Make meaning of PowerManager.isScreenOn() more consistent.
 2014-02-28 09:40:28 +00:00
Jeff Brown
bb6894964b am 4c7e6900: Make meaning of PowerManager.isScreenOn() more consistent. 
* commit '4c7e6900c8bfd57652fc1ceca724208ca7556196':
  Make meaning of PowerManager.isScreenOn() more consistent.
 2014-02-28 09:21:36 +00:00
Tim Kilbourn
7071786e00 Clear child FragmentManagers when destroying Fragments. 
If Fragment has instantiated a child FragmentManager and is later
detached, it retains its reference to the child FragmentManager which
has been destroyed. This causes an IllegalStateException in the
child FragmentManager if the original Fragment is reattached.

Fixes Issue 42601.

Change-Id: I8db2b1a110a341dc259939723f4c5ec131ca5f1e
 2014-02-28 01:05:17 -08:00
Jeff Brown
4c7e6900c8 Make meaning of PowerManager.isScreenOn() more consistent. 
The power manager sends SCREEN_ON and SCREEN_OFF broadcasts
purely based on the current wakefulness state.  In particular,
when the system is awake, we consider the screen to be on even
if the screen may actually be off due to the proximity sensor
or some other condition.  Likewise when the system is dozing
or asleep, we consider the screen to be off although technically
it may still be on and dozing.

This behavior is maintained for compatibility with applications
that interpret screen on / off as an indicator of user presence.

As it happened, the value of PowerManager.isScreenOn() did not
always match the state indicated by the broadcasts under certain
situations.  Instead, it was based on the desired screen state.
These states used to be closely correlated but the addition
of doze mode causes them to diverge in meaning.

One consequence is that wake events from input devices might not
always wake the device from sleep unless the display's power
state was actually DOZING or OFF even if the power manager's
wakefulness was already DOZING or ASLEEP.  This is now fixed.

Change-Id: Ie819c6d2c5a9ffaaf3101c5dee93ff72e9bc9f30
 2014-02-27 21:17:34 -08:00
Alan Viverette
ed43470925 Merge "Refactor smooth scrolling sub-row calculation and clamp target" 2014-02-28 00:35:13 +00:00
Alan Viverette
cb23bce60a Refactor smooth scrolling sub-row calculation and clamp target 
BUG: 13205615
Change-Id: If3757be35593a072ba6e92aa9da085330a12fd9d
 2014-02-27 16:33:06 -08:00
Glenn Kasten
3118ca9b09 AudioTrack constructor/set parameter frameCount is size_t 
Change-Id: Ie92ab0433531b3852747a81d2bfce9625644a2ae
 2014-02-27 15:53:50 -08:00
Xavier Ducrohet
5ea4be5214 am b2334254: am ec84ada6: am 5e5602da: am 0c72b769: Merge "Update layoutlib method for SystemClock" 
* commit 'b2334254ef497e0dcda68d257c096516c77679a4':
  Update layoutlib method for SystemClock
 2014-02-27 23:41:38 +00:00
Xavier Ducrohet
b2334254ef am ec84ada6: am 5e5602da: am 0c72b769: Merge "Update layoutlib method for SystemClock" 
* commit 'ec84ada6e8f3dad738810e2f1cd085defbc6d0ab':
  Update layoutlib method for SystemClock
 2014-02-27 23:38:23 +00:00
Xavier Ducrohet
ec84ada6e8 am 5e5602da: am 0c72b769: Merge "Update layoutlib method for SystemClock" 
* commit '5e5602da5fa9cd2e1d135b2310af2a8352f65e8d':
  Update layoutlib method for SystemClock
 2014-02-27 23:34:34 +00:00
Xavier Ducrohet
5e5602da5f am 0c72b769: Merge "Update layoutlib method for SystemClock" 
* commit '0c72b76963f7f43a2f986c38831ce76b43c6275a':
  Update layoutlib method for SystemClock
 2014-02-27 15:32:43 -08:00
Xavier Ducrohet
0c72b76963 Merge "Update layoutlib method for SystemClock" 2014-02-27 23:28:14 +00:00
Deepanshu Gupta
667387fc13 Merge "Add tests to the layoutlib eclipse project." 2014-02-27 23:25:32 +00:00
Paul Lawrence
00d3ce57f3 am 8ba12779: am 43e412cb: am 1dd01130: am e2b220e8: am 0619edd3: am 7ab82a0c: am 657dbc40: am b3776881: am 8b916936: am 2e582d13: am 9bce4032: am 08ee74b1: am ea5586ef: am 4be7c61a: am 5677513b: am da37ed8b: am b9ba0c6c: Prevent authenticators from using Settings to 
* commit '8ba127796ebf85a70385b355cf378fd46edc40d7':
  Prevent authenticators from using Settings to  launch arbitrary activities.
 2014-02-27 22:43:54 +00:00
Carlos Valdivia
d96b923bd3 am a92eab69: am 2cafd66a: am 78ef794d: am dc7dfe2e: am b675b474: am 9395f63a: am 55cab009: (-s ours) am 9272db02: am c45bd7f2: Prevent authenticators from using Settings to launch arbitrary activities. 
* commit 'a92eab69d130f9b1b5600e428c53f32662b4a1e1':
  Prevent authenticators from using Settings to  launch arbitrary activities.
 2014-02-27 22:43:52 +00:00
Paul Lawrence
8ba127796e am 43e412cb: am 1dd01130: am e2b220e8: am 0619edd3: am 7ab82a0c: am 657dbc40: am b3776881: am 8b916936: am 2e582d13: am 9bce4032: am 08ee74b1: am ea5586ef: am 4be7c61a: am 5677513b: am da37ed8b: am b9ba0c6c: Prevent authenticators from using Settings to launch arbitr 
* commit '43e412cb67ad47c5c9d68ac8cbd12356aca97603':
  Prevent authenticators from using Settings to  launch arbitrary activities.
 2014-02-27 22:37:42 +00:00
Carlos Valdivia
a92eab69d1 am 2cafd66a: am 78ef794d: am dc7dfe2e: am b675b474: am 9395f63a: am 55cab009: (-s ours) am 9272db02: am c45bd7f2: Prevent authenticators from using Settings to launch arbitrary activities. 
* commit '2cafd66a57894687867e7ba6623389e0ccc38ade':
  Prevent authenticators from using Settings to  launch arbitrary activities.
 2014-02-27 22:37:40 +00:00
Paul Lawrence
43e412cb67 am 1dd01130: am e2b220e8: am 0619edd3: am 7ab82a0c: am 657dbc40: am b3776881: am 8b916936: am 2e582d13: am 9bce4032: am 08ee74b1: am ea5586ef: am 4be7c61a: am 5677513b: am da37ed8b: am b9ba0c6c: Prevent authenticators from using Settings to launch arbitrary activitie 
* commit '1dd01130cd0a3a43fac14da3a998ae0ac282cf80':
  Prevent authenticators from using Settings to  launch arbitrary activities.
 2014-02-27 22:34:30 +00:00
Carlos Valdivia
2cafd66a57 am 78ef794d: am dc7dfe2e: am b675b474: am 9395f63a: am 55cab009: (-s ours) am 9272db02: am c45bd7f2: Prevent authenticators from using Settings to launch arbitrary activities. 
* commit '78ef794d2d7051e554a83f802a187f563bd1425e':
  Prevent authenticators from using Settings to  launch arbitrary activities.
 2014-02-27 22:34:28 +00:00
Paul Lawrence
1dd01130cd am e2b220e8: am 0619edd3: am 7ab82a0c: am 657dbc40: am b3776881: am 8b916936: am 2e582d13: am 9bce4032: am 08ee74b1: am ea5586ef: am 4be7c61a: am 5677513b: am da37ed8b: am b9ba0c6c: Prevent authenticators from using Settings to launch arbitrary activities. 
* commit 'e2b220e8c50a7f51edd85e26a3084d9b525587a7':
  Prevent authenticators from using Settings to  launch arbitrary activities.
 2014-02-27 22:32:04 +00:00
Carlos Valdivia
78ef794d2d am dc7dfe2e: am b675b474: am 9395f63a: am 55cab009: (-s ours) am 9272db02: am c45bd7f2: Prevent authenticators from using Settings to launch arbitrary activities. 
* commit 'dc7dfe2e63a03a7bc057a83bf795dbc4fc869479':
  Prevent authenticators from using Settings to  launch arbitrary activities.
 2014-02-27 22:32:01 +00:00