44643 Commits

Author SHA1 Message Date
Ricardo Cervera
2287879039 am 93f94c2c: resolved conflicts for merge of e8f6bd48 to lmp-dev
* commit '93f94c2ca5bf23533fc5a9bd70a4795584d20618':
  docs: Added info on noHistory and onActivityResult(). Bug: 13807256
2015-01-16 18:29:25 +00:00
Ricardo Cervera
93f94c2ca5 resolved conflicts for merge of e8f6bd48 to lmp-dev
Change-Id: Idc370182914d5060a721d34c26cd72598f2c6dff
2015-01-16 09:54:30 -08:00
Ricardo Cervera
e8f6bd4846 am 98f07d90: am 92f6a747: docs: Added info on noHistory and onActivityResult(). Bug: 13807256
* commit '98f07d901492335f51258655fbfa032fa3f2d58e':
  docs: Added info on noHistory and onActivityResult(). Bug: 13807256
2015-01-16 17:21:32 +00:00
Ricardo Cervera
98f07d9014 am 92f6a747: docs: Added info on noHistory and onActivityResult(). Bug: 13807256
* commit '92f6a747085b4b5ed692de4bdb0050c096eae393':
  docs: Added info on noHistory and onActivityResult(). Bug: 13807256
2015-01-16 17:14:44 +00:00
Deepanshu Gupta
7ed145493d am 7081a114: Merge "Add preferences rendering." into lmp-dev
* commit '7081a114d4ee190c746f337057b0f84928c162dd':
  Add preferences rendering.
2015-01-05 23:32:53 +00:00
Deepanshu Gupta
10bb1371dc Add preferences rendering.
NO_SQ: Depends on updating layoutlib-api-prebuilt.jar
Change-Id: Iae93ab74c478e6f2158e1528467bec9ee2d7ee9b
2014-12-23 12:04:30 -08:00
Christoph Studer
4328588cb5 am 3eff1e1f: am 92c411b2: Merge "Fix MediaStyle docs mentioning 2 max actions in compact view" into lmp-docs
* commit '3eff1e1f0e685e1dbb7e2621f5a8ab51a1c321d7':
  Fix MediaStyle docs mentioning 2 max actions in compact view
2014-12-17 12:28:14 +00:00
Christoph Studer
3eff1e1f0e am 92c411b2: Merge "Fix MediaStyle docs mentioning 2 max actions in compact view" into lmp-docs
* commit '92c411b24eaa787158b19b209050ea35fc5070b6':
  Fix MediaStyle docs mentioning 2 max actions in compact view
2014-12-17 12:22:33 +00:00
Christoph Studer
250a141cbe Fix MediaStyle docs mentioning 2 max actions in compact view
Bug: 18729304
Change-Id: Ica6b8ac47d7d38b1de62d64830256f66cbbdb225
2014-12-12 18:00:09 +00:00
Elliott Hughes
b034de7eef am 12f100de: am e8f6cb06: Merge "Fix typo." into lmp-docs
* commit '12f100def9e34a554df07f47badc259028ac4c68':
  Fix typo.
2014-12-09 19:30:26 +00:00
Elliott Hughes
12f100def9 am e8f6cb06: Merge "Fix typo." into lmp-docs
* commit 'e8f6cb065c33c21dfefe0039739dc38fde5cff6d':
  Fix typo.
2014-12-09 19:22:33 +00:00
Elliott Hughes
547b0acae1 Fix typo.
Bug: https://code.google.com/p/android/issues/detail?id=78422

(cherry picked from commit 0adcf15ad8b41559b50b3cbde6a103582f8c95b8)

