drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
156,752 Commits 1 Branch 0 Tags
Commit Graph

156752 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Quddus Chong
ff5d2e2d61 am 92cfa5d0: 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 '92cfa5d0b20b52cd1e61c5fef36abe0d67525fa2':
 2014-11-03 20:38:24 +00:00
Ricardo Cervera
a4877f30a4 am 5063cf9a: am d89021d7: am 0e61e44d: am 2a02b881: Merge "docs: Training class for the Wearable UI Library" into klp-modular-docs automerge: 2166913 
* commit '5063cf9abca48f6e07ef7efd27232e1759704119':
 2014-11-03 20:38:03 +00:00
Rich Slogar
3aa8271afc am 4f62925e: am a34b1f15: am 64460a2b: am 83d5c9bf: docs:change required ADT version to 23.0.2 automerge: f07d984 
* commit '4f62925ecb2f049aec7392f84d494328f883cb92':
 2014-11-03 20:37:59 +00:00
smain@google.com
7c2f87ec56 am 0646885d: am c64c937a: am 8267ffcc: am cef9aab6: Merge "make sdk download links use HTTPS bug: 8033954" into klp-modular-docs automerge: 90ab19b 
* commit '0646885ddfb5c04cd0c5276e66b51b1a14691c4c':
 2014-11-03 20:37:55 +00:00
Joe Fernandez
9e22cd6fd1 am 59c04ece: am bcd1af39: Merge "docs: Wear UI Lib training fixes" into klp-modular-docs 
automerge: 37ec657

* commit '37ec65701121374b0edf3cfc454463c90666399d':
 2014-11-03 20:37:46 +00:00
Quddus Chong
b9120e4c95 am 03f627c4: am bb5a1848: am 8730092a: Merge "docs: Added API highlights for Google Play services 6.1 (Manchego)." into klp-modular-docs automerge: dfb86b9 
* commit '03f627c4b469d4a85bb3b747ef49d0a20b853f08':
 2014-11-03 20:36:18 +00:00
Quddus Chong
7045d9639f am bea6b4d1: am bf29d697: am 6628e602: Merge "Updataed Google Play services Javadocs for v6.1 (Manchego) release." into klp-modular-docs automerge: 9566bd2 
* commit 'bea6b4d12106e2a918274ffccd6e370f48654979':
 2014-11-03 20:36:14 +00:00
Ricardo Cervera
5ef2d855f0 am e5eaf36c: am a18075e8: am bd964cad: docs: Removing references to self note on Common Intents page. automerge: 5f9d680 
* commit 'e5eaf36c01e2b3e4d5072b2fa478bc9cc7336e51':
 2014-11-03 20:36:09 +00:00
Ricardo Cervera
ea4f3e793a am d6007644: am 6d30f576: am 3f7b4d8f: Merge "docs: Update Common Intents page with Google Now actions" into klp-modular-docs automerge: a6abe30 
* commit 'd6007644353347f49090337b3683dcca7092ed3d':
 2014-11-03 20:36:05 +00:00
Deepanshu Gupta
ec276ed126 am 11b14e39: LayoutLib: Use ICU\'s line break algo. [DO NOT MERGE] 
automerge: fcaf3e9  -s ours

* commit 'fcaf3e9bd031e1ad4c38eee1b81064cca75e26b4':
 2014-11-03 20:34:42 +00:00
Rich Slogar
6ae208d455 am 916a6ea3: am 6af8fc7f: Merge "docs:64 bit image and skd update" into klp-modular-docs 
automerge: 9779c90

* commit '9779c905eac26ab6ce7ce775587c75f1de081dd4':
 2014-11-03 20:33:08 +00:00
Quddus Chong
03f627c4b4 am bb5a1848: am 8730092a: Merge "docs: Added API highlights for Google Play services 6.1 (Manchego)." into klp-modular-docs 
automerge: dfb86b9

* commit 'dfb86b994ff7d51ba1a1683c7123195cc9930c95':
 2014-11-03 20:31:51 +00:00
Quddus Chong
bea6b4d121 am bf29d697: am 6628e602: Merge "Updataed Google Play services Javadocs for v6.1 (Manchego) release." into klp-modular-docs 
automerge: 9566bd2

* commit '9566bd23390b0f21582a59673ded22f47b50ffe0':
 2014-11-03 20:30:45 +00:00
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