Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
159,845 Commits 3 Branches 0 Tags
207356efae596b3860a384ced5f369462ce342d7
Commit Graph

45329 Commits

Author SHA1 Message Date
Amith Yamasani
108bdbc934 am efb2df69: Merge "Different messages when wiping user and not device" into lmp-mr1-dev 
* commit 'efb2df698a4c2ed3d3371656cab199e5e3737fa9':
  Different messages when wiping user and not device
 2014-11-21 23:00:52 +00:00
Amith Yamasani
efb2df698a Merge "Different messages when wiping user and not device" into lmp-mr1-dev 2014-11-21 22:27:17 +00:00
Chris Craik
1ae8a98e8a am 29dc496a: Merge "Revert "Add a way to override Xfermode DO NOT MERGE"" into lmp-mr1-dev 
* commit '29dc496a42d49a37dcd99c0465f3cec18a47e6ff':
  Revert "Add a way to override Xfermode DO NOT MERGE"
 2014-11-21 22:13:30 +00:00
Chris Craik
29dc496a42 Merge "Revert "Add a way to override Xfermode DO NOT MERGE"" into lmp-mr1-dev 2014-11-21 22:11:13 +00:00
Chris Craik
69e65019b0 Revert "Add a way to override Xfermode DO NOT MERGE" 
Feature no longer needed.

bug:18448377

This reverts commit 4678dcc552.

Change-Id: Ib0a19946e966a54857165555827b5fa7b34b6bea
 2014-11-21 22:05:33 +00:00
Jeff Sharkey
54c11274b5 am c0491a2e: Merge "Lightweight checkin output for network stats." into lmp-mr1-dev 
* commit 'c0491a2e2d30eb4bc3e03fccee89d57e9bd575e4':
  Lightweight checkin output for network stats.
 2014-11-21 22:05:18 +00:00
Jeff Sharkey
c0491a2e2d Merge "Lightweight checkin output for network stats." into lmp-mr1-dev 2014-11-21 21:59:17 +00:00
Amith Yamasani
3a3d212a51 Different messages when wiping user and not device 
There are 3 types of users
1. Primary - device will be wiped
2. Managed profile - profile will be removed
3. Secondary user - user will be removed

Show different messages for almost wipe and wipe in each
of these 3 cases.

Bug: 16843155
Change-Id: Icecfe520622773da9e45465bf2217e8ed38b266e
 2014-11-21 13:57:48 -08:00
Jeff Brown
1ac13e0212 am 682ed6b6: Merge "resolved conflicts for merge of 694c1d2b to lmp-mr1-dev" into lmp-mr1-dev 
* commit '682ed6b60807d5fa971dbd6c76deae788cb65df4':
  Support keeping activities resumed while dozing.
 2014-11-21 21:53:10 +00:00
Jeff Brown
9ef9401938 resolved conflicts for merge of 694c1d2b to lmp-mr1-dev 
Change-Id: I9a9b724e0fd12aa161ff276540431b9d8e218e2b
 2014-11-21 21:35:08 +00:00
Yigit Boyar
1bbaeaa4b5 am ace33655: Merge "Improve GridLayout\'s weight calculations" into lmp-mr1-dev 
* commit 'ace33655bff514698b322253c211f0af5a3edd37':
  Improve GridLayout's weight calculations
 2014-11-21 20:55:19 +00:00
Yigit Boyar
ace33655bf Merge "Improve GridLayout's weight calculations" into lmp-mr1-dev 2014-11-21 20:48:45 +00:00
Bryce Lee
deee556641 am d45cedd6: Merge "Make default windows features configurable." into lmp-mr1-dev 
* commit 'd45cedd6f5efd141be08ce4ffcecf478fbedb056':
  Make default windows features configurable.
 2014-11-21 19:21:25 +00:00
Bryce Lee
d45cedd6f5 Merge "Make default windows features configurable." into lmp-mr1-dev 2014-11-21 19:18:50 +00:00
Bryce Lee
d6e6e7235a Make default windows features configurable. 
Bug: 18434078
Change-Id: I0bafce1a201088a8681f4b9e43237e23b49296a2
 2014-11-21 11:08:45 -08:00
Jeff Sharkey
55a442e582 Lightweight checkin output for network stats. 
Define and print a compact version of network statistics when dump
is requested with the "--checkin" flag.  Defaults to last 24 hours,
but included data can be tweaked with various flags.