Change-Id: I62746a0690e9845b20b23b91f2a50d85214e8aa1
2014-12-09 10:31:37 -08:00
Filip Gruszczynski
b8c0694ae8 Private Window flag to disable touch events in WallpaperService.
Change-Id: I18b46340f89cbea0b6daeb1efe9c31656f4e1a5d
2014-12-04 15:02:18 -08:00
Filip Gruszczynski
6e854ce572 Merge "Add overscan insets to surface frame dimensions in WallpaperService." into lmp-sprout-dev 2014-12-03 02:23:33 +00:00
Filip Gruszczynski
a2838dfc2c Add overscan insets to surface frame dimensions in WallpaperService.
Bug: 18595832
Change-Id: Ia5a03cc5e059153d76907627ee0811b0851e35ed
2014-12-02 17:23:41 -08:00
Ricardo Cervera-Navarro
d5412e3580 am 0ac703fc: am 1108b845: Merge "Sensor documentation fixes." into lmp-docs
* commit '0ac703fc8f4569338acc823221089c62480f0d7c':
  Sensor documentation fixes.
2014-12-02 18:53:20 +00:00
Ricardo Cervera-Navarro
0ac703fc8f am 1108b845: Merge "Sensor documentation fixes." into lmp-docs
* commit '1108b845f940debde0c1959a9293cafdc264afcc':
  Sensor documentation fixes.
2014-12-02 18:46:30 +00:00
Ricardo Cervera-Navarro
1108b845f9 Merge "Sensor documentation fixes." into lmp-docs 2014-12-02 18:33:50 +00:00
Narayan Kamath
7377998dac resolved conflicts for merge of a42f7c1d to lmp-sprout-dev
Change-Id: I8e53c9d7e0014b4ffc621c561b737aa2dae5460c
2014-11-26 10:39:08 +00:00
Christopher Tate
7265abe77a Be increasingly aggressive about fstrim if it isn't being run
The current heuristics depend on devices being alive at midnight+ in
order to run periodic background fstrim operations.  This unfortunately
means that people who routinely turn their devices off overnight wind
up with their devices *never* running fstrim, and this causes major
performance and disk-life problems.

We now backstop this very-friendly schedule with an increasingly
aggressive one.  If the device goes a defined time without a background
fstrim, we then force the fstrim at the next reboot.  Once the
device hits the midnight+ idle fstrim request time, then we already
aggressively attempt to fstrim at the first available moment
thereafter, even if it's days/weeks later without a reboot.

'Available' here means charging + device idle.  If the device never
becomes idle then we can't do much without rendering an in-use device
inoperable for some number of minutes -- but we have no evidence of
devices ever failing to run fstrim due to this usage pattern.

A new Settings.Global element (type 'long', called
"fstrim_mandatory_interval") is the source of the backstop time.  If
this element is zero or negative, no mandatory boot-time fstrim will
ever be performed.  If the element is not supplied on a given device,
the default backstop is 3 days.

Adds a new string to display in the upgrading dialog when doing
the fstrim.  Note it is too late for this to be localized, but since
this operation can take a long time it is probably better to have
it show *something* even if not localized, rather than just sit there.

Bug 18486922

Change-Id: I5b265ca0a65570fb8931251aa1ac37b530635a2c
2014-11-25 16:35:06 -08:00
John Reck
2b36a86b8e Wire up surface width/height to lockHardwareCanvas DO NOT MERGE
Bug: 18338026
Change-Id: I6c37774ef1312278ae81280561060662fef923fb
(cherry picked from commit b35c9602cf5c628c621e4fe102a461505f302bfe)
2014-11-24 17:59:38 +00:00
Jeff Brown
3d110b2391 Make WallpaperService watch the actual display state.
Bug: 18471411
Change-Id: Ie9d2e70e4e105dfbb2cb4d9726f632bcf2cc0a31
2014-11-22 03:25:39 +00:00
Jeff Brown
694c1d2b2d Merge "Support keeping activities resumed while dozing." into lmp-sprout-dev 2014-11-21 00:54:05 +00:00
Jeff Brown
fbe96706bb Support keeping activities resumed while dozing.
If the lock screen is not shown, then let activities keep running
while dozing.  This is important to support ambient mode on watches
since it allows the home app to keep running.

To make this possible, we need to inform the activity manager about
the exact wakefulness state, not just the overall boolean
interactive state.

