Andrew Solovay
a1c2b6a9e9
am d3e2fd99: am c79173c7: am 05282133: Merge "docs: Bugfix & minor cleanup for "Providing Messaging for Auto"" into lmp-docs automerge: b5b9c9b
...
automerge: 5a75a66
2014-11-21 10:23:22 +00:00
Elliott Hughes
7e28e78b65
am 2d732006: am 03c80408: am 6c43e6b5: Fix and be more explicit about plurals best practices. automerge: 4db3fc1
...
automerge: 889a259
2014-11-21 10:22:21 +00:00
Ricardo Cervera
d9e6f658a5
am 462b3201: am e9b5dfc0: am 25bf00bc: docs: Fixes to the Data Layer Wear class. automerge: 8837ce2
...
* commit '462b32011a0b5309e97c4c0bf6bed976d070127f':
docs: Fixes to the Data Layer Wear class.
2014-11-21 10:21:30 +00:00
Ricardo Cervera
d4ea7b3cb6
am 9aede602: am c8543b4f: Merge "docs: Fixes to the Data Layer Wear class." into lmp-dev automerge: 161dce4
...
* commit '9aede602ff1fa23d1f97ccb0adf0967eef947977':
docs: Fixes to the Data Layer Wear class.
2014-11-21 10:21:25 +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
Dirk Dougherty
448d1ffcad
am 40343340: am ef629f1f: am a79acc03: Doc change: localized content. automerge: 4d82f8a
...
automerge: 1896e58
2014-11-21 10:21:02 +00:00
smain@google.com
2dc4cfa096
am 74bafd41: 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
...
automerge: 39d6b21
2014-11-21 10:19:49 +00:00
Geoffrey Borggaard
e548c3a378
am c3f5d718: Merge "Fix null handling in proxies." into lmp-dev
...
automerge: 90ed95f
2014-11-21 10:17:39 +00:00
Quddus Chong
5b51858dc2
am ecccf10b: am 5b944f4a: am 8428c114: am 9b822b96: docs: Added link to CarExtender class from Auto Getting Started doc. automerge: a1e1890
...
* commit 'ecccf10b42e0964bd5ee77f1f3fe3094b53d788c':
docs: Added link to CarExtender class from Auto Getting Started doc.
2014-11-21 10:17:06 +00:00
Deepanshu Gupta
fbff0191f6
am 58238d90: am 9ab79551: am 4104abf8: Merge "Fix setTextAppearance for styles with dots." into lmp-dev automerge: ddc83df
...
* commit '58238d900b43f6b780890b7ea93c11a877936ed7':
Fix setTextAppearance for styles with dots.
2014-11-21 10:17:00 +00:00
Deepanshu Gupta
7676f57608
am b4a23798: am 1150292d: am 455654cf: Merge "LayoutLib: Stub AM/PM keycodes in Time Picker." into lmp-dev automerge: a0bc2e7 -s ours
...
* commit 'b4a237987602b4243e20eb2d6858685cb54cf0a9':
LayoutLib: Stub AM/PM keycodes in Time Picker.
2014-11-21 10:16:55 +00:00
Andrew Solovay
5a75a660c0
am d3e2fd99: am c79173c7: am 05282133: Merge "docs: Bugfix & minor cleanup for "Providing Messaging for Auto"" into lmp-docs automerge: b5b9c9b
...
* commit 'd3e2fd99e23ca579d22508e40e4f58282ea7279e':
docs: Bugfix & minor cleanup for "Providing Messaging for Auto"
2014-11-21 10:16:55 +00:00
Elliott Hughes
889a259118
am 2d732006: am 03c80408: am 6c43e6b5: Fix and be more explicit about plurals best practices. automerge: 4db3fc1
...
* commit '2d7320066fd2622241cb388201d8b584081cc19c':
Fix and be more explicit about plurals best practices.
2014-11-21 10:16:50 +00:00
Dirk Dougherty
1896e58904
am 40343340: am ef629f1f: am a79acc03: Doc change: localized content. automerge: 4d82f8a
...
* commit '403433401bf5a86405d79b6e48ac972941425ed0':
Doc change: localized content.
2014-11-21 10:16:40 +00:00
Ricardo Cervera
462b32011a
am e9b5dfc0: am 25bf00bc: docs: Fixes to the Data Layer Wear class.
...
automerge: 8837ce2
2014-11-21 10:16:35 +00:00
smain@google.com
39d6b21ee5
am 74bafd41: 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 '74bafd41afd2291a9b28c9f2ae3baabca9f1d72d':
add the helpouts widget and necessary tags to "wave 2" of the Getting Started classes
2014-11-21 10:16:34 +00:00
Ricardo Cervera
9aede602ff
am c8543b4f: Merge "docs: Fixes to the Data Layer Wear class." into lmp-dev
...
automerge: 161dce4
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
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
2014-11-21 10:12:52 +00:00
Quddus Chong
ecccf10b42
am 5b944f4a: am 8428c114: am 9b822b96: docs: Added link to CarExtender class from Auto Getting Started doc. automerge: a1e1890
...
* commit '5b944f4a3e9d3fcca9cd54c08bc4a95c9cd87f80':
docs: Added link to CarExtender class from Auto Getting Started doc.
2014-11-21 10:11:49 +00:00
Deepanshu Gupta
58238d900b
am 9ab79551: am 4104abf8: Merge "Fix setTextAppearance for styles with dots." into lmp-dev automerge: ddc83df
...
* commit '9ab79551ac9cee85e019d524dae6a5a6b4004cb5':
Fix setTextAppearance for styles with dots.
2014-11-21 10:11:44 +00:00
Deepanshu Gupta
b4a2379876
am 1150292d: am 455654cf: Merge "LayoutLib: Stub AM/PM keycodes in Time Picker." into lmp-dev automerge: a0bc2e7 -s ours
...
* commit '1150292dacc912316a73594788f85d678faef15d':
LayoutLib: Stub AM/PM keycodes in Time Picker.
2014-11-21 10:11:39 +00:00
Elliott Hughes
2d7320066f
am 03c80408: am 6c43e6b5: Fix and be more explicit about plurals best practices.
...
automerge: 4db3fc1
2014-11-21 10:11:34 +00:00
Dirk Dougherty
403433401b
am ef629f1f: am a79acc03: Doc change: localized content.
...
automerge: 4d82f8a
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
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
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
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
2014-11-21 10:05:07 +00:00
John Spurlock
dc3e7d282c
am ed06df13: am 1bd81e31: Merge "Doze: Make proximity check configurable." into lmp-mr1-dev
...
* commit 'ed06df131467ce29017f20cfd25068dd3ba95759':
Doze: Make proximity check configurable.
2014-11-21 03:45:30 +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
ztenghui
5287c18880
am 3458abd6: am 002bc810: Merge "ASLD: ASLD\'s XML reversible flag can turn off the reverse behavior now." into lmp-mr1-dev automerge: e9dbfe5
...
* commit '3458abd6a7d0709f0360c1c18cce036bb7bc4299':
ASLD: ASLD's XML reversible flag can turn off the reverse behavior now.
2014-11-21 03:11:39 +00:00
Jaewan Kim
e95b9dd57f
am b5ba786c: am 18ab5c21: Merge "Add an API to check availability of Ethernet interface." into lmp-mr1-dev automerge: 52dcc7f
...
* commit 'b5ba786ccb9265ed076cda088ddbfded3ecc7f85':
Add an API to check availability of Ethernet interface.
2014-11-21 03:11:35 +00:00
Christopher Tate
5b0528b5e1
am b2b8dcba: am ad064d48: Merge "Recents backup helper" into lmp-mr1-dev
...
* commit 'b2b8dcba2c623f52ebe166ad68bff5f6a34bf25a':
Recents backup helper
2014-11-21 03:09:06 +00:00
Alan Viverette
ac280c48d0
am 8ae85003: Merge "Update scrollbars to match Material spec" into lmp-mr1-dev
...
automerge: fa4eba9
2014-11-21 03:03:46 +00:00
Alan Viverette
a35d07a4f0
am 69fe1e8e: Merge "Update overflow menu alignment to match spec" into lmp-mr1-dev
...
automerge: 69b802f
2014-11-21 03:02:39 +00:00
jungheang.lee
735b75ce27
Cannot set Pivot X,Y values from setPivotX, setPivotY API
...
Pivot value can not be changed once they have been set to default.
To be changed "==" -> "!=" in if()
BUG: 18474532
Change-Id: Iacd16eb951154ea97c241566b704e0ad3f225bd1
2014-11-21 03:01:41 +00:00
Dianne Hackborn
676b1d886c
am 28096c49: Merge "Fix issue #15828903 : Intent.parseUri allows call to FLAG_GRANT_*_URI_PERMISSION" into lmp-mr1-dev
...
automerge: c43613b#15828903 : Intent.parseUri allows call to FLAG_GRANT_*_URI_PERMISSION
2014-11-21 03:01:09 +00:00
Geoffrey Borggaard
235fcdceb4
am 271ddfce: Merge "Setting ADB_ENABLED may result in a SecurityException." into lmp-dev automerge: e4590cf automerge: db1e7fa
...
automerge: 6a110c1
* commit '6a110c1adfcb4e996d1e1ac187dbbceb3113b879':
Setting ADB_ENABLED may result in a SecurityException.
2014-11-21 02:59:52 +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
Eino-Ville Talvala
4fc0ec51cf
am 1432a40f: am df84cb90: Merge "Camera: Add one more requirement to BURST_CAPTURE" into lmp-mr1-dev automerge: b22de13
...
* commit '1432a40ff3702a09c4291965f078708e23de08d3':
Camera: Add one more requirement to BURST_CAPTURE
2014-11-21 02:58:27 +00:00
Alan Viverette
ea28d4594d
am e0a377f5: Merge "Make DeviceDefault alert dialog themes public" into lmp-mr1-dev
...
automerge: 9eb4ee24
2014-11-21 02:58:24 +00:00
Jean-Michel Trivi
29e12f25d8
am c229c393: am 09ff9125: Merge "Convert record channel mask for dynamic mix" into lmp-mr1-dev automerge: 14b9092
...
* commit 'c229c3935c2b3b3ccee459d84b81d9c84ac8b3ca':
Convert record channel mask for dynamic mix
2014-11-21 02:58:20 +00:00
Chris Craik
08dc405ecd
am 0d6512a8: am 93ef9639: Merge "Improve ColorMatrix docs" into lmp-mr1-dev automerge: 5b41215
...
* commit '0d6512a8dd398e5eea79744ce4541664041dfdb8':
Improve ColorMatrix docs
2014-11-21 02:58:11 +00:00
Adrian Roos
4d4254fdc3
am 2a5663d5: am 4e312d81: Merge "Add device locked API for TrustAgentService" into lmp-mr1-dev automerge: 62a7d53
...
* commit '2a5663d524a29cc33137a6651660506398d0633a':
Add device locked API for TrustAgentService
2014-11-21 02:58:07 +00:00
Adrian Roos
05576cc784
am cf047b5d: am af6e657a: Merge "Update KeyguardManager.isDeviceLocked API" into lmp-mr1-dev automerge: 866bae5
...
* commit 'cf047b5d554b35e504f33994f3a07624c2690633':
Update KeyguardManager.isDeviceLocked API
2014-11-21 02:58:00 +00:00
Craig Mautner
b1ff9cc788
am 117f0c15: am 25418aab: Merge "Ensure arraylist index is montonically decreasing" into lmp-mr1-dev automerge: 9bb16f5
...
* commit '117f0c15f7d534afeed20d8e14be8a83f8062f72':
Ensure arraylist index is montonically decreasing
2014-11-21 02:57:38 +00:00
Eric Rowe
64865e05d4
am 496c6703: am 1d76d397: Merge "Fix wifi reconnection tests." into lmp-mr1-dev automerge: 3b442e2
...
* commit '496c67031bea7c50450d5d55a2f8e4b57f9185bf':
Fix wifi reconnection tests.
2014-11-21 02:57:33 +00:00
Wink Saville
b638b35757
am 49414b5b: am 816e19eb: Merge "Revert "Additional changes to SubscriptionManager API as per API council."" into lmp-mr1-dev automerge: 1caab41
...
* commit '49414b5b2129bf72a847c64a9f83e7b7db4511c0':
Revert "Additional changes to SubscriptionManager API as per API council."
2014-11-21 02:57:27 +00:00
Erik Kline
30246e3d37
am 4e9ea5e9: Merge "Rename EXTRA_NETWORK ConnectivityManager constants." into lmp-mr1-dev
...
automerge: dedd42a
2014-11-21 02:57:09 +00:00
