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
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
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
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
Paul Lawrence
e2b220e8c5
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 '0619edd3f3b144a9664e8e588285f9351dc2dd96':
Prevent authenticators from using Settings to launch arbitrary activities.
2014-02-27 22:28:50 +00:00
Carlos Valdivia
dc7dfe2e63
am b675b474: am 9395f63a: am 55cab009: (-s ours) am 9272db02: am c45bd7f2: Prevent authenticators from using Settings to launch arbitrary activities.
...
* commit 'b675b474d1838189adc4dfa0e5e1ba1598c82dad':
Prevent authenticators from using Settings to launch arbitrary activities.
2014-02-27 22:28:47 +00:00
Paul Lawrence
0619edd3f3
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 '7ab82a0c602956251be9dd5539208af9cfecea33':
Prevent authenticators from using Settings to launch arbitrary activities.
2014-02-27 22:24:42 +00:00
Carlos Valdivia
b675b474d1
am 9395f63a: am 55cab009: (-s ours) am 9272db02: am c45bd7f2: Prevent authenticators from using Settings to launch arbitrary activities.
...
* commit '9395f63aa5a386088ad93e3e226ef333084c5b74':
Prevent authenticators from using Settings to launch arbitrary activities.
2014-02-27 22:24:39 +00:00
Paul Lawrence
7ab82a0c60
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 '657dbc40427c17cbf31be1a17cf2fa7a4116722a':
Prevent authenticators from using Settings to launch arbitrary activities.
2014-02-27 22:21:05 +00:00
Carlos Valdivia
9395f63aa5
am 55cab009: (-s ours) am 9272db02: am c45bd7f2: Prevent authenticators from using Settings to launch arbitrary activities.
...
* commit '55cab009f0c9b1939f8336e26144850a5fdc9d3a':
Prevent authenticators from using Settings to launch arbitrary activities.
2014-02-27 22:21:01 +00:00
Chris Craik
da3f525759
Merge "Fix TextureView texture filtering."
2014-02-27 22:20:31 +00:00
Christopher Tate
98bab26350
am 4522bd12: am a58c03f6: am 41bfe121: am 16678ac6: Merge "Fixed upgrading from forward-lock application to system application"
...
* commit '4522bd12a4f3d2b0c3156fc70937f78bed15a1f8':
Fixed upgrading from forward-lock application to system application
2014-02-27 22:16:39 +00:00
Christopher Tate
4522bd12a4
am a58c03f6: am 41bfe121: am 16678ac6: Merge "Fixed upgrading from forward-lock application to system application"
...
* commit 'a58c03f603cd90d1fed5566c88af5cd6c6f4caf5':
Fixed upgrading from forward-lock application to system application
2014-02-27 22:12:39 +00:00
Christopher Tate
a58c03f603
am 41bfe121: am 16678ac6: Merge "Fixed upgrading from forward-lock application to system application"
...
* commit '41bfe121cfa889df803a8916000e1fd0fbe87d5a':
Fixed upgrading from forward-lock application to system application
2014-02-27 22:09:18 +00:00
Christopher Tate
41bfe121cf
am 16678ac6: Merge "Fixed upgrading from forward-lock application to system application"
...
* commit '16678ac66f7e6d5ce414536b7534d1e823f7ab30':
Fixed upgrading from forward-lock application to system application
2014-02-27 14:06:32 -08:00
Christopher Tate
16678ac66f
Merge "Fixed upgrading from forward-lock application to system application"
2014-02-27 22:01:29 +00:00
Dale Hawkins
8a78a80709
Merge "Adds support for array string extra."
2014-02-27 21:29:32 +00:00
Paul Lawrence
657dbc4042
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 'b37768816cd9c530dcbb3a8f51d87536406a975b':
Prevent authenticators from using Settings to launch arbitrary activities.
2014-02-27 12:04:07 -08:00
Paul Lawrence
b37768816c
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 '8b91693683895a8b148f6ffea8944cef2ba8d99b':
Prevent authenticators from using Settings to launch arbitrary activities.
2014-02-27 12:00:08 -08:00
Deepanshu Gupta
36acf8baeb
Add tests to the layoutlib eclipse project.
...
Specify the test folder in the layoutlib/bridge eclipse project.
Also add the sourcepath for layoutlib-api-prebuilt.jar
Change-Id: I194ed182618e564388d6df645e2de7f59897fa1e
2014-02-27 11:59:50 -08:00
Paul Lawrence
8b91693683
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 '2e582d1379fa78e2693269d76d2bcd763bfbfba1':
Prevent authenticators from using Settings to launch arbitrary activities.
2014-02-27 11:55:10 -08:00
Paul Lawrence
2e582d1379
am 9bce4032: am 08ee74b1: am ea5586ef: am 4be7c61a: am 5677513b: am da37ed8b: am b9ba0c6c: Prevent authenticators from using Settings to launch arbitrary activities.
...
* commit '9bce4032e9b3ea3433f7c75cbfb8d784b12392aa':
Prevent authenticators from using Settings to launch arbitrary activities.
2014-02-27 11:44:37 -08:00
Paul Lawrence
9bce4032e9
am 08ee74b1: am ea5586ef: am 4be7c61a: am 5677513b: am da37ed8b: am b9ba0c6c: Prevent authenticators from using Settings to launch arbitrary activities.
...
* commit '08ee74b1f1c4df28faa4168114853836cc471095':
Prevent authenticators from using Settings to launch arbitrary activities.
2014-02-27 11:40:21 -08:00
Paul Lawrence
08ee74b1f1
am ea5586ef: am 4be7c61a: am 5677513b: am da37ed8b: am b9ba0c6c: Prevent authenticators from using Settings to launch arbitrary activities.
...
* commit 'ea5586ef7fc29463f8144931c2c43261d15043b1':
Prevent authenticators from using Settings to launch arbitrary activities.
2014-02-27 11:38:01 -08:00
Derek Sollenberger
eece0dda56
Fix includes so that they no longer rely on the global Skia includes directories.
...
bug:13225538
Change-Id: Ia5d816dc665f81c7985f21036af4fd0a63c560cf
2014-02-27 14:31:29 -05:00
Paul Lawrence
ea5586ef7f
am 4be7c61a: am 5677513b: am da37ed8b: am b9ba0c6c: Prevent authenticators from using Settings to launch arbitrary activities.
...
* commit '4be7c61a339f8200527f6df5a7b2215c96f81b4b':
Prevent authenticators from using Settings to launch arbitrary activities.
2014-02-27 11:28:43 -08:00
Paul Lawrence
4be7c61a33
am 5677513b: am da37ed8b: am b9ba0c6c: Prevent authenticators from using Settings to launch arbitrary activities.
...
* commit '5677513b7c46ca08a7fa34b9d227d7a448db6757':
Prevent authenticators from using Settings to launch arbitrary activities.
2014-02-27 11:24:05 -08:00
Carlos Valdivia
55cab009f0
am 9272db02: am c45bd7f2: Prevent authenticators from using Settings to launch arbitrary activities.
...
* commit '9272db024d013fbb48ec476c77562ab31d75a461':
Prevent authenticators from using Settings to launch arbitrary activities.
2014-02-27 11:22:53 -08:00
Paul Lawrence
5677513b7c
am da37ed8b: am b9ba0c6c: Prevent authenticators from using Settings to launch arbitrary activities.
...
* commit 'da37ed8b0aebdf885a32cbe28e8fd5a2240d38c3':
Prevent authenticators from using Settings to launch arbitrary activities.
2014-02-27 11:20:24 -08:00
Carlos Valdivia
9272db024d
am c45bd7f2: Prevent authenticators from using Settings to launch arbitrary activities.
...
* commit 'c45bd7f20987ed2fd29b9192edb38d02b4caa23b':
Prevent authenticators from using Settings to launch arbitrary activities.
2014-02-27 11:17:11 -08:00
Paul Lawrence
da37ed8b0a
am b9ba0c6c: Prevent authenticators from using Settings to launch arbitrary activities.
...
* commit 'b9ba0c6c43f0f7f0d5e347030e3c86a86ed74542':
Prevent authenticators from using Settings to launch arbitrary activities.
2014-02-27 11:16:49 -08:00
John Spurlock
b11e98b2c1
Merge "Disable zen mode UI until provisioned."
2014-02-27 18:43:39 +00:00