Dan Sandler
29f89da0a8
am dfb39ce3: Merge "Turn off DEBUG_GESTURES" into lmp-mr1-dev
...
* commit 'dfb39ce332d4256363d1c2a47e68eecd5f144edc':
Turn off DEBUG_GESTURES
2014-12-03 02:18:06 +00:00
George Mount
24fac506f0
am 561261d4: Merge "Keep snapshot order matching the shared elements." into lmp-mr1-dev
...
* commit '561261d4442fb78b314c00f6b836fe7b1c387977':
Keep snapshot order matching the shared elements.
2014-12-03 02:17:58 +00:00
Trevor Johns
0d78c52bfc
Docs: Add "admin" to samples categories
...
Contains samples for device administration APIs.
Issue: 18544051
Change-Id: I8e157ba163848ac0356f2669a9cadd0f76b4ae9a
2014-12-02 18:17:22 -08:00
Trevor Johns
72f89d140d
Docs: Remove NavigationDrawer sample from What's New page
...
Using old UI conventions, needs to be updated for Material Design.
Issue: 18511422
Change-Id: I7e8189e9dca149c8bacda9b69036fefa34c1e4ca
2014-12-02 17:57:47 -08:00
Trevor Johns
fd9ec8e3bc
Docs: Remove GitHub links from docs/samples/new/index.html
...
Links were present as a workaround for the lack of a code browser
during the L Developer Preview, and are no longer necessary.
Issue: 18511191
Change-Id: I61068e3ff99fc5d8e4b3346c50d05fcd7f02ab32
2014-12-02 17:57:42 -08:00
Sanket Padawe
b13c12f58d
Merge "Call entitlement on clicking tethering tile in quick settings." into lmp-mr1-dev
2014-12-03 01:33:43 +00:00
Jason Sams
d6e9e61c9d
Merge "Fix bug in passing of context flags and version." into lmp-mr1-dev
2014-12-03 01:27:37 +00:00
Baligh Uddin
0fcd3f4107
Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev
2014-12-03 01:26:17 +00:00
Baligh Uddin
925c27bef8
Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev
2014-12-03 01:25:55 +00:00
Baligh Uddin
91426aa292
Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev
2014-12-03 01:25:37 +00:00
Baligh Uddin
ed3383770e
Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev
2014-12-03 01:25:17 +00:00
Baligh Uddin
51bca14386
Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev
2014-12-03 01:24:57 +00:00
Baligh Uddin
d33f84eb3e
Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev
2014-12-03 01:24:40 +00:00
Baligh Uddin
fccb3b43a9
Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev
2014-12-03 01:24:34 +00:00
Jason Sams
bb7e86ff04
Fix bug in passing of context flags and version.
...
bug 18592099
Change-Id: Id20906f6f47b573d881025453a3b6356bcf6e9c7
2014-12-02 17:24:17 -08: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
Mathieu Meisser
bc415a3677
Add keylayout for Logitech RedHawk Gamepad DO NO MERGE
...
Bug: 18596369
Change-Id: Iad03de3384052b360d6b9d887ca9540de68cd21e
2014-12-02 17:21:47 -08:00
Stuart Wells
4a52453ce8
Added Razer USA, Ltd serval DO NOT MERGE
...
Bug: 18596369
Change-Id: I76b7c36068c3d10ab4acb3123550ef115db0d3d2
2014-12-02 17:21:47 -08:00
Michael Wright
7081a5d1ae
Merge "Correctly iterate through MediaProjection callbacks." into lmp-mr1-dev
2014-12-03 01:14:22 +00:00
Baligh Uddin
5950a91371
Import translations. DO NOT MERGE
...
Change-Id: Ia2ccce90103cdc5e6b3814d50394e9c81e38010d
Auto-generated-cl: translation import
2014-12-02 16:50:24 -08:00
Craig Mautner
6ee618509a
Don't process windows belonging to unshown users
...
Add a test for whether a window will be shown to the current user.
Otherwise we wait to process windows that are drawn but will never
be shown. Consequently we end up in a layout loop that continues
to set pendingLayoutChanges at the point where "wallpaper and
commitFinishDrawingLocked true" message is generated.
Fixes bug 18510914.
Change-Id: Ib067b41b5f26b146ee6bdb16c2f3b07d20aa2c54
2014-12-02 16:47:29 -08:00
Baligh Uddin
18e71a31a2
Import translations. DO NOT MERGE
...
Change-Id: I32d37766e97752a7f9479cdf933470978ca3f616
Auto-generated-cl: translation import
2014-12-02 16:47:06 -08:00
Baligh Uddin
053b538ab2
Import translations. DO NOT MERGE
...
Change-Id: Id585c5bed5366430b476445a1806748894dd34ac
Auto-generated-cl: translation import
2014-12-02 16:45:14 -08:00
Alan Viverette
4eb2e04f4d
Merge "Use CURRENT_OR_SELF when checking SPEAK_PASSWORD setting" into lmp-mr1-dev
2014-12-03 00:43:47 +00:00
Baligh Uddin
44ed3c1148
Import translations. DO NOT MERGE
...
Change-Id: I7224417957b74eabb5e828d94ad11d89738f1724
Auto-generated-cl: translation import
2014-12-02 16:37:24 -08:00
Baligh Uddin
3e801388ad
Import translations. DO NOT MERGE
...
Change-Id: I6d028c94d3ac7df54925008e3cd71973aa9254c9
Auto-generated-cl: translation import
2014-12-02 16:32:15 -08:00
Adam Lesinski
4fb972207a
am 3550c6c5: am f17611a2: am 130e30fe: Merge "AAPT: Add custom transition classes to Proguard keep set" into lmp-mr1-dev
...
* commit '3550c6c5d67740b8ea77b2921146780fe340f34e':
AAPT: Add custom transition classes to Proguard keep set
2014-12-03 00:32:09 +00:00
Jason Sams
7048518eb1
am 233d700e: am b940599a: am abdaa32d: Merge "Fix bug in passing of context flags and version."
...
* commit '233d700efc5f308fe32acc5984b636860e4fc7b0':
Fix bug in passing of context flags and version.
2014-12-03 00:31:57 +00:00
Christopher Tate
0749755989
am f83fa5fe: am f9221a10: am 3bec5090: Merge "Properly recognize repeating wakeup alarms" into lmp-mr1-dev
...
* commit 'f83fa5fee60f449db0591661471581b8ce128439':
Properly recognize repeating wakeup alarms
2014-12-03 00:31:52 +00:00
Christopher Tate
3fbb7900b9
am 953e90d0: am f246b484: am 99391361: Merge "Midnight should mean midnight" into lmp-mr1-dev
...
* commit '953e90d0d77b050020fcdfae5b857108adb92102':
Midnight should mean midnight
2014-12-03 00:31:46 +00:00
Alan Viverette
ea0db58af3
am 42b678b3: am fa173e0c: am d72901f0: Merge "Update drawable container constant state following clone" into lmp-mr1-dev
...
* commit '42b678b3d7c10d6986aea82ec72e1b36f243972a':
Update drawable container constant state following clone
2014-12-03 00:31:39 +00:00
Alan Viverette
f50644f22b
am 6c23ba0d: am a6779bc5: am 9a888816: Merge "Deprecate one-arg getDrawableForDensity, update currents.txt" into lmp-mr1-dev
...
* commit '6c23ba0d8d39aed98197071c7cf9ffc0b6c633b5':
Deprecate one-arg getDrawableForDensity, update currents.txt
2014-12-03 00:31:33 +00:00
Svetoslav
67880ce3ff
am 935702b6: am 95482c28: am cdd3356d: Merge "Allow more space for the printer spinner to avoid truncation." into lmp-mr1-dev
...
* commit '935702b6d5873d028c5f5c0e35e46a35b5e11a22':
Allow more space for the printer spinner to avoid truncation.
2014-12-03 00:31:23 +00:00
Alan Viverette
1eb35de522
am 0cd6296c: am 63c7a655: am 1b33396e: Merge "Deprecate Resources.getDrawable(int) in favor of the two-arg version" into lmp-mr1-dev
...
* commit '0cd6296c0afb92f63487247ef4c9c73715113926':
Deprecate Resources.getDrawable(int) in favor of the two-arg version
2014-12-03 00:31:13 +00:00
Ricardo Cervera
58d3ddae33
am 24d40b30: am ce9936a8: am 152470a2: am 8c71df8d: am f9b8bd5e: am 6ee2ca2f: docs: Long press to dismiss fix by Wayne
...
* commit '24d40b302e5dabc6c435b6549ef5801540edfca8':
docs: Long press to dismiss fix by Wayne
2014-12-03 00:31:07 +00:00
Adam Lesinski
625fa573b4
am 9438ad15: am e580d661: am e89a2865: Merge changes If2c7e09f,Ie21f227c
...
* commit '9438ad1599716176fb6c593e77a2e93b265bbcb5':
RRO idmap: pad with 0xffffffff, not 0x00000000
RRO: reintroduce lost ResTable insert of assets
2014-12-03 00:30:56 +00:00
Chris Wren
83cb9cad31
am 723bce8a: am 47a5cb12: am acd01ff0: Merge "Keep deleteIntent when copying Notification attributes"
...
* commit '723bce8a0d4fa900ca4344c03e5e82b5881fcf19':
Keep deleteIntent when copying Notification attributes
2014-12-03 00:30:44 +00:00
Baligh Uddin
2135ce48a1
am 97267def: (-s ours) am e3a16016: (-s ours) am 92ad4dd0: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev
...
* commit '97267def8219d6ad3d8a96449b08653ae1bd6832':
Import translations. DO NOT MERGE
2014-12-03 00:30:35 +00:00
Baligh Uddin
fa2b3c24c7
am 52632ad8: (-s ours) am 74724945: (-s ours) am fccaa58c: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev
...
* commit '52632ad881c96e785518e18fde1a72e6f6e25a42':
Import translations. DO NOT MERGE
2014-12-03 00:30:30 +00:00
Baligh Uddin
12cadd4daf
am 3b027a37: (-s ours) am 3bcc97e7: (-s ours) am 6774911e: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev
...
* commit '3b027a374e6e8ba084b6dcfcdbf81ee581e20517':
Import translations. DO NOT MERGE
2014-12-03 00:30:26 +00:00
Baligh Uddin
68ccc097e9
am e105a70a: (-s ours) am 261db4f3: (-s ours) am 30460ae3: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev
...
* commit 'e105a70ae1dcfdbca15e188f27d7d3a1bea788d2':
Import translations. DO NOT MERGE
2014-12-03 00:30:22 +00:00
Jinsuk Kim
7ef3d12832
am eb6c6d63: am 566d15f6: am fb020862: Merge "CEC: Set the parameter of <System Audio Mode Request> right" into lmp-mr1-dev
...
* commit 'eb6c6d634774d85eceac135a91fdeaf3a884152e':
CEC: Set the parameter of <System Audio Mode Request> right
2014-12-03 00:30:08 +00:00
Baligh Uddin
c3a2ea95e6
Import translations. DO NOT MERGE
...
Change-Id: I91311501af2edb114e6db77786fcefaa6d26db3a
Auto-generated-cl: translation import
2014-12-02 16:30:05 -08:00
Alan Viverette
5c39807a57
am 73d28900: resolved conflicts for merge of 850cdbe5 to lmp-mr1-dev-plus-aosp
...
* commit '73d28900e96b84b2833954669f1db95326f3d6e0':
Consider RTL layout in DPAD navigation in AbsSeekBar
2014-12-03 00:29:46 +00:00
Craig Mautner
7ef0d514c3
am 61a7b7cf: am e4e7d2cd: am 41ec0400: Merge "Dismiss insecure keyguards if FLAG_SHOW_WHEN_LOCKED" into lmp-mr1-dev
...
* commit '61a7b7cff57dc66a1f64c9d7519fc1f6844b6915':
Dismiss insecure keyguards if FLAG_SHOW_WHEN_LOCKED
2014-12-03 00:29:30 +00:00
Stuart Scott
cacd99bd2c
am cc4cd6e1: am 15b2d9ab: am 4e779ecd: Merge "Subscription Info density-dependent text size and localized SIM slot index" into lmp-mr1-dev
...
* commit 'cc4cd6e1abe81d1edda7f1489dbd26298d38a699':
Subscription Info density-dependent text size and localized SIM slot index
2014-12-03 00:29:21 +00:00
Baligh Uddin
1540fd9cc5
Import translations. DO NOT MERGE
...
Change-Id: I5615709624d61d837bd562cc5bb4c454ef983527
Auto-generated-cl: translation import
2014-12-02 16:28:12 -08:00
Alan Viverette
9752428dc1
Use CURRENT_OR_SELF when checking SPEAK_PASSWORD setting
...
Using CURRENT isn't always safe.
BUG: 18557273
Change-Id: I12e197ab25b8ffdc04c5e74836945177870698a2
2014-12-02 16:24:24 -08:00
Adam Lesinski
62c5df52e7
AAPT: Add pathMotion custom classes to Proguard Keep set
...
Bug:18590044
Change-Id: Ia5dbf55317d2cc89826316e8d10f031b5d340e57
2014-12-02 16:23:59 -08:00
Nick Kralevich
2ae769782e
resolved conflicts for merge of ef9b1643 to master
...
Change-Id: Ifcde272f882e55998b16e02cca1e827dec35ce6f
2014-12-02 16:22:57 -08:00