Commit Graph

176611 Commits

Author SHA1 Message Date
smain@google.com
c56cd34dca docs: setup-virtual-device
Change-Id: I7c49f97c6ebbf64fb642dc24698e172361e5694f
2014-12-05 14:58:42 -08:00
David Friedman
1d0ff728ce am 278fd97a: am 753f4fc9: am 9c28ba76: am 47eddc7c: am bf6a4bfb: am 6e043e0c: Merge "Change notes for NDK r10d, to publish to DAC" into lmp-docs
* commit '278fd97a001b9c0334a05b13663dcec55e383c21':
  Change notes for NDK r10d, to publish to DAC
2014-12-05 21:20:37 +00:00
Geoff Mendal
b82939b0c2 am cf6821a9: (-s ours) am 135a5761: (-s ours) am 597a7531: (-s ours) am 9ece2e96: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-sprout-dev
* commit 'cf6821a94227d665ba8dfd62ee7caad5bd07beaa':
  Import translations. DO NOT MERGE
2014-12-05 21:20:33 +00:00
David Friedman
bcb71a9842 am b69f1f0b: am 29b04001: am 17904f8b: am 2d2e7bf3: am ed839a76: am 795db65e: Merge "Fixes a typo, in which the word "give" is repeated. Bug 18553334" into lmp-docs
* commit 'b69f1f0b6ceb69c2af873309c1f1bcf1c0dc8ed5':
  Fixes a typo, in which the word "give" is repeated. Bug 18553334
2014-12-05 21:20:29 +00:00
Svetoslav
130521b91f am 323c02d4: am 8d9a06fe: am 6e7bf935: Merge "Notify accessibility for window changes after an app animation end." into lmp-mr1-dev
* commit '323c02d4e0860c925aa0c4db14be8acaf231c69b':
  Notify accessibility for window changes after an app animation end.
2014-12-05 21:20:22 +00:00
Justin Harrison
372bba4da5 am ff4f2486: am 2b236ab3: am 70941f20: Merge "Revert "Revert "Improve fling physics for recents""" into lmp-mr1-dev
* commit 'ff4f24866cb87c1110fb26bade3b6017d51805f4':
  Revert "Revert "Improve fling physics for recents""
2014-12-05 21:20:07 +00:00
Craig Mautner
67713f64fa am e1d4b9fa: am 8432cee0: am 224904e0: Merge "Prevent ANR when broadcast receiver is killed" into lmp-mr1-dev
* commit 'e1d4b9fab1cc89eab8ca85bfea000a3c6bbd4dd1':
  Prevent ANR when broadcast receiver is killed
2014-12-05 21:20:02 +00:00
Paul Jensen
5baa08fbf6 am 704c8c0c: am 461e7367: am efb81b9e: Merge "Remember to cancel lingering when a network again satsifies a NetworkRequest." into lmp-mr1-dev
* commit '704c8c0c3b2753c8d91aef23d39a9f6255389fd3':
  Remember to cancel lingering when a network again satsifies a NetworkRequest.
2014-12-05 21:19:57 +00:00
Prerepa Viswanadham
fd5e847cb6 am 12120998: am e21aafab: am ff5e5db3: Fix BT crash due to unset value for BluetoothGattDescriptor from API user
* commit '12120998f8b34c809d8f29790a8f74e624b26e38':
  Fix BT crash due to unset value for BluetoothGattDescriptor from API user
2014-12-05 21:19:53 +00:00
David Friedman
278fd97a00 am 753f4fc9: am 9c28ba76: am 47eddc7c: am bf6a4bfb: am 6e043e0c: Merge "Change notes for NDK r10d, to publish to DAC" into lmp-docs
* commit '753f4fc95135a396ac9d7f6f4e3f9eacb662bb1d':
  Change notes for NDK r10d, to publish to DAC
2014-12-05 20:19:43 +00:00
Geoff Mendal
cf6821a942 am 135a5761: (-s ours) am 597a7531: (-s ours) am 9ece2e96: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-sprout-dev
* commit '135a5761857f9dbd31ab51abe6466e26ddb379cd':
  Import translations. DO NOT MERGE
2014-12-05 20:19:37 +00:00
David Friedman
b69f1f0b6c am 29b04001: am 17904f8b: am 2d2e7bf3: am ed839a76: am 795db65e: Merge "Fixes a typo, in which the word "give" is repeated. Bug 18553334" into lmp-docs
* commit '29b040019226d7d02a57fe76a471465d16109f0b':
  Fixes a typo, in which the word "give" is repeated. Bug 18553334
2014-12-05 20:19:30 +00:00
Svetoslav
323c02d4e0 am 8d9a06fe: am 6e7bf935: Merge "Notify accessibility for window changes after an app animation end." into lmp-mr1-dev
* commit '8d9a06feee0d5311e40adbccb0d2205a531def85':
  Notify accessibility for window changes after an app animation end.
