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

157650 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Ricardo Cervera
462b32011a am e9b5dfc0: am 25bf00bc: docs: Fixes to the Data Layer Wear class. 
automerge: 8837ce2

* commit '8837ce2ce3b8e10a5201a18b77a790d0df43d8e4':
  docs: Fixes to the Data Layer Wear class.
 2014-11-21 10:16:35 +00:00
Ricardo Cervera
9aede602ff am c8543b4f: Merge "docs: Fixes to the Data Layer Wear class." into lmp-dev 
automerge: 161dce4

* commit '161dce465ef528568eac119235e635b217322485':
  docs: Fixes to the Data Layer Wear class.
 2014-11-21 10:15:17 +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
Andrew Solovay
d3e2fd99e2 am c79173c7: am 05282133: Merge "docs: Bugfix & minor cleanup for "Providing Messaging for Auto"" into lmp-docs 
automerge: b5b9c9b

* commit 'b5b9c9b589c058d9e21ca23976d7574f9c604e38':
  docs: Bugfix & minor cleanup for "Providing Messaging for Auto"
 2014-11-21 10:12:52 +00:00
Elliott Hughes
2d7320066f am 03c80408: am 6c43e6b5: Fix and be more explicit about plurals best practices. 
automerge: 4db3fc1

* commit '4db3fc1c28d3894aed92c5aae40f25e713a69894':
  Fix and be more explicit about plurals best practices.
 2014-11-21 10:11:34 +00:00
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
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
ad064d48ad Merge "Recents backup helper" into lmp-mr1-dev 2014-11-21 02:24:31 +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
69fe1e8e5f Merge "Update overflow menu alignment to match spec" into lmp-mr1-dev 2014-11-21 01:50:38 +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
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
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
83fb64e8ec Merge "If the surface is lost, release it" into lmp-mr1-dev 2014-11-21 00:00:08 +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
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
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
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
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
Craig Mautner
25418aabb6 Merge "Ensure arraylist index is montonically decreasing" into lmp-mr1-dev 2014-11-20 20:53:36 +00:00
Jean-Michel Trivi
8dc1031453 Convert record channel mask for dynamic mix 
When creating the AudioRecord instance for a dynamic mix, convert
  the output channel mask of the mix to an input channel mask
  to be used by the AudioRecord instance through which the
  mixed audio is rerouted.

Bug 16009464

Change-Id: I3addbe85339f6f06b69acc3f9b8e2a765e5d7305
 2014-11-20 12:53:23 -08:00
Adrian Roos
481a6df99f Add device locked API for TrustAgentService 
Bug: 18414067
Change-Id: I96c68af9ccc9940acf9fab3b5bd39a3485f01045
 2014-11-20 21:48:38 +01:00
Christopher Tate
ac6a3a5e9d Recents backup helper 
Handles backup/restore of recent tasks for the system.  Currently the
thumbnails are not saved.

At restore time the historical task records are placed in a designated
separate location rather than directly in the live bookkeeping; this
avoids ID duplication issues and makes it easier to deal with lazy
adoption of the historical task state as apps are installed on the
device post-restore.

Bug 17303286
Bug 15986349

Change-Id: Ie156c1e2ab9c9a7e7ac0447b27016fdcef55dded
 2014-11-20 12:48:25 -08:00
Adrian Roos
50bfeec868 Update KeyguardManager.isDeviceLocked API 
Bug: 18414067
Change-Id: I0715714c2c9a122f578ec0c6f508faae12e6f752
 2014-11-20 21:45:04 +01:00
Ricardo Cervera
8837ce2ce3 am e9b5dfc0: am 25bf00bc: docs: Fixes to the Data Layer Wear class. 
* commit 'e9b5dfc0588010a97a561d3255ad35d10db000bc':
  docs: Fixes to the Data Layer Wear class.
 2014-11-20 20:37:34 +00:00
Ricardo Cervera
161dce465e am c8543b4f: Merge "docs: Fixes to the Data Layer Wear class." into lmp-dev 
* commit 'c8543b4f4661902371c16932faa109befb921345':
  docs: Fixes to the Data Layer Wear class.
 2014-11-20 20:37:30 +00:00
Eric Rowe
1d76d39723 Merge "Fix wifi reconnection tests." into lmp-mr1-dev 2014-11-20 20:36:44 +00:00
Eric Rowe
ef1a177e6c Fix wifi reconnection tests. 
Bug: 18417638
Change-Id: I1710e8b16d4ae1b32317deb0322a98ad45b4e1aa
 2014-11-20 12:32:58 -08:00
Wink Saville
816e19eb6d Merge "Revert "Additional changes to SubscriptionManager API as per API council."" into lmp-mr1-dev 2014-11-20 20:31:49 +00:00
Wink Saville
2d1ee98227 Revert "Additional changes to SubscriptionManager API as per API council." 
This reverts commit baf21da1e17ef358632c078128d381b3be218a08.

Change-Id: I73cbdfadf07ca3cf20b042781b62aafcc72b17d6
 2014-11-20 20:29:51 +00:00
Wink Saville
4a57e90817 Merge "Additional changes to SubscriptionManager API as per API council." into lmp-mr1-dev 2014-11-20 20:20:02 +00:00
Craig Mautner
3798383208 Merge "Use package name as custom resolver process name" into lmp-mr1-dev 2014-11-20 20:19:04 +00:00
Adam Lesinski
825e0da22a Merge "Fix race when cleaning up receivers/services in Context" into lmp-mr1-dev 2014-11-20 20:13:54 +00:00
Craig Mautner
7b4655dbbe Ensure arraylist index is montonically decreasing 
A previous fix for IndexOutOfBoundsException (ag/584621) left a
situation where the index would not decrement if the arraylist
size didn't change. The size doesn't change if the window being
removed is animating away. That caused window manager to remain
in an infinite loop within removeAllWindows.

This change ensures that the index diminishes each pass through
the loop and doesn't exceed the bounds of the arraylist.

Fixes bug 18362246.

Change-Id: Ibca70d95622f3b152ede14857f0e913099dc7b88
 2014-11-20 12:13:22 -08:00