Groups together detailed network identities into larger umbrella
terms like "mobile" and "wifi."

Bug: 18415963
Change-Id: I70cf9c828ea5c6e5bb6884837d3608f66fbad2e6
 2014-11-21 10:11:10 -08:00
Ruben Brunk
a345b3671a am 5d3d53aa: Merge "Camera2: Doc updates for aeExposureCompensation." into lmp-mr1-dev 
* commit '5d3d53aa1361c094f05aa70129e49a04875ab5a6':
  Camera2: Doc updates for aeExposureCompensation.
 2014-11-21 17:49:34 +00:00
Ruben Brunk
5d3d53aa13 Merge "Camera2: Doc updates for aeExposureCompensation." into lmp-mr1-dev 2014-11-21 17:42:44 +00:00
Zoltan Szatmary-Ban
b3e8ff00c8 am 07334334: Merge "Adding method to query backup manager service activity status" into lmp-mr1-dev 
* commit '07334334aab3863408325653ceccee47f9e1788d':
  Adding method to query backup manager service activity status
 2014-11-21 15:24:33 +00:00
Zoltan Szatmary-Ban
07334334aa Merge "Adding method to query backup manager service activity status" into lmp-mr1-dev 2014-11-21 15:20:47 +00:00
Filip Gruszczynski
5ea0411f39 am a83c5806: Merge "SwipeDismissLayout makes activity opaque only after entry animation ends." into lmp-sprout-dev automerge: 96c5d37 
* commit 'a83c5806ded083f51549ba4bf70e0c1f6a17fc61':
  SwipeDismissLayout makes activity opaque only after entry animation ends.
 2014-11-21 10:21:19 +00:00
Filip Gruszczynski
a83c5806de Merge "SwipeDismissLayout makes activity opaque only after entry animation ends." into lmp-sprout-dev 
automerge: 96c5d37

* commit '96c5d37fb5139465cdd3d882b5deba830497557a':
  SwipeDismissLayout makes activity opaque only after entry animation ends.
 2014-11-21 10:13:59 +00:00
Christopher Tate
b2b8dcba2c am ad064d48: Merge "Recents backup helper" into lmp-mr1-dev 
* commit 'ad064d48adcfac71bd04d9f3bb5ea9d607d132a7':
  Recents backup helper
 2014-11-21 02:30:11 +00:00
Christopher Tate
ad064d48ad Merge "Recents backup helper" into lmp-mr1-dev 2014-11-21 02:24:31 +00:00
Alan Viverette
fa4eba9637 am 8ae85003: Merge "Update scrollbars to match Material spec" into lmp-mr1-dev 
* commit '8ae8500365e71c59cbe96f600371391ac8d245b8':
  Update scrollbars to match Material spec
 2014-11-21 02:16:17 +00:00
Alan Viverette
8ae8500365 Merge "Update scrollbars to match Material spec" into lmp-mr1-dev 2014-11-21 02:12:10 +00:00
Alan Viverette
69b802fdb6 am 69fe1e8e: Merge "Update overflow menu alignment to match spec" into lmp-mr1-dev 
* commit '69fe1e8e5fef5ceac9aa476995623fe80424019d':
  Update overflow menu alignment to match spec
 2014-11-21 01:55:19 +00:00
Alan Viverette
69fe1e8e5f Merge "Update overflow menu alignment to match spec" into lmp-mr1-dev 2014-11-21 01:50:38 +00:00
Dianne Hackborn
c43613becf am 28096c49: Merge "Fix issue #15828903: Intent.parseUri allows call to FLAG_GRANT_*_URI_PERMISSION" into lmp-mr1-dev 
* commit '28096c49d81ddcdde51627e9d396947efdc4f508':
  Fix issue #15828903: Intent.parseUri allows call to FLAG_GRANT_*_URI_PERMISSION
 2014-11-21 01:34:36 +00:00
Dianne Hackborn
28096c49d8 Merge "Fix issue #15828903: Intent.parseUri allows call to FLAG_GRANT_*_URI_PERMISSION" into lmp-mr1-dev 2014-11-21 01:31:10 +00:00
Dianne Hackborn
24b1c23c62 Fix issue #15828903: Intent.parseUri allows call to FLAG_GRANT_*_URI_PERMISSION 
You now need to set a flag if you want this unsafe behavior.