2014-12-05 20:19:24 +00:00
Justin Harrison
ff4f24866c am 2b236ab3: am 70941f20: Merge "Revert "Revert "Improve fling physics for recents""" into lmp-mr1-dev
* commit '2b236ab30e479d22c0619670a97c90993307a190':
  Revert "Revert "Improve fling physics for recents""
2014-12-05 20:19:10 +00:00
Craig Mautner
e1d4b9fab1 am 8432cee0: am 224904e0: Merge "Prevent ANR when broadcast receiver is killed" into lmp-mr1-dev
* commit '8432cee04f2ec4bf77a3ba84524148b78db7ea57':
  Prevent ANR when broadcast receiver is killed
2014-12-05 20:18:58 +00:00
Paul Jensen
704c8c0c3b am 461e7367: am efb81b9e: Merge "Remember to cancel lingering when a network again satsifies a NetworkRequest." into lmp-mr1-dev
* commit '461e73677d208e4e97356cbc781ce490b90e2027':
  Remember to cancel lingering when a network again satsifies a NetworkRequest.
2014-12-05 20:18:45 +00:00
Prerepa Viswanadham
12120998f8 am e21aafab: am ff5e5db3: Fix BT crash due to unset value for BluetoothGattDescriptor from API user
* commit 'e21aafab0d735935155860bd16dcc3ece81ce546':
  Fix BT crash due to unset value for BluetoothGattDescriptor from API user
2014-12-05 20:18:38 +00:00
Adam Powell
5cd6f61f7d am 19623538: am b3b4f837: am 8c9283f4: Merge "Fix NullPointerException in ListView"
* commit '19623538735fac497325e2082a0ba56c199fc6b1':
  Fix NullPointerException in ListView
2014-12-05 19:48:05 +00:00
Adam Powell
1962353873 am b3b4f837: am 8c9283f4: Merge "Fix NullPointerException in ListView"
* commit 'b3b4f83702ca878854529acfdc389d15db5ca6f3':
  Fix NullPointerException in ListView
2014-12-05 19:39:25 +00:00
Adam Powell
b3b4f83702 am 8c9283f4: Merge "Fix NullPointerException in ListView"
* commit '8c9283f41083a20a82ae37eac44b79de6eb3158e':
  Fix NullPointerException in ListView
2014-12-05 19:32:13 +00:00
Adam Powell
8c9283f410 Merge "Fix NullPointerException in ListView" 2014-12-05 19:26:18 +00:00
Adam Lesinski
7e74da3172 am e97908d3: Merge commit \'0953ab27\' into manualmerge
* commit 'e97908d32ee8ea80138d085260a0eac93841c722':
  AAPT: Move private attrs to new type for framework
2014-12-05 19:16:27 +00:00
Scott Main
7abdfaa742 Merge ":docs support library updates" 2014-12-05 19:15:49 +00:00
Adam Lesinski
e97908d32e Merge commit '0953ab27' into manualmerge
Change-Id: I36dea45f7571096136ea7bda5e2680bd85a0df32
2014-12-05 11:06:21 -08:00
smain@google.com
ef454d6ad8 docs: new Eclipse menu
Change-Id: Ie9f679de0cf741e73f79ae2c6da0f92e4fb6e3d8
2014-12-05 10:55:34 -08:00
smain@google.com
40cd7db26a new Android Studio download page
Change-Id: I42ad17c9287dc376d856dfb549e47a912fc35417
2014-12-05 10:21:49 -08:00
Rich Slogar
aae10bae71 :docs support library updates
Change-Id: Ic8c5c4e176618c245211e59000dd72c2af6b1e79
2014-12-05 10:16:03 -08:00
Christoph Studer
e89ff72da6 am 501bf216: am 3bf7b80e: am 391232da: Merge "Log the state of the notification shade" into lmp-mr1-dev
* commit '501bf216dc9068c8169687437d8d6594cd1e1165':
  Log the state of the notification shade
2014-12-05 16:26:21 +00:00
Christoph Studer
bb0e8060c6 am ad25e361: am 2d58c922: am 798c0552: Merge "NoMan: Update effect suppressor on listener remove" into lmp-mr1-dev
* commit 'ad25e3610ef353be2004c8427c3f38aceda9171e':
  NoMan: Update effect suppressor on listener remove
2014-12-05 16:26:17 +00:00
Chris Wren
6c30b4cc58 am 2f147f6e: am f55ad284: am ffc050ad: Merge "Track active notifications by key, not by reference." into lmp-mr1-dev
* commit '2f147f6e7a01e098557cf83b668d6e511452a9ed':
  Track active notifications by key, not by reference.
2014-12-05 16:26:12 +00:00
RoboErik
f77f0b495f am 91bba400: am 8f095396: am 7fbcac6a: Merge "Tweak the behavior of the MediaSessionStack" into lmp-mr1-dev
* commit '91bba400731c866e2aa9a9237e071d754cea8d20':
  Tweak the behavior of the MediaSessionStack
