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

159830 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Dirk Dougherty
403433401b am ef629f1f: am a79acc03: Doc change: localized content. 
automerge: 4d82f8a

* commit '4d82f8ad32f9caa3aff237600c4693f8907009e9':
  Doc change: localized content.
 2014-11-21 10:10:32 +00:00
smain@google.com
74bafd41af am 555d6e70: am 2411fe88: Merge "add the helpouts widget and necessary tags to "wave 2" of the Getting Started classes" into lmp-docs 
automerge: 6e08d30

* commit '6e08d30da4db5fc8a433b93f16ada2bcf6d1a5cd':
  add the helpouts widget and necessary tags to "wave 2" of the Getting Started classes
 2014-11-21 10:09:15 +00:00
Quddus Chong
5b944f4a3e am 8428c114: am 9b822b96: docs: Added link to CarExtender class from Auto Getting Started doc. 
automerge: a1e1890

* commit 'a1e18907975436803bc13a65ec25f30b6606379e':
  docs: Added link to CarExtender class from Auto Getting Started doc.
 2014-11-21 10:08:07 +00:00
Deepanshu Gupta
9ab79551ac am 4104abf8: Merge "Fix setTextAppearance for styles with dots." into lmp-dev 
automerge: ddc83df

* commit 'ddc83dfa8f17db1a8a566c8b92b0fea56dedd00a':
  Fix setTextAppearance for styles with dots.
 2014-11-21 10:06:59 +00:00
Deepanshu Gupta
1150292dac am 455654cf: Merge "LayoutLib: Stub AM/PM keycodes in Time Picker." into lmp-dev 
automerge: a0bc2e7  -s ours

* commit 'a0bc2e7e3c2f075a23449df00659c96d0cddb417':
  LayoutLib: Stub AM/PM keycodes in Time Picker.
 2014-11-21 10:05:07 +00:00
John Spurlock
ed06df1314 am 1bd81e31: Merge "Doze: Make proximity check configurable." into lmp-mr1-dev 
* commit '1bd81e31f31a6d8dc06af79985ca820effab970c':
  Doze: Make proximity check configurable.
 2014-11-21 03:40:45 +00:00
John Spurlock
1bd81e31f3 Merge "Doze: Make proximity check configurable." into lmp-mr1-dev 2014-11-21 03:36:40 +00:00
John Spurlock
686e4d57d8 Doze: Make proximity check configurable. 
Default to true, but make it available for overlay or setting
at runtime.

Bug: 18373928
Change-Id: I6abc1924ea0f03620f4683dc055f64ede5782809
 2014-11-20 21:59:13 -05: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
Geoffrey Borggaard
6a110c1adf am 271ddfce: Merge "Setting ADB_ENABLED may result in a SecurityException." into lmp-dev automerge: e4590cf automerge: db1e7fa 
* commit '271ddfce2cfb9e193a1ac83459010c095d918617':
  Setting ADB_ENABLED may result in a SecurityException.
 2014-11-21 00:45:01 +00:00
Geoffrey Borggaard
271ddfce2c Merge "Setting ADB_ENABLED may result in a SecurityException." into lmp-dev automerge: e4590cf 
automerge: db1e7fa

* commit 'db1e7fa097972d4cc26447f46abd8d4367d44eb7':
  Setting ADB_ENABLED may result in a SecurityException.
 2014-11-21 00:35:05 +00:00
Alan Viverette
9eb4ee244b am e0a377f5: Merge "Make DeviceDefault alert dialog themes public" into lmp-mr1-dev 
* commit 'e0a377f50951d51b5ddf3be6f0ce361affdffc56':
  Make DeviceDefault alert dialog themes public
 2014-11-21 00:14:22 +00: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
e0a377f509 Merge "Make DeviceDefault alert dialog themes public" into lmp-mr1-dev 2014-11-21 00:08:25 +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
Alan Viverette
8513453e37 Make DeviceDefault alert dialog themes public 
BUG: 18426645
Change-Id: Icd93dd4b153285e7636a59bec193b2fdf2d21da8
 2014-11-20 15:24:36 -08:00
ztenghui
e9dbfe5afd am 002bc810: Merge "ASLD: ASLD\'s XML reversible flag can turn off the reverse behavior now." into lmp-mr1-dev 
* commit '002bc810882c0a322a09d0e4527ab8083547e145':
  ASLD: ASLD's XML reversible flag can turn off the reverse behavior now.
 2014-11-20 23:16:23 +00:00
ztenghui
002bc81088 Merge "ASLD: ASLD's XML reversible flag can turn off the reverse behavior now." into lmp-mr1-dev 2014-11-20 23:11:38 +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
ztenghui
5b84eace6c ASLD: ASLD's XML reversible flag can turn off the reverse behavior now. 
Previously, the android:reversible flag behaves like a suggestion.
Now it is used to enforce no reverse when set to false. In this way, user can
safely setup one direction animation only.
When set to true, but AVD can't reverse , then it will show a warning.

At the same time, update the tests to show different cases, including
AnimationDrawable.

b/18413484

Change-Id: I5552c49dcbd76b0724b4d5593bce8388b27bd905
 2014-11-20 14:41:33 -08: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
Jean-Michel Trivi
14b909241f am 09ff9125: Merge "Convert record channel mask for dynamic mix" into lmp-mr1-dev 
* commit '09ff91255e945f2588c377614bf7b7c0d512118e':
  Convert record channel mask for dynamic mix
 2014-11-20 22:04:49 +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
Jean-Michel Trivi
09ff91255e Merge "Convert record channel mask for dynamic mix" into lmp-mr1-dev 2014-11-20 22:02:15 +00:00
Chris Craik
5b41215b16 am 93ef9639: Merge "Improve ColorMatrix docs" into lmp-mr1-dev 
* commit '93ef96395a95317bec4f27423ade1ce0d6aa07d8':
  Improve ColorMatrix docs
 2014-11-20 21:41:50 +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
Chris Craik
93ef96395a Merge "Improve ColorMatrix docs" into lmp-mr1-dev 2014-11-20 21:39:47 +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
Chris Craik
db7cc60eb2 Improve ColorMatrix docs 
bug:18415632

Clean up some text, and add a sample.

Change-Id: I39fdda2004e1932831058701f95f67355786ad9d
 2014-11-20 13:28:01 -08:00
Geoffrey Borggaard
90ed95faed am c3f5d718: Merge "Fix null handling in proxies." into lmp-dev 
* commit 'c3f5d7183a21cb081bab1a6bca3fc115523e4e78':
  Fix null handling in proxies.
 2014-11-20 20:59:00 +00:00