Bug: 18284212
Change-Id: Ia35c99127ce51ffc178f3a2f51fca67d24061c71
2014-11-20 16:49:18 -08:00
Filip Gruszczynski
96c5d37fb5 Merge "SwipeDismissLayout makes activity opaque only after entry animation ends." into lmp-sprout-dev 2014-11-20 15:51:09 +00:00
Deepanshu Gupta
a0bc2e7e3c am 455654cf: Merge "LayoutLib: Stub AM/PM keycodes in Time Picker." into lmp-dev
* commit '455654cffdaebcbbd4fa33de5bb18fa2752d6c9a':
  LayoutLib: Stub AM/PM keycodes in Time Picker.
2014-11-19 23:00:39 +00:00
Deepanshu Gupta
455654cffd Merge "LayoutLib: Stub AM/PM keycodes in Time Picker." into lmp-dev 2014-11-19 22:29:54 +00:00
Filip Gruszczynski
6eafa902cb SwipeDismissLayout makes activity opaque only after entry animation ends.
Bug: 18340863
Change-Id: Ic60fa2463618f86b1ae23fc4a0c06cd348f28334
2014-11-19 11:05:43 -08:00
Deepanshu Gupta
12b6d29b7b LayoutLib: Stub AM/PM keycodes in Time Picker.
TimePickerSpinnerDelegate doesn't need to deal with input when running
inside LayoutLib. So, we just return the keycodes as if it's running in
English locale.

Bug: http://b.android.com/79189
Change-Id: Ife0ae91a1e34a8dac379bc1dda1c1c8ed461c164
2014-11-18 22:02:40 +00:00
Jeff Sharkey
2e7000040e am d68b87cd: Recover apps with malformed certificates.
* commit 'd68b87cdd402d46013170d9316a31c82be4e4816':
  Recover apps with malformed certificates.
2014-11-12 22:20:46 +00:00
Jeff Sharkey
d68b87cdd4 Recover apps with malformed certificates.
There was a window of time in Lollipop where we persisted certificates
after they had passed through a decode/encode cycle.  The well-written
OpenSSL library was liberal when decoding (allowing slightly malformed
certs to be parsed), but then strict when encoding, giving us
different bytes for effectively the same certificate.

A related libcore change (0c990ab4a90b8a5492a67b2b728ac9a4a1ccfa1b)
now returns the original bytes verbatim, fixing both pre-Lollipop
installs and installs after that change.

This change recovers any apps that had been installed during the
window of time described above by doing a one-time check to see if
the certs are effectively equal.

Bug: 18228011
Change-Id: Ib82bd6db718d0490d7a26c9c1014b7c8457a7f2d
2014-11-12 13:16:06 -08:00
Aravind Akella
1375d3744c Sensor documentation fixes.
Bug: 17526079
Change-Id: I664e5e2d5103b87ed02f082551e46513f64b95a1
(cherry picked from commit 1f9b32f006f7c506d9df5bf73294710665746397)
2014-11-12 00:52:44 +00:00
John Reck
050a8a050d DO NOT MERGE Fix finalizer ordering/double-free issue
Bug: 18289984

If Surface:finalize() happens after HwuiContext:finalize()
it would try to manipulate a destroyed object. However, as
Surface:finalize() always calls HwuiContext:destroy() this
can be fixed by simply getting rid of HwuiContext's finalizer

Change-Id: I7c912214417ab32891b1c58d045c9721e5f01965
(cherry picked from commit c298f9c9170b9e8721cfb616f784ec22734f22f4)
2014-11-07 21:33:40 +00:00
Andre Eisenbach
df11d588bb Fix crash during Bluetooth on/off stress test
Bug: 18106938
Change-Id: Icdeb736d89d5926264f2043455ccbc3760fd5d29
(cherry picked from commit 178d3b54cd50558be789c5dfd8dad80ffdc65021)
2014-11-07 00:19:45 +00:00
Jeff Hao
2a83226c75 Merge "Change boot screen title to "Android is starting" when not upgrading." into lmp-sprout-dev 2014-11-06 20:45:01 +00:00
Jeff Hao
2e594cfe98 Change boot screen title to "Android is starting" when not upgrading.
Bug: 17565501
Bug: 18247218

(cherry picked from commit 9f60c08a446e38f9e2d5271546ef69ca5941eba9)