2014-12-05 16:26:07 +00:00
Justin Harrison
3300d81d5b am b1ab736f: am fdb33a08: am 21af21ca: Merge "Revert "Improve fling physics for recents"" into lmp-mr1-dev
* commit 'b1ab736f48c68de8c92afb1fb6da22232badfbb8':
  Revert "Improve fling physics for recents"
2014-12-05 16:26:02 +00:00
Christoph Studer
501bf216dc am 3bf7b80e: am 391232da: Merge "Log the state of the notification shade" into lmp-mr1-dev
* commit '3bf7b80e48eb58254a076f5363f1e9e3348abb8c':
  Log the state of the notification shade
2014-12-05 15:52:00 +00:00
Christoph Studer
ad25e3610e am 2d58c922: am 798c0552: Merge "NoMan: Update effect suppressor on listener remove" into lmp-mr1-dev
* commit '2d58c9220cdeaac63ae1a5c9f1c80c3e131ae296':
  NoMan: Update effect suppressor on listener remove
2014-12-05 15:51:54 +00:00
Chris Wren
2f147f6e7a am f55ad284: am ffc050ad: Merge "Track active notifications by key, not by reference." into lmp-mr1-dev
* commit 'f55ad284448d226b047815715bb10e193c88ae0d':
  Track active notifications by key, not by reference.
2014-12-05 15:51:48 +00:00
RoboErik
91bba40073 am 8f095396: am 7fbcac6a: Merge "Tweak the behavior of the MediaSessionStack" into lmp-mr1-dev
* commit '8f0953963d91a22021676cc29b0f572c1a913124':
  Tweak the behavior of the MediaSessionStack
2014-12-05 15:51:39 +00:00
Justin Harrison
b1ab736f48 am fdb33a08: am 21af21ca: Merge "Revert "Improve fling physics for recents"" into lmp-mr1-dev
* commit 'fdb33a08266d95c338c141446c1da09108194281':
  Revert "Improve fling physics for recents"
2014-12-05 15:51:33 +00:00
Scott Main
00c6944e85 Merge "docs: studio basics v2" 2014-12-05 03:47:13 +00:00
Rich Slogar
d70070e3ec docs: studio basics v2
Change-Id: Ice8e4338f5193f9850da8264a2c56018a8b561ab
2014-12-04 16:50:59 -08:00
Scott Main
49a58af16f Merge "docs: debugging studio" 2014-12-05 00:22:13 +00:00
Scott Main
a1d95dfb95 Merge "docs:setting up hardware devices" 2014-12-05 00:21:17 +00:00
Amith Yamasani
2f80972d02 am 2faf91fb: am 66cbec51: am d234dc1f: Merge "Correct check of is user running"
* commit '2faf91fbb300882afd1092b788aa16295eb3dde8':
  Correct check of is user running
2014-12-05 00:15:57 +00:00
Mike Lockwood
6d37adf83d am a6e14c82: am 75b25577: am 448403b7: Merge "Dont call close in in BluetoothA2dp finalize"
* commit 'a6e14c8293ef470e29541500506de15d61ab6bf0':
  Dont call close in in BluetoothA2dp finalize
2014-12-05 00:15:42 +00:00
Jorim Jaggi
6944a1621d am 638e8068: am 9f44ea8f: am 54daab10: Merge "Improve fling physics for recents" into lmp-mr1-dev
* commit '638e8068d212ff72b16d11891af0d9ed110bafde':
  Improve fling physics for recents
2014-12-05 00:13:20 +00:00
Jorim Jaggi
83aeedc895 am b6d16dc5: am d3cf181d: am 47faf69c: Merge "Fix rounded corners in bottom QS panel." into lmp-mr1-dev
* commit 'b6d16dc53fab12099af7d6da406f88bf585b0532':
  Fix rounded corners in bottom QS panel.
2014-12-05 00:13:15 +00:00
John Reck
1022888d33 resolved conflicts for merge of 203c8171 to master
Change-Id: I256397410c261fae049bae4572f132235be1c5c9
2014-12-04 16:06:34 -08:00
Yin-Chia Yeh
18be00f77a Camera2: add toString implementation of LensShadingMap
Change-Id: Icecde57e92c2962ed6b1585c0e3fd889b2587736
2014-12-04 15:53:17 -08:00
Amith Yamasani
2faf91fbb3 am 66cbec51: am d234dc1f: Merge "Correct check of is user running"
* commit '66cbec512cf31228f8d86171f57cf4e3bcbbd63e':
  Correct check of is user running
2014-12-04 23:24:31 +00:00
Amith Yamasani
66cbec512c am d234dc1f: Merge "Correct check of is user running"
* commit 'd234dc1f20d3a68e0dd9f2c3a5f14282fba79b13':
  Correct check of is user running
2014-12-04 23:15:47 +00:00
Amith Yamasani
d234dc1f20 Merge "Correct check of is user running" 2014-12-04 23:09:48 +00:00