Quddus Chong
92cfa5d0b2
am c9c18671: am 4be6fdeb: am ba2199fa: Merge "docs: Modified the notice in the android.location package file to strongly encourage developers to migrate to the Google Play Services Location API." into klp-modular-docs automerge: ddb8c4e
...
* commit 'c9c186711d88d4869e4cbd53f83bc12806b6ffb5':
2014-11-03 20:30:09 +00:00
Ricardo Cervera
5063cf9abc
am d89021d7: am 0e61e44d: am 2a02b881: Merge "docs: Training class for the Wearable UI Library" into klp-modular-docs automerge: 2166913
...
* commit 'd89021d7aaac209a354e02e72fac5c063e8f92fd':
2014-11-03 20:30:05 +00:00
Rich Slogar
4f62925ecb
am a34b1f15: am 64460a2b: am 83d5c9bf: docs:change required ADT version to 23.0.2 automerge: f07d984
...
* commit 'a34b1f15292d219b6e2c13fd6f685735c8dd8f8c':
2014-11-03 20:29:55 +00:00
smain@google.com
0646885ddf
am c64c937a: am 8267ffcc: am cef9aab6: Merge "make sdk download links use HTTPS bug: 8033954" into klp-modular-docs automerge: 90ab19b
...
* commit 'c64c937a18be1205170ad95b7f601a6e0192b9b9':
2014-11-03 20:29:51 +00:00
Ricardo Cervera
e5eaf36c01
am a18075e8: am bd964cad: docs: Removing references to self note on Common Intents page.
...
automerge: 5f9d680
* commit '5f9d680dd73b437e1e311f11f255b659ad18135b':
2014-11-03 20:29:24 +00:00
Ricardo Cervera
d600764435
am 6d30f576: am 3f7b4d8f: Merge "docs: Update Common Intents page with Google Now actions" into klp-modular-docs
...
automerge: a6abe30
* commit 'a6abe30397cf1f67b871a3db7555aa7f0f9841d9':
2014-11-03 20:28:06 +00:00
Quddus Chong
c9c186711d
am 4be6fdeb: am ba2199fa: Merge "docs: Modified the notice in the android.location package file to strongly encourage developers to migrate to the Google Play Services Location API." into klp-modular-docs
...
automerge: ddb8c4e
* commit 'ddb8c4ee47e663ca984ff0291fae2cab2c5bc173':
2014-11-03 20:23:39 +00:00
Ricardo Cervera
d89021d7aa
am 0e61e44d: am 2a02b881: Merge "docs: Training class for the Wearable UI Library" into klp-modular-docs
...
automerge: 2166913
* commit '2166913933661f4f85fd649ad55997d59a5e3d31':
2014-11-03 20:22:28 +00:00
Rich Slogar
a34b1f1529
am 64460a2b: am 83d5c9bf: docs:change required ADT version to 23.0.2
...
automerge: f07d984
* commit 'f07d984fed70be0718e7e9019bc933f58fbeca46':
2014-11-03 20:21:20 +00:00
smain@google.com
c64c937a18
am 8267ffcc: am cef9aab6: Merge "make sdk download links use HTTPS bug: 8033954" into klp-modular-docs
...
automerge: 90ab19b
* commit '90ab19bb8dec2e444e274ab4c8990545b481ca7b':
2014-11-03 20:20:13 +00:00
Adam Lesinski
c3dc0b57b8
Build the split-select tool without C++11 support
...
It was complicated to get the tool building on Windows, Linux,
and OSX with C++11 support.
OSX uses Clang to build C++11 binaries, which requires the libc++
standard library. Since most of the dependencies of this program
are built against libstdc++, this was difficult to resolve.
Now we build without C++11 support.
Change-Id: I4e537c113734508a8f480a1c402ed237de4f0e60
2014-11-03 12:09:58 -08:00
Joe Fernandez
2cc032d5ea
am badfcbec: am 4f8399c7: am eff5efac: Merge "docs: Update Android Dashboard for November 2014" into lmp-docs
...
* commit 'badfcbec48e6904316bec731e22c52bb7cca25fb':
docs: Update Android Dashboard for November 2014
2014-11-03 19:57:46 +00:00
Jim Miller
12b239e6d3
Merge "Fix SetupWizard black screen issue for EDU devices" into lmp-mr1-dev
2014-11-03 19:51:53 +00:00
Joe Fernandez
badfcbec48
am 4f8399c7: am eff5efac: Merge "docs: Update Android Dashboard for November 2014" into lmp-docs
...
* commit '4f8399c7ad4f7e14e3846494c9aa2b88bfd343d9':
docs: Update Android Dashboard for November 2014
2014-11-03 19:51:42 +00:00
Adam Lesinski
4bf58108d4
Fix issues that will be present in C++11
...
- char16_t is a distinct type, so stay consistent
with it throughout the code base.
- char16_t is defined as minimum size of 16 bits.
Since we mmap and cast data structures onto raw memory,
we need a precise definition (uint16_t), so we cast between
that (and static_assert that they are the same size).
Change-Id: I869c32637543bbcfb39d2643e7d9df10d33acd3c
2014-11-03 11:49:47 -08:00
Joe Fernandez
4f8399c7ad
am eff5efac: Merge "docs: Update Android Dashboard for November 2014" into lmp-docs
...
* commit 'eff5efac2170e05b2a5e197788bf455edee57cce':
docs: Update Android Dashboard for November 2014
2014-11-03 19:41:56 +00:00
Joe Fernandez
eff5efac21
Merge "docs: Update Android Dashboard for November 2014" into lmp-docs
2014-11-03 19:37:20 +00:00
Joe Fernandez
9dc852ac69
docs: Update Android Dashboard for November 2014
...
Change-Id: I42b4c58ebfe2b6f486c560d4ccf698d8064d1d39
2014-11-03 11:33:28 -08:00
Stuart Scott
95fc99b334
Clean up public API of SubInfoRecord.
...
bug: 17575308
Change-Id: I047ce11fb7835d500652b7ef340a30c052e96b21
2014-11-03 11:11:56 -08:00
Nancy Chen
b2299c1303
Adn queries for multi-SIM. (2/3)
...
Define a method in Telecom to take in a subscription account and return
the URI for an ADN query for that account.
Bug: 17917937
Change-Id: Ic50a4add7fe44a5164271dc9c9e5a58e45e72336
2014-11-03 11:11:56 -08:00
Mike Lockwood
946863b63c
Merge "Fix USB audio disconnect logic" into lmp-mr1-dev
2014-11-03 18:38:14 +00:00
John Reck
541641d033
Merge "Fix counting" into lmp-mr1-dev
2014-11-03 18:35:59 +00:00
Adrian Roos
698078a7e9
Merge "Improve TrustManagerService user lifecycle" into lmp-mr1-dev
2014-11-03 18:33:54 +00:00
John Reck
88f5fc7c5a
Fix counting
...
Change-Id: I9a3568908a7223d69430c1765fb5a4db96d7ac9c
2014-11-03 10:32:24 -08:00
John Reck
1787b4ea43
Merge "Fix cancel crash" into lmp-mr1-dev
2014-11-03 18:27:41 +00:00
Geoff Mendal
188416bf38
am 2d7e612e: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-sprout-dev
...
* commit '2d7e612ed1df3580d35cfc94bbcba660f0f058e2':
Import translations. DO NOT MERGE
2014-11-03 18:01:46 +00:00
John Reck
55b46eff39
Fix cancel crash
...
Bug: 18059003
Change-Id: I579468fbd1645049f8fbe335faf4da1f2d3bb0a3
2014-11-03 10:00:33 -08:00
Griff Hazen
5f2edfc12c
Improve support for the barcode-on-screen use case for wearables.
...
Add two small developer apis to wearable extender to help developers
show barcodes on different shaped wearable screens.
Bug: 16299175
Bug: 17005635
Change-Id: I05088ffcc405c69f1e8df7bf967ea930548c7d51
2014-11-03 09:53:54 -08:00
Geoff Mendal
2d7e612ed1
Merge "Import translations. DO NOT MERGE" into lmp-sprout-dev
2014-11-03 17:53:12 +00:00
Geoff Mendal
ef8c3cc4f6
Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev
2014-11-03 17:52:11 +00:00
Ricardo Cervera
d68bdd6bfa
am 6ff586f7: am fa37321f: am 3e621914: Merge "docs: Add links to Wear UI training from Design pages." into lmp-docs
...
* commit '6ff586f71b03b658096e51fdbc17274044341713':
docs: Add links to Wear UI training from Design pages.
2014-11-03 17:41:45 +00:00
Ricardo Cervera
6ff586f71b
am fa37321f: am 3e621914: Merge "docs: Add links to Wear UI training from Design pages." into lmp-docs
...
* commit 'fa37321f05ad96a1de6863bc08fe1e496cceea9e':
docs: Add links to Wear UI training from Design pages.
2014-11-03 17:36:56 +00:00
Ricardo Cervera
fa37321f05
am 3e621914: Merge "docs: Add links to Wear UI training from Design pages." into lmp-docs
...
* commit '3e621914cacf692700dce007ec7d7893fcc12a8c':
docs: Add links to Wear UI training from Design pages.
2014-11-03 17:31:32 +00:00
Ricardo Cervera
3e621914ca
Merge "docs: Add links to Wear UI training from Design pages." into lmp-docs
2014-11-03 17:27:09 +00:00
Scott Rowe
1117098b61
am d4e3825a: am 1b2cf3f8: am cd796536: Merge "docs: b/18119632 isGame, b/18119595 banner" into lmp-docs
...
* commit 'd4e3825a83764f9692f833c73915c310f83e38eb':
docs: b/18119632 isGame, b/18119595 banner
2014-11-03 17:22:26 +00:00
Casey Burkhardt
5e2986ef20
am 2997285f: Merge "Disable circular display mask with color inversion" into lmp-sprout-dev
...
* commit '2997285f362349097882d1b31eb23cb867227192':
Disable circular display mask with color inversion
2014-11-03 17:22:13 +00:00
Geoff Mendal
a958819b73
Import translations. DO NOT MERGE
...
Change-Id: Ia68d4e853864dd44c7531374c30794d4a0bbd8a3
Auto-generated-cl: translation import
2014-11-03 09:10:40 -08:00
Adrian Roos
cbe614ff7d
Improve TrustManagerService user lifecycle
...
- Only bind agents of running users
- Explicitly clean up state when users are removed
- Delay binding until third-party apps can actually run
Bug: 18102460
Change-Id: I5017adc1634b249068099fc5779ba95904312438
2014-11-03 18:07:11 +01:00
Geoff Mendal
d2c26c9d7f
Import translations. DO NOT MERGE
...
Change-Id: I21e1890c7ff4490469fb0243df69b560db9b29b6
Auto-generated-cl: translation import
2014-11-03 09:06:30 -08:00
Scott Rowe
d4e3825a83
am 1b2cf3f8: am cd796536: Merge "docs: b/18119632 isGame, b/18119595 banner" into lmp-docs
...
* commit '1b2cf3f8f64013441fc021db45e00381d4b2d19b':
docs: b/18119632 isGame, b/18119595 banner
2014-11-03 17:00:31 +00:00
Casey Burkhardt
2997285f36
Merge "Disable circular display mask with color inversion" into lmp-sprout-dev
2014-11-03 16:55:27 +00:00
Scott Rowe
1b2cf3f8f6
am cd796536: Merge "docs: b/18119632 isGame, b/18119595 banner" into lmp-docs
...
* commit 'cd796536ce81fe6f8a63c3867b57e7b7f92a8542':
docs: b/18119632 isGame, b/18119595 banner
2014-11-03 16:54:29 +00:00
Bryce Lee
5c13832eee
[Theater Mode] Add framework support for screen double tapping out of theater mode.
...
Bug: 18120031
Change-Id: Ia70d62b26d63e3d6708e44239c9a33001548207d
2014-11-03 08:28:29 -08:00
Scott Rowe
cd796536ce
Merge "docs: b/18119632 isGame, b/18119595 banner" into lmp-docs
2014-11-03 16:24:38 +00:00
Narayan Kamath
9d68b3c839
Remove deprecated DateFormat APIs.
...
bug: 18074066
Change-Id: I99cef45105c9f25075c596cf4f52ec5573565596
2014-11-03 16:01:32 +00:00
Adrian Roos
808fe6f99f
Merge "Fix colored status bar panning issues" into lmp-mr1-dev
2014-11-03 15:44:08 +00:00
Jorim Jaggi
1ecd7cd58e
Update QS tile states after unlocking
...
So the visibility state is up-to-date when we do a two-finger
expansion gesture, so the height is correct. Also fixes flickering
when overscrolling the initial panel expansion.
Also set thread priority of QS handler thread to background priority,
so it doesn't eat away precious cycles during animations.
Bug: 18183633
Change-Id: I0609509484582d82f0dc307eb2535bc3711b30e3
2014-11-03 16:19:27 +01:00
Geoff Mendal
dde49a4fe8
am c95236de: (-s ours) Import translations. DO NOT MERGE
...
* commit 'c95236deadfed31966661c7ed5c5db7422b3d0dc':
Import translations. DO NOT MERGE
2014-11-03 15:07:50 +00:00
Geoff Mendal
c95236dead
Import translations. DO NOT MERGE
...
Change-Id: Ic1ed8ade48ee37210f335564cc5640675db47290
Auto-generated-cl: translation import
2014-11-03 06:58:11 -08:00
Adrian Roos
862d72e2f4
Merge "Improve dump of status bar service" into lmp-mr1-dev
2014-11-03 14:56:48 +00:00