Change-Id: I1ec32b318b6221277fc3ffbc19966bf3330c2d93
2014-11-05 23:51:42 +00:00
Ricardo Cervera
92f6a74708 docs: Added info on noHistory and onActivityResult(). Bug: 13807256
Change-Id: Iae4901a311e76401396f89c552e5b27a49c65c83
2014-11-05 08:55:51 -08:00
Justin Koh
7c1ad0cac6 Hide Surface#lockHardwareCanvas DO NOT MERGE
Hide this for now, will be public in a later release.

Change-Id: Ie13438ed10918df8b044103ef04016494aed1d10
2014-11-04 11:26:14 -08:00
Deepanshu Gupta
cd5f3bab37 Merge "Use the right layout for inflating Action Bar." into lmp-dev
automerge: 84a89ed

* commit '84a89ed0f56d4c35cde5a1451a22a6edb59db06a':
  Use the right layout for inflating Action Bar.
2014-11-04 00:49:43 +00:00
Deepanshu Gupta
84a89ed0f5 Merge "Use the right layout for inflating Action Bar." into lmp-dev 2014-11-03 23:13:15 +00:00
Jeff Brown
e333e674a7 Add a function to boost screen brightness temporarily.
When PowerManager.boostScreenBrightness() is called, the screen
brightness is set to maximum for 5 seconds.  This action is
also considered to be user activity.

Bug: 17934954
Change-Id: I1cb4a03a60705c6c1c5cc9ff84b1c5dbd2932fcd
2014-10-31 18:45:11 -07:00
Alex Klyubin
dcf5af38bf am 8129b8b4: am dd8accfe: Merge "Mention ECDHE_PSK bug in Javadoc of PskKeyManager." into lmp-docs
* commit '8129b8b471e782708be945e40fa82d2c20ebceef':
  Mention ECDHE_PSK bug in Javadoc of PskKeyManager.
2014-10-31 15:48:44 +00:00
Alex Klyubin
8e93f0c3bc Mention ECDHE_PSK bug in Javadoc of PskKeyManager.
Bug: 18144779
Change-Id: I50e1bb18456295170ef288ad089a0edad7f00ecf
2014-10-30 21:39:03 +00:00
Mark Renouf
e69bebd5aa Preserve explicit consumed state in replaceSystemWindowInsets DO NOT MERGE
BUG: 18130296
Change-Id: Iaee21a45e8e84c6bf8d99b04382e43ec12606ce6
2014-10-30 21:03:25 +00:00
Deepanshu Gupta
0bffc736e1 Use the right layout for inflating Action Bar.
The choice of Action Bar layout depends on the theme. This also affects
the widget used to render the Action Bar.

Bug: http://b.android.com/77853
Change-Id: I6219a02853b4cd207a6125a5ed96fa5d16699460
2014-10-30 11:58:37 -07:00
Filip Gruszczynski
625ec48491 Check if context is actually an activity.
Bug: 18101409
Change-Id: Iab21338ef4ccaab0ce66d664502e0b5e88ad9c50
2014-10-23 10:56:24 -07:00
Bryce Lee
f03ba4f13b Merge "[Theater Mode] framework implementation through global setting" into lmp-sprout-dev 2014-10-22 20:33:08 +00:00
John Reck
2615de920b Surface:lockHardwareCanvas DO NOT MERGE
Bug: 17440886

Cherry pick of bb2d0cc7e1d487f7021b1f9ec0c6740e41b535f2

Change-Id: I78f25cdcfc49cc6a142a51b8aab009c37be8e6de
2014-10-22 08:33:31 -07:00
Bryce Lee
584a445179 [Theater Mode] framework implementation through global setting
Bug: 17684570
Change-Id: I64a9c9c0620049cdfcca0150648fa201281f7178
2014-10-21 15:55:55 -07:00
Filip Gruszczynski
3f8dd14451 Disable activity's translucency until it starts being swiped away.
Change-Id: Ia5dceac7bd9ff57920a43736f9db6a33175e01ac
2014-10-21 15:12:00 -07:00