Change-Id: I185e9a04e005e42a887c3d58a2818616790b060a
 2014-11-20 17:17:39 -08:00
Alan Viverette
199ea8c0c7 Update overflow menu alignment to match spec 
BUG: 18417348
Change-Id: I5e4b1ca366c554bca33eac8e5403be6de72370f9
 2014-11-20 17:09:27 -08: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
Erik Kline
dedd42a2bd am 4e9ea5e9: Merge "Rename EXTRA_NETWORK ConnectivityManager constants." into lmp-mr1-dev 
* commit '4e9ea5e9aef8e35eaa5a876e726544277c80dec5':
  Rename EXTRA_NETWORK ConnectivityManager constants.
 2014-11-21 00:10:12 +00:00
Alan Viverette
7d5bcd7990 Update scrollbars to match Material spec 
Adds a minimum touch target size to the fast scroller so that we can
edge-align an 8dp thumb but still maintain a 48dp touch target.

BUG: 18467743
Change-Id: I31e9cf1948856f5fce7d75383b84a9359684ebe5
 2014-11-20 16:07:59 -08:00
Erik Kline
4e9ea5e9ae Merge "Rename EXTRA_NETWORK ConnectivityManager constants." into lmp-mr1-dev 2014-11-21 00:04:23 +00:00
John Reck
d3e5777e79 am 83fb64e8: Merge "If the surface is lost, release it" into lmp-mr1-dev 
* commit '83fb64e8ec4c6bc0930f50b24bd1c36a81f6a1c2':
  If the surface is lost, release it
 2014-11-21 00:04:18 +00:00
John Reck
83fb64e8ec Merge "If the surface is lost, release it" into lmp-mr1-dev 2014-11-21 00:00:08 +00:00
John Reck
9b5d427fe0 am 0b2dac34: Merge "Rename callDrawGLFunction" into lmp-mr1-dev 
* commit '0b2dac3452a58e76be7379b85e7505c531842b57':
  Rename callDrawGLFunction
 2014-11-20 23:29:31 +00:00
John Reck
0b2dac3452 Merge "Rename callDrawGLFunction" into lmp-mr1-dev 2014-11-20 23:26:07 +00:00
Jaewan Kim
52dcc7fb0a am 18ab5c21: Merge "Add an API to check availability of Ethernet interface." into lmp-mr1-dev 
* commit '18ab5c216c62d90a4b86f37a4c993c1c8b56835d':
  Add an API to check availability of Ethernet interface.
 2014-11-20 23:10:27 +00:00
Jaewan Kim
18ab5c216c Merge "Add an API to check availability of Ethernet interface." into lmp-mr1-dev 2014-11-20 23:07:43 +00:00
John Reck
680df8d60e Rename callDrawGLFunction 
Bug: 18471503
Change-Id: I00cb356ff2338da7fd07b9ba30b5b3dcbdffdb2e
 2014-11-20 14:40:52 -08:00
Eino-Ville Talvala
b22de13fdb am df84cb90: Merge "Camera: Add one more requirement to BURST_CAPTURE" into lmp-mr1-dev 
* commit 'df84cb90df6f4a98c853dd61e858f62a584cdac5':
  Camera: Add one more requirement to BURST_CAPTURE
 2014-11-20 22:04:54 +00:00
Eino-Ville Talvala
df84cb90df Merge "Camera: Add one more requirement to BURST_CAPTURE" into lmp-mr1-dev 2014-11-20 22:03:07 +00:00
Adrian Roos
62a7d53343 am 4e312d81: Merge "Add device locked API for TrustAgentService" into lmp-mr1-dev 
* commit '4e312d81c18b286170c904659e78cab4fdf27200':
  Add device locked API for TrustAgentService
 2014-11-20 21:41:46 +00:00
Adrian Roos
866bae50b7 am af6e657a: Merge "Update KeyguardManager.isDeviceLocked API" into lmp-mr1-dev 
* commit 'af6e657ab873623ed0e94bc8bcf8ed03f6bbe167':
  Update KeyguardManager.isDeviceLocked API
 2014-11-20 21:41:41 +00:00
Adrian Roos
4e312d81c1 Merge "Add device locked API for TrustAgentService" into lmp-mr1-dev 2014-11-20 21:38:17 +00:00
Adrian Roos
af6e657ab8 Merge "Update KeyguardManager.isDeviceLocked API" into lmp-mr1-dev 2014-11-20 21:38:14 +00:00