Alan Viverette
2311ded6a3
am 2649c58b: Merge "Avoid self-recursion if client calls init() from date listener" into lmp-mr1-dev
...
* commit '2649c58b460c2cd841173a8db513a54180422330':
Avoid self-recursion if client calls init() from date listener
2014-12-15 17:31:31 +00:00
Alan Viverette
9973643bfc
Merge "Give accessibility delegate the first pass at handling ACTION_CLICK" into lmp-mr1-dev
2014-12-15 17:27:24 +00:00
Alan Viverette
2649c58b46
Merge "Avoid self-recursion if client calls init() from date listener" into lmp-mr1-dev
2014-12-15 17:26:39 +00:00
Christoph Studer
5c510ee551
Notification: Fix bigLargeIcon
...
Fix a bug in L where BigPictureStyle.bigLargeIcon never made it
into the notification layout.
Bug: 18735551
Change-Id: Ia72d1de8cca2e95df3a99aaffeaba31325f1d858
2014-12-15 17:00:14 +01:00
Geoff Mendal
7f2116d1db
am 301a6176: (-s ours) am d6fc7cf1: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev
...
* commit '301a617698e74bb413df52f93ea7908a33423250':
Import translations. DO NOT MERGE
2014-12-15 15:25:44 +00:00
Geoff Mendal
301a617698
am d6fc7cf1: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev
...
* commit 'd6fc7cf149795abdcd0629e229be52b816ee13c1':
Import translations. DO NOT MERGE
2014-12-15 15:17:58 +00:00
Geoff Mendal
ea96415646
am b73e02cf: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev
...
* commit 'b73e02cf5c736a944155b9d4586d8e8a6e40dc6e':
Import translations. DO NOT MERGE
2014-12-15 15:17:39 +00:00
Geoff Mendal
b73e02cf5c
Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev
2014-12-15 15:11:25 +00:00
Geoff Mendal
d6fc7cf149
Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev
2014-12-15 15:10:39 +00:00
Geoff Mendal
099cce32d2
Import translations. DO NOT MERGE
...
Change-Id: I1631f2d7e5eca790da4ce7b78e90c626f96be23c
Auto-generated-cl: translation import
2014-12-15 06:56:40 -08:00
Geoff Mendal
111a81669e
Import translations. DO NOT MERGE
...
Change-Id: I18accc4c251f9f5bbaa69512b317898637daed64
Auto-generated-cl: translation import
2014-12-15 06:50:18 -08:00
Geoff Mendal
0736ee2631
am 0c8802bb: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev
...
* commit '0c8802bb3ee36247f92300a1bed2ead77c436479':
Import translations. DO NOT MERGE
2014-12-15 14:43:49 +00:00
Geoff Mendal
06b284f22b
am b6a5dab3: (-s ours) am feb6c7f3: (-s ours) Import translations. DO NOT MERGE
...
* commit 'b6a5dab3ed29c9c9bc864abff0e534641dcd4f32':
Import translations. DO NOT MERGE
2014-12-15 14:43:43 +00:00
Geoff Mendal
0c8802bb3e
Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev
2014-12-15 14:39:49 +00:00
Geoff Mendal
b6a5dab3ed
am feb6c7f3: (-s ours) Import translations. DO NOT MERGE
...
* commit 'feb6c7f3d6d52648009ffb6fffa1f76d2f68fd21':
Import translations. DO NOT MERGE
2014-12-15 14:36:56 +00:00
Geoff Mendal
e184608398
Import translations. DO NOT MERGE
...
Change-Id: Ifbbb87b8df40d269d7e28aa398dcacc878c93011
Auto-generated-cl: translation import
2014-12-15 06:28:48 -08:00
Geoff Mendal
feb6c7f3d6
Import translations. DO NOT MERGE
...
Change-Id: I70dc0646e4b8ea8b83dc1f7106067e278260bb3a
Auto-generated-cl: translation import
2014-12-15 06:25:08 -08:00
Sarah Maddox
65dc25da3f
docs: Updates lesson 1 of location API training: Get last-known location.
...
Uses GoogleApiClient to connect to Play services.
Uses the latest Fused Location Provider API.
Updates the entire tutorial and code sample for clarity and correctness.
Bug: 17109822
Change-Id: I759a184a72d50702030b898a5f2e240cd3bdf4be
2014-12-15 16:55:36 +11:00
Prem Kumar
da6ebb4ee2
am fa205fff: am 9ef07ad2: Merge "make sure wificonfiguration scan cache doesnt grow unbounded Bug:18703749" into lmp-mr1-dev
...
* commit 'fa205ffff292bcbc1c504491b7ca2a5ee1b7b547':
make sure wificonfiguration scan cache doesnt grow unbounded Bug:18703749
2014-12-14 20:06:28 +00:00
Prem Kumar
3be9a9cefb
am cb9379ca: am 6c2fa049: Merge "handle beacons reported with wrong RSSI value of 0 - Bug:18654243" into lmp-mr1-dev
...
* commit 'cb9379ca774a503a9d33f3c0e8c5010495d2af58':
handle beacons reported with wrong RSSI value of 0 - Bug:18654243
2014-12-14 20:06:22 +00:00
Prem Kumar
fa205ffff2
am 9ef07ad2: Merge "make sure wificonfiguration scan cache doesnt grow unbounded Bug:18703749" into lmp-mr1-dev
...
* commit '9ef07ad2b63edd4094bd8f15ccf861c7b014b2b0':
make sure wificonfiguration scan cache doesnt grow unbounded Bug:18703749
2014-12-14 19:59:40 +00:00
Prem Kumar
cb9379ca77
am 6c2fa049: Merge "handle beacons reported with wrong RSSI value of 0 - Bug:18654243" into lmp-mr1-dev
...
* commit '6c2fa049aa342ed09c6987302d79a9447b99e5a4':
handle beacons reported with wrong RSSI value of 0 - Bug:18654243
2014-12-14 19:59:35 +00:00
Prem Kumar
9ef07ad2b6
Merge "make sure wificonfiguration scan cache doesnt grow unbounded Bug:18703749" into lmp-mr1-dev
2014-12-14 19:53:48 +00:00
Prem Kumar
6c2fa049aa
Merge "handle beacons reported with wrong RSSI value of 0 - Bug:18654243" into lmp-mr1-dev
2014-12-14 19:52:40 +00:00
Guang Zhu
9954a44896
am d8ca1208: am 07bba9ab: Merge "shell based UI Automator source move" into lmp-mr1-dev
...
* commit 'd8ca1208b3ee76e45e45e47d5806c398442a55a3':
shell based UI Automator source move
2014-12-14 04:04:26 +00:00
Guang Zhu
d8ca1208b3
am 07bba9ab: Merge "shell based UI Automator source move" into lmp-mr1-dev
...
* commit '07bba9abeeba77cdf491ecc3047d1fa34f280bbb':
shell based UI Automator source move
2014-12-14 03:39:07 +00:00
Guang Zhu
07bba9abee
Merge "shell based UI Automator source move" into lmp-mr1-dev
2014-12-14 03:30:57 +00:00
Jinsuk Kim
584c3dfb53
am d8858fa9: am a2bc055e: Merge "audioservice: Clear calling identity upon calling HdmiControlService" into lmp-mr1-dev
...
* commit 'd8858fa91712b5e5d2a832e1993b6e265dafcf39':
audioservice: Clear calling identity upon calling HdmiControlService
2014-12-13 23:53:29 +00:00
Jinsuk Kim
d8858fa917
am a2bc055e: Merge "audioservice: Clear calling identity upon calling HdmiControlService" into lmp-mr1-dev
...
* commit 'a2bc055eeb240c1787e7ad9755ffd4f106bdbb63':
audioservice: Clear calling identity upon calling HdmiControlService
2014-12-13 23:46:38 +00:00
Jinsuk Kim
a2bc055eeb
Merge "audioservice: Clear calling identity upon calling HdmiControlService" into lmp-mr1-dev
2014-12-13 23:41:48 +00:00
Michael Zoech
542774bb15
Move arrow_pointer hotspot to better match actual tip
...
Hotspot position of (6,6) does not fully match the actually tip of the
arrow_pointer cursor image. The position where the click is registered
is visibly off. This can be verified by enabling "Pointer location" in
the developer options.
This patch changes the hotspot to (5,5) which better resembles the
actual tip of the arrow.
2014-12-13 11:31:11 -08:00
Alan Jeon
f0e32ee572
Turn debug flag off
...
Change-Id: Iced1a24ecfc182eccedd3a749fab9dd32dea41da
Signed-off-by: Alan Jeon <skyisle@gmail.com >
2014-12-13 22:44:53 +09:00
Rich Slogar
b2a9bd5e9b
am 895d1694: am 6b8756c3: docs: studio 1.0.1 revision update
...
* commit '895d16945e97e108e33c614f87004c3f1efe5cb4':
docs: studio 1.0.1 revision update
2014-12-13 06:24:20 +00:00
Rich Slogar
895d16945e
am 6b8756c3: docs: studio 1.0.1 revision update
...
* commit '6b8756c39764b166c9f7d384e4542960dd8a7f98':
docs: studio 1.0.1 revision update
2014-12-13 06:17:00 +00:00
Rich Slogar
6b8756c397
docs: studio 1.0.1 revision update
...
Change-Id: If9ef9ba986ae02463bec8040924a06ab0ccc8124
2014-12-12 21:19:02 -08:00
Guang Zhu
18b892c723
shell based UI Automator source move
...
frameworks/testing/uiautomator -> frameworks/base/cmds/uiautomator
(samples, utils sub folders exlcuded)
frameworks/testing/uiautomator/utils -> frameworks/base/tests/utils
no source files changed, only one line makefile update (for
UI Automator API check)
Bug: 18708851
Change-Id: I396bd386d3d55a52df18af183685daf80caa9f73
2014-12-12 17:31:38 -08:00
smain@google.com
63ed5e1b77
am 8bb3962b: am 8e8f29e3: Merge "fix distribute nav styles. they were not highlighted correctly." into lmp-docs
...
* commit '8bb3962b2e58870efa01b2fc0fd8c2a620414974':
fix distribute nav styles. they were not highlighted correctly.
2014-12-13 01:12:37 +00:00
Christopher Tate
fe9e3195fa
am 36ba3e47: am 90c0ae63: Merge "Check which file changed before requesting backup" into lmp-mr1-dev
...
* commit '36ba3e478fbbb664a97b24723836444184c6943f':
Check which file changed before requesting backup
2014-12-13 01:09:03 +00:00
smain@google.com
8bb3962b2e
am 8e8f29e3: Merge "fix distribute nav styles. they were not highlighted correctly." into lmp-docs
...
* commit '8e8f29e34266b49d02f236367be98d6885f2f8a6':
fix distribute nav styles. they were not highlighted correctly.
2014-12-13 01:04:02 +00:00
Christopher Tate
36ba3e478f
am 90c0ae63: Merge "Check which file changed before requesting backup" into lmp-mr1-dev
...
* commit '90c0ae637ab84d1954ce972f55c5d3e2d2b20586':
Check which file changed before requesting backup
2014-12-13 00:59:10 +00:00
smain@google.com
8e8f29e342
Merge "fix distribute nav styles. they were not highlighted correctly." into lmp-docs
2014-12-13 00:55:32 +00:00
Christopher Tate
90c0ae637a
Merge "Check which file changed before requesting backup" into lmp-mr1-dev
2014-12-13 00:52:14 +00:00
Joe Fernandez
d799f75c6b
am 4234fca6: am 044f3947: Merge "docs: uiautomator blog link removal" into lmp-docs
...
* commit '4234fca655819538fea60cafe2b8bf3e597fa3ea':
docs: uiautomator blog link removal
2014-12-13 00:34:20 +00:00
Joe Fernandez
4234fca655
am 044f3947: Merge "docs: uiautomator blog link removal" into lmp-docs
...
* commit '044f3947bc2e5e1beb2e46dd8e32822b57132b4a':
docs: uiautomator blog link removal
2014-12-13 00:25:14 +00:00
Joe Fernandez
044f3947bc
Merge "docs: uiautomator blog link removal" into lmp-docs
2014-12-13 00:20:35 +00:00
Tim Murray
07a2efce2c
am 42d33aa6: am 3d00fdf4: Merge "Enable native tracking for RS contexts to improve GC behavior."
...
* commit '42d33aa635fbe0768b0be44568077874e66e39e0':
Enable native tracking for RS contexts to improve GC behavior.
2014-12-13 00:17:47 +00:00
Joe Fernandez
72268ad3d4
am e70cb874: am c59d1d78: Merge "docs: studio basics typo" into lmp-docs
...
* commit 'e70cb874d9a53c6afa78c752ababe8e2f44ba0c8':
docs: studio basics typo
2014-12-13 00:16:56 +00:00
Amith Yamasani
52d750c5c2
Check which file changed before requesting backup
...
Make sure that the changed file is one of the wallpaper files
before requesting backup or informing listeners.
Bug: 18694053
Change-Id: Iaa8fe9d3c97634b3cc6a9ccd67c36cf394d17ca0
2014-12-13 00:15:45 +00:00
Tim Murray
efc5ceaaa1
am a6bfe6c9: Merge "Enable native tracking for RS contexts to improve GC behavior." into lmp-mr1-dev
...
automerge: 54bab10
* commit '54bab10b1facad1ae8ad522b57785f449f3227f9':
Enable native tracking for RS contexts to improve GC behavior.
2014-12-13 00:15:08 +00:00
Luan Nguyen
bb01880e62
am 47efca78: am a854ddfd: docs: Add two new general functionality requirements
...
* commit '47efca783cda4a9f13d172ddfc30443de1d94b91':
docs: Add two new general functionality requirements
2014-12-13 00:12:16 +00:00