OSDN Git Service

android-x86/frameworks-base.git
9 years agoAbort accessibility node prefetch if parent node is null
Alan Viverette [Tue, 4 Nov 2014 23:59:55 +0000 (15:59 -0800)]
Abort accessibility node prefetch if parent node is null

BUG: 18004444
Change-Id: I80757daeb6b381947c4f3abbd762711cff2a978c

9 years agoam 3eff8312: am ac875484: am 4f133894: Exclude KXmlParser from LayoutLib. automerge...
Deepanshu Gupta [Mon, 3 Nov 2014 20:51:40 +0000 (20:51 +0000)]
am 3eff8312: am ac875484: am 4f133894: Exclude KXmlParser from LayoutLib. automerge: adb14af

* commit '3eff8312c9c742cc75086d006ecdf36695327f93':

9 years agoam 1daece6f: am 9e22cd6f: am 59c04ece: am bcd1af39: Merge "docs: Wear UI Lib training...
Joe Fernandez [Mon, 3 Nov 2014 20:51:37 +0000 (20:51 +0000)]
am 1daece6f: am 9e22cd6f: am 59c04ece: am bcd1af39: Merge "docs: Wear UI Lib training fixes" into klp-modular-docs automerge: 37ec657

* commit '1daece6f4aaf679dbbe5ba4fd54d399e96ff4639':

9 years agoam dabb6c05: am ec276ed1: am 11b14e39: LayoutLib: Use ICU\'s line break algo. [DO...
Deepanshu Gupta [Mon, 3 Nov 2014 20:51:33 +0000 (20:51 +0000)]
am dabb6c05: am ec276ed1: am 11b14e39: LayoutLib: Use ICU\'s line break algo. [DO NOT MERGE] automerge: fcaf3e9  -s ours

* commit 'dabb6c0596a06cd9427070a4202f733db3e13a9d':

9 years agoam 10e749a5: am 6ae208d4: am 916a6ea3: am 6af8fc7f: Merge "docs:64 bit image and...
Rich Slogar [Mon, 3 Nov 2014 20:51:29 +0000 (20:51 +0000)]
am 10e749a5: am 6ae208d4: am 916a6ea3: am 6af8fc7f: Merge "docs:64 bit image and skd update" into klp-modular-docs automerge: 9779c90

* commit '10e749a5730db65ceb656627c72583fec44ab0f7':

9 years agoam ac875484: am 4f133894: Exclude KXmlParser from LayoutLib. automerge: adb14af
Deepanshu Gupta [Mon, 3 Nov 2014 20:47:37 +0000 (20:47 +0000)]
am ac875484: am 4f133894: Exclude KXmlParser from LayoutLib. automerge: adb14af

* commit 'ac875484041183a299a36534cbb5a5574f4f93e1':

9 years agoam 9e22cd6f: am 59c04ece: am bcd1af39: Merge "docs: Wear UI Lib training fixes" into...
Joe Fernandez [Mon, 3 Nov 2014 20:47:33 +0000 (20:47 +0000)]
am 9e22cd6f: am 59c04ece: am bcd1af39: Merge "docs: Wear UI Lib training fixes" into klp-modular-docs automerge: 37ec657

* commit '9e22cd6fd10983cdd4a84e5a2143cb8ed49e084d':

9 years agoam b9120e4c: am 03f627c4: am bb5a1848: am 8730092a: Merge "docs: Added API highlights...
Quddus Chong [Mon, 3 Nov 2014 20:44:37 +0000 (20:44 +0000)]
am b9120e4c: 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 'b9120e4c95f81cbee0563a2cbf47c466e72b16aa':

9 years agoam 7045d963: am bea6b4d1: am bf29d697: am 6628e602: Merge "Updataed Google Play servi...
Quddus Chong [Mon, 3 Nov 2014 20:44:33 +0000 (20:44 +0000)]
am 7045d963: am bea6b4d1: am bf29d697: am 6628e602: Merge "Updataed Google Play services Javadocs for v6.1 (Manchego) release." into klp-modular-docs automerge: 9566bd2

* commit '7045d9639f77c6edaa892e1cacc489f1897f9899':

9 years agoam 5ef2d855: am e5eaf36c: am a18075e8: am bd964cad: docs: Removing references to...
Ricardo Cervera [Mon, 3 Nov 2014 20:44:30 +0000 (20:44 +0000)]
am 5ef2d855: am e5eaf36c: am a18075e8: am bd964cad: docs: Removing references to self note on Common Intents page. automerge: 5f9d680

* commit '5ef2d855f0a55377af53a05f2f48015a10a29151':

9 years agoam ea4f3e79: am d6007644: am 6d30f576: am 3f7b4d8f: Merge "docs: Update Common Intent...
Ricardo Cervera [Mon, 3 Nov 2014 20:44:26 +0000 (20:44 +0000)]
am ea4f3e79: am d6007644: am 6d30f576: am 3f7b4d8f: Merge "docs: Update Common Intents page with Google Now actions" into klp-modular-docs automerge: a6abe30

* commit 'ea4f3e793a0be91bf6b06801fec08e028ade0a75':

9 years agoam ec276ed1: am 11b14e39: LayoutLib: Use ICU\'s line break algo. [DO NOT MERGE] autom...
Deepanshu Gupta [Mon, 3 Nov 2014 20:42:54 +0000 (20:42 +0000)]
am ec276ed1: am 11b14e39: LayoutLib: Use ICU\'s line break algo. [DO NOT MERGE] automerge: fcaf3e9  -s ours

* commit 'ec276ed12645cc1c735babab1dc7d272fc96a292':

9 years agoam 6ae208d4: am 916a6ea3: am 6af8fc7f: Merge "docs:64 bit image and skd update" into...
Rich Slogar [Mon, 3 Nov 2014 20:42:50 +0000 (20:42 +0000)]
am 6ae208d4: am 916a6ea3: am 6af8fc7f: Merge "docs:64 bit image and skd update" into klp-modular-docs automerge: 9779c90

* commit '6ae208d455fd2dba80ad9d7cf181ccdeac8c0bb7':

9 years agoam 4f133894: Exclude KXmlParser from LayoutLib.
Deepanshu Gupta [Mon, 3 Nov 2014 20:40:55 +0000 (20:40 +0000)]
am 4f133894: Exclude KXmlParser from LayoutLib.
automerge: adb14af

* commit 'adb14afbfb4c37cfc684537d85123b36539fffed':

9 years agoam 92cfa5d0: am c9c18671: am 4be6fdeb: am ba2199fa: Merge "docs: Modified the notice...
Quddus Chong [Mon, 3 Nov 2014 20:38:24 +0000 (20:38 +0000)]
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':

9 years agoam 5063cf9a: am d89021d7: am 0e61e44d: am 2a02b881: Merge "docs: Training class for...
Ricardo Cervera [Mon, 3 Nov 2014 20:38:03 +0000 (20:38 +0000)]
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':

9 years agoam 4f62925e: am a34b1f15: am 64460a2b: am 83d5c9bf: docs:change required ADT version...
Rich Slogar [Mon, 3 Nov 2014 20:37:59 +0000 (20:37 +0000)]
am 4f62925e: am a34b1f15: am 64460a2b: am 83d5c9bf: docs:change required ADT version to 23.0.2 automerge: f07d984

* commit '4f62925ecb2f049aec7392f84d494328f883cb92':

9 years agoam 0646885d: am c64c937a: am 8267ffcc: am cef9aab6: Merge "make sdk download links...
smain@google.com [Mon, 3 Nov 2014 20:37:55 +0000 (20:37 +0000)]
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':

9 years agoam 59c04ece: am bcd1af39: Merge "docs: Wear UI Lib training fixes" into klp-modular...
Joe Fernandez [Mon, 3 Nov 2014 20:37:46 +0000 (20:37 +0000)]
am 59c04ece: am bcd1af39: Merge "docs: Wear UI Lib training fixes" into klp-modular-docs
automerge: 37ec657

* commit '37ec65701121374b0edf3cfc454463c90666399d':

9 years agoam 03f627c4: am bb5a1848: am 8730092a: Merge "docs: Added API highlights for Google...
Quddus Chong [Mon, 3 Nov 2014 20:36:18 +0000 (20:36 +0000)]
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':

9 years agoam bea6b4d1: am bf29d697: am 6628e602: Merge "Updataed Google Play services Javadocs...
Quddus Chong [Mon, 3 Nov 2014 20:36:14 +0000 (20:36 +0000)]
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':

9 years agoam e5eaf36c: am a18075e8: am bd964cad: docs: Removing references to self note on...
Ricardo Cervera [Mon, 3 Nov 2014 20:36:09 +0000 (20:36 +0000)]
am e5eaf36c: am a18075e8: am bd964cad: docs: Removing references to self note on Common Intents page. automerge: 5f9d680

* commit 'e5eaf36c01e2b3e4d5072b2fa478bc9cc7336e51':

9 years agoam d6007644: am 6d30f576: am 3f7b4d8f: Merge "docs: Update Common Intents page with...
Ricardo Cervera [Mon, 3 Nov 2014 20:36:05 +0000 (20:36 +0000)]
am d6007644: am 6d30f576: am 3f7b4d8f: Merge "docs: Update Common Intents page with Google Now actions" into klp-modular-docs automerge: a6abe30

* commit 'd6007644353347f49090337b3683dcca7092ed3d':

9 years agoam 11b14e39: LayoutLib: Use ICU\'s line break algo. [DO NOT MERGE]
Deepanshu Gupta [Mon, 3 Nov 2014 20:34:42 +0000 (20:34 +0000)]
am 11b14e39: LayoutLib: Use ICU\'s line break algo. [DO NOT MERGE]
automerge: fcaf3e9  -s ours

* commit 'fcaf3e9bd031e1ad4c38eee1b81064cca75e26b4':

9 years agoam 916a6ea3: am 6af8fc7f: Merge "docs:64 bit image and skd update" into klp-modular...
Rich Slogar [Mon, 3 Nov 2014 20:33:08 +0000 (20:33 +0000)]
am 916a6ea3: am 6af8fc7f: Merge "docs:64 bit image and skd update" into klp-modular-docs
automerge: 9779c90

* commit '9779c905eac26ab6ce7ce775587c75f1de081dd4':

9 years agoam bb5a1848: am 8730092a: Merge "docs: Added API highlights for Google Play services...
Quddus Chong [Mon, 3 Nov 2014 20:31:51 +0000 (20:31 +0000)]
am bb5a1848: am 8730092a: Merge "docs: Added API highlights for Google Play services 6.1 (Manchego)." into klp-modular-docs
automerge: dfb86b9

* commit 'dfb86b994ff7d51ba1a1683c7123195cc9930c95':

9 years agoam bf29d697: am 6628e602: Merge "Updataed Google Play services Javadocs for v6.1...
Quddus Chong [Mon, 3 Nov 2014 20:30:45 +0000 (20:30 +0000)]
am bf29d697: am 6628e602: Merge "Updataed Google Play services Javadocs for v6.1 (Manchego) release." into klp-modular-docs
automerge: 9566bd2

* commit '9566bd23390b0f21582a59673ded22f47b50ffe0':

9 years agoam c9c18671: am 4be6fdeb: am ba2199fa: Merge "docs: Modified the notice in the androi...
Quddus Chong [Mon, 3 Nov 2014 20:30:09 +0000 (20:30 +0000)]
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':

9 years agoam d89021d7: am 0e61e44d: am 2a02b881: Merge "docs: Training class for the Wearable...
Ricardo Cervera [Mon, 3 Nov 2014 20:30:05 +0000 (20:30 +0000)]
am d89021d7: am 0e61e44d: am 2a02b881: Merge "docs: Training class for the Wearable UI Library" into klp-modular-docs automerge: 2166913

* commit 'd89021d7aaac209a354e02e72fac5c063e8f92fd':

9 years agoam a34b1f15: am 64460a2b: am 83d5c9bf: docs:change required ADT version to 23.0.2...
Rich Slogar [Mon, 3 Nov 2014 20:29:55 +0000 (20:29 +0000)]
am a34b1f15: am 64460a2b: am 83d5c9bf: docs:change required ADT version to 23.0.2 automerge: f07d984

* commit 'a34b1f15292d219b6e2c13fd6f685735c8dd8f8c':

9 years agoam c64c937a: am 8267ffcc: am cef9aab6: Merge "make sdk download links use HTTPS bug...
smain@google.com [Mon, 3 Nov 2014 20:29:51 +0000 (20:29 +0000)]
am c64c937a: am 8267ffcc: am cef9aab6: Merge "make sdk download links use HTTPS bug: 8033954" into klp-modular-docs automerge: 90ab19b

* commit 'c64c937a18be1205170ad95b7f601a6e0192b9b9':

9 years agoam a18075e8: am bd964cad: docs: Removing references to self note on Common Intents...
Ricardo Cervera [Mon, 3 Nov 2014 20:29:24 +0000 (20:29 +0000)]
am a18075e8: am bd964cad: docs: Removing references to self note on Common Intents page.
automerge: 5f9d680

* commit '5f9d680dd73b437e1e311f11f255b659ad18135b':

9 years agoam 6d30f576: am 3f7b4d8f: Merge "docs: Update Common Intents page with Google Now...
Ricardo Cervera [Mon, 3 Nov 2014 20:28:06 +0000 (20:28 +0000)]
am 6d30f576: am 3f7b4d8f: Merge "docs: Update Common Intents page with Google Now actions" into klp-modular-docs
automerge: a6abe30

* commit 'a6abe30397cf1f67b871a3db7555aa7f0f9841d9':

9 years agoam 4be6fdeb: am ba2199fa: Merge "docs: Modified the notice in the android.location...
Quddus Chong [Mon, 3 Nov 2014 20:23:39 +0000 (20:23 +0000)]
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':

9 years agoam 0e61e44d: am 2a02b881: Merge "docs: Training class for the Wearable UI Library...
Ricardo Cervera [Mon, 3 Nov 2014 20:22:28 +0000 (20:22 +0000)]
am 0e61e44d: am 2a02b881: Merge "docs: Training class for the Wearable UI Library" into klp-modular-docs
automerge: 2166913

* commit '2166913933661f4f85fd649ad55997d59a5e3d31':

9 years agoam 64460a2b: am 83d5c9bf: docs:change required ADT version to 23.0.2
Rich Slogar [Mon, 3 Nov 2014 20:21:20 +0000 (20:21 +0000)]
am 64460a2b: am 83d5c9bf: docs:change required ADT version to 23.0.2
automerge: f07d984

* commit 'f07d984fed70be0718e7e9019bc933f58fbeca46':

9 years agoam 8267ffcc: am cef9aab6: Merge "make sdk download links use HTTPS bug: 8033954"...
smain@google.com [Mon, 3 Nov 2014 20:20:13 +0000 (20:20 +0000)]
am 8267ffcc: am cef9aab6: Merge "make sdk download links use HTTPS bug: 8033954" into klp-modular-docs
automerge: 90ab19b

* commit '90ab19bb8dec2e444e274ab4c8990545b481ca7b':

9 years agoam badfcbec: am 4f8399c7: am eff5efac: Merge "docs: Update Android Dashboard for...
Joe Fernandez [Mon, 3 Nov 2014 19:57:46 +0000 (19:57 +0000)]
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

9 years agoMerge "Fix SetupWizard black screen issue for EDU devices" into lmp-mr1-dev
Jim Miller [Mon, 3 Nov 2014 19:51:52 +0000 (19:51 +0000)]
Merge "Fix SetupWizard black screen issue for EDU devices" into lmp-mr1-dev

9 years agoam 4f8399c7: am eff5efac: Merge "docs: Update Android Dashboard for November 2014...
Joe Fernandez [Mon, 3 Nov 2014 19:51:42 +0000 (19:51 +0000)]
am 4f8399c7: am eff5efac: Merge "docs: Update Android Dashboard for November 2014" into lmp-docs

* commit '4f8399c7ad4f7e14e3846494c9aa2b88bfd343d9':
  docs: Update Android Dashboard for November 2014

9 years agoam eff5efac: Merge "docs: Update Android Dashboard for November 2014" into lmp-docs
Joe Fernandez [Mon, 3 Nov 2014 19:41:56 +0000 (19:41 +0000)]
am eff5efac: Merge "docs: Update Android Dashboard for November 2014" into lmp-docs

* commit 'eff5efac2170e05b2a5e197788bf455edee57cce':
  docs: Update Android Dashboard for November 2014

9 years agoMerge "docs: Update Android Dashboard for November 2014" into lmp-docs
Joe Fernandez [Mon, 3 Nov 2014 19:37:19 +0000 (19:37 +0000)]
Merge "docs: Update Android Dashboard for November 2014" into lmp-docs

9 years agodocs: Update Android Dashboard for November 2014
Joe Fernandez [Thu, 30 Oct 2014 17:57:31 +0000 (10:57 -0700)]
docs: Update Android Dashboard for November 2014

Change-Id: I42b4c58ebfe2b6f486c560d4ccf698d8064d1d39

9 years agoMerge "Fix USB audio disconnect logic" into lmp-mr1-dev
Mike Lockwood [Mon, 3 Nov 2014 18:38:13 +0000 (18:38 +0000)]
Merge "Fix USB audio disconnect logic" into lmp-mr1-dev

9 years agoMerge "Fix counting" into lmp-mr1-dev
John Reck [Mon, 3 Nov 2014 18:35:58 +0000 (18:35 +0000)]
Merge "Fix counting" into lmp-mr1-dev

9 years agoMerge "Improve TrustManagerService user lifecycle" into lmp-mr1-dev
Adrian Roos [Mon, 3 Nov 2014 18:33:52 +0000 (18:33 +0000)]
Merge "Improve TrustManagerService user lifecycle" into lmp-mr1-dev

9 years agoFix counting
John Reck [Mon, 3 Nov 2014 18:32:24 +0000 (10:32 -0800)]
Fix counting

Change-Id: I9a3568908a7223d69430c1765fb5a4db96d7ac9c

9 years agoMerge "Fix cancel crash" into lmp-mr1-dev
John Reck [Mon, 3 Nov 2014 18:27:40 +0000 (18:27 +0000)]
Merge "Fix cancel crash" into lmp-mr1-dev

9 years agoam 2d7e612e: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-sprout-dev
Geoff Mendal [Mon, 3 Nov 2014 18:01:46 +0000 (18:01 +0000)]
am 2d7e612e: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-sprout-dev

* commit '2d7e612ed1df3580d35cfc94bbcba660f0f058e2':
  Import translations. DO NOT MERGE

9 years agoFix cancel crash
John Reck [Mon, 3 Nov 2014 18:00:33 +0000 (10:00 -0800)]
Fix cancel crash

Bug: 18059003
Change-Id: I579468fbd1645049f8fbe335faf4da1f2d3bb0a3

9 years agoMerge "Import translations. DO NOT MERGE" into lmp-sprout-dev
Geoff Mendal [Mon, 3 Nov 2014 17:53:11 +0000 (17:53 +0000)]
Merge "Import translations. DO NOT MERGE" into lmp-sprout-dev

9 years agoMerge "Import translations. DO NOT MERGE" into lmp-mr1-dev
Geoff Mendal [Mon, 3 Nov 2014 17:52:10 +0000 (17:52 +0000)]
Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev

9 years agoam 6ff586f7: am fa37321f: am 3e621914: Merge "docs: Add links to Wear UI training...
Ricardo Cervera [Mon, 3 Nov 2014 17:41:45 +0000 (17:41 +0000)]
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.

9 years agoam fa37321f: am 3e621914: Merge "docs: Add links to Wear UI training from Design...
Ricardo Cervera [Mon, 3 Nov 2014 17:36:56 +0000 (17:36 +0000)]
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.

9 years agoam 3e621914: Merge "docs: Add links to Wear UI training from Design pages." into...
Ricardo Cervera [Mon, 3 Nov 2014 17:31:32 +0000 (17:31 +0000)]
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.

9 years agoMerge "docs: Add links to Wear UI training from Design pages." into lmp-docs
Ricardo Cervera [Mon, 3 Nov 2014 17:27:08 +0000 (17:27 +0000)]
Merge "docs: Add links to Wear UI training from Design pages." into lmp-docs

9 years agoam d4e3825a: am 1b2cf3f8: am cd796536: Merge "docs: b/18119632 isGame, b/18119595...
Scott Rowe [Mon, 3 Nov 2014 17:22:26 +0000 (17:22 +0000)]
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

9 years agoam 2997285f: Merge "Disable circular display mask with color inversion" into lmp...
Casey Burkhardt [Mon, 3 Nov 2014 17:22:13 +0000 (17:22 +0000)]
am 2997285f: Merge "Disable circular display mask with color inversion" into lmp-sprout-dev

* commit '2997285f362349097882d1b31eb23cb867227192':
  Disable circular display mask with color inversion

9 years agoImport translations. DO NOT MERGE
Geoff Mendal [Mon, 3 Nov 2014 17:10:40 +0000 (09:10 -0800)]
Import translations. DO NOT MERGE

Change-Id: Ia68d4e853864dd44c7531374c30794d4a0bbd8a3
Auto-generated-cl: translation import

9 years agoImprove TrustManagerService user lifecycle
Adrian Roos [Tue, 28 Oct 2014 19:16:12 +0000 (20:16 +0100)]
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

9 years agoImport translations. DO NOT MERGE
Geoff Mendal [Mon, 3 Nov 2014 17:06:30 +0000 (09:06 -0800)]
Import translations. DO NOT MERGE

Change-Id: I21e1890c7ff4490469fb0243df69b560db9b29b6
Auto-generated-cl: translation import

9 years agoam 1b2cf3f8: am cd796536: Merge "docs: b/18119632 isGame, b/18119595 banner" into...
Scott Rowe [Mon, 3 Nov 2014 17:00:31 +0000 (17:00 +0000)]
am 1b2cf3f8: am cd796536: Merge "docs: b/18119632 isGame, b/18119595 banner" into lmp-docs

* commit '1b2cf3f8f64013441fc021db45e00381d4b2d19b':
  docs: b/18119632 isGame, b/18119595 banner

9 years agoMerge "Disable circular display mask with color inversion" into lmp-sprout-dev
Casey Burkhardt [Mon, 3 Nov 2014 16:55:27 +0000 (16:55 +0000)]
Merge "Disable circular display mask with color inversion" into lmp-sprout-dev

9 years agoam cd796536: Merge "docs: b/18119632 isGame, b/18119595 banner" into lmp-docs
Scott Rowe [Mon, 3 Nov 2014 16:54:29 +0000 (16:54 +0000)]
am cd796536: Merge "docs: b/18119632 isGame, b/18119595 banner" into lmp-docs

* commit 'cd796536ce81fe6f8a63c3867b57e7b7f92a8542':
  docs: b/18119632 isGame, b/18119595 banner

9 years agoMerge "docs: b/18119632 isGame, b/18119595 banner" into lmp-docs
Scott Rowe [Mon, 3 Nov 2014 16:24:36 +0000 (16:24 +0000)]
Merge "docs: b/18119632 isGame, b/18119595 banner" into lmp-docs

9 years agoMerge "Fix colored status bar panning issues" into lmp-mr1-dev
Adrian Roos [Mon, 3 Nov 2014 15:44:06 +0000 (15:44 +0000)]
Merge "Fix colored status bar panning issues" into lmp-mr1-dev

9 years agoam c95236de: (-s ours) Import translations. DO NOT MERGE
Geoff Mendal [Mon, 3 Nov 2014 15:07:50 +0000 (15:07 +0000)]
am c95236de: (-s ours) Import translations. DO NOT MERGE

* commit 'c95236deadfed31966661c7ed5c5db7422b3d0dc':
  Import translations. DO NOT MERGE

9 years agoImport translations. DO NOT MERGE
Geoff Mendal [Mon, 3 Nov 2014 14:58:11 +0000 (06:58 -0800)]
Import translations. DO NOT MERGE

Change-Id: Ic1ed8ade48ee37210f335564cc5640675db47290
Auto-generated-cl: translation import

9 years agoMerge "Improve dump of status bar service" into lmp-mr1-dev
Adrian Roos [Mon, 3 Nov 2014 14:56:47 +0000 (14:56 +0000)]
Merge "Improve dump of status bar service" into lmp-mr1-dev

9 years agoMerge "SysUI: Use mScreenOnFromKeyguard for panel visibility" into lmp-mr1-dev
Christoph Studer [Mon, 3 Nov 2014 14:49:16 +0000 (14:49 +0000)]
Merge "SysUI: Use mScreenOnFromKeyguard for panel visibility" into lmp-mr1-dev

9 years agoMerge "Import translations. DO NOT MERGE" into lmp-mr1-dev
Geoff Mendal [Mon, 3 Nov 2014 14:46:10 +0000 (14:46 +0000)]
Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev

9 years agoImport translations. DO NOT MERGE
Geoff Mendal [Mon, 3 Nov 2014 14:43:47 +0000 (06:43 -0800)]
Import translations. DO NOT MERGE

Change-Id: I93f51ef821e604f91d7323c953a98bea7ef8204c
Auto-generated-cl: translation import

9 years agoMerge "Move LOCK_TO_APP_EXIT_LOCKED from System to Secure" into lmp-mr1-dev
Jason Monk [Mon, 3 Nov 2014 14:36:01 +0000 (14:36 +0000)]
Merge "Move LOCK_TO_APP_EXIT_LOCKED from System to Secure" into lmp-mr1-dev

9 years agoMerge "Fix getPackageInfo("android") in the system server." into lmp-mr1-dev
Narayan Kamath [Mon, 3 Nov 2014 12:45:15 +0000 (12:45 +0000)]
Merge "Fix getPackageInfo("android") in the system server." into lmp-mr1-dev

9 years agoMerge "Split Telecom PhoneAccount registration permissions." into lmp-mr1-dev
Santos Cordon [Mon, 3 Nov 2014 07:54:03 +0000 (07:54 +0000)]
Merge "Split Telecom PhoneAccount registration permissions." into lmp-mr1-dev

9 years agoMerge "Even, Even more telecom javadoc." into lmp-mr1-dev
Santos Cordon [Mon, 3 Nov 2014 07:53:38 +0000 (07:53 +0000)]
Merge "Even, Even more telecom javadoc." into lmp-mr1-dev

9 years agoTIF: Add more documentation on start/end time of TvContract.Program
Dongwon Kang [Thu, 30 Oct 2014 05:17:41 +0000 (14:17 +0900)]
TIF: Add more documentation on start/end time of TvContract.Program

Bug: 18163685
Change-Id: Ifcd57330eb341adfbcb7fcf3482a701471bf729f

9 years agoam 20ee9f12: am de740985: am aa275bf9: Merge "docs: b/15180738 - invalid urls in...
Scott Rowe [Sat, 1 Nov 2014 16:42:02 +0000 (16:42 +0000)]
am 20ee9f12: am de740985: am aa275bf9: Merge "docs: b/15180738 - invalid urls in badge generator" into lmp-docs

* commit '20ee9f122da1572ffb4e9a76eddc71180a4e608d':
  docs: b/15180738 - invalid urls in badge generator

9 years agoam de740985: am aa275bf9: Merge "docs: b/15180738 - invalid urls in badge generator...
Scott Rowe [Sat, 1 Nov 2014 16:33:50 +0000 (16:33 +0000)]
am de740985: am aa275bf9: Merge "docs: b/15180738 - invalid urls in badge generator" into lmp-docs

* commit 'de7409859315de19f081325a82a9c3ef99f28f26':
  docs: b/15180738 - invalid urls in badge generator

9 years agoam aa275bf9: Merge "docs: b/15180738 - invalid urls in badge generator" into lmp...
Scott Rowe [Sat, 1 Nov 2014 16:28:23 +0000 (16:28 +0000)]
am aa275bf9: Merge "docs: b/15180738 - invalid urls in badge generator" into lmp-docs

* commit 'aa275bf989f0bf9e968f0804bb57ec7b1a7c1f54':
  docs: b/15180738 - invalid urls in badge generator

9 years agoMerge "docs: b/15180738 - invalid urls in badge generator" into lmp-docs
Scott Rowe [Sat, 1 Nov 2014 16:23:10 +0000 (16:23 +0000)]
Merge "docs: b/15180738 - invalid urls in badge generator" into lmp-docs

9 years agoam 13f00f07: Implement multi-press behavior for power key.
Jeff Brown [Sat, 1 Nov 2014 14:10:50 +0000 (14:10 +0000)]
am 13f00f07: Implement multi-press behavior for power key.

* commit '13f00f07d69f087cf186c23ae6c6fc938e2be561':
  Implement multi-press behavior for power key.

9 years agoam e333e674: Add a function to boost screen brightness temporarily.
Jeff Brown [Sat, 1 Nov 2014 14:10:46 +0000 (14:10 +0000)]
am e333e674: Add a function to boost screen brightness temporarily.

* commit 'e333e674a758c39885d4d9779a1aad387fb0e6aa':
  Add a function to boost screen brightness temporarily.

9 years agoam 84045506: am 20207a83: am e8ad737d: docs: multidex - building apps with over 65K...
Joe Fernandez [Sat, 1 Nov 2014 14:10:43 +0000 (14:10 +0000)]
am 84045506: am 20207a83: am e8ad737d: docs: multidex - building apps with over 65K method references

* commit '84045506140d895aaf4fdc5a090e89d657add120':
  docs: multidex - building apps with over 65K method references

9 years agoam 0e4ef673: am 89e73a1c: am ea17fdec: Merge "docs:studio-updates-814v2" into lmp...
Joe Fernandez [Sat, 1 Nov 2014 14:09:34 +0000 (14:09 +0000)]
am 0e4ef673: am 89e73a1c: am ea17fdec: Merge "docs:studio-updates-814v2" into lmp-docs

* commit '0e4ef673696c0a2c352379b325ed281478512da3':
  docs:studio-updates-814v2

9 years agoam 515daeea: am 307bcbe3: am 26bf2f7b: revise helpouts tags to use just one on each...
smain@google.com [Sat, 1 Nov 2014 14:09:09 +0000 (14:09 +0000)]
am 515daeea: am 307bcbe3: am 26bf2f7b: revise helpouts tags to use just one on each page

* commit '515daeead864ba47e04a1ca4c41b8f1cacaef95b':
  revise helpouts tags to use just one on each page

9 years agoam 9b00d795: am 0da6b005: revise helpouts tags to use just one on each page
smain@google.com [Sat, 1 Nov 2014 14:09:05 +0000 (14:09 +0000)]
am 9b00d795: am 0da6b005: revise helpouts tags to use just one on each page

* commit '9b00d795d18b8a52b54f919e53b094e689bfc92e':
  revise helpouts tags to use just one on each page

9 years agoam dcf5af38: am 8129b8b4: am dd8accfe: Merge "Mention ECDHE_PSK bug in Javadoc of...
Alex Klyubin [Sat, 1 Nov 2014 14:08:40 +0000 (14:08 +0000)]
am dcf5af38: am 8129b8b4: am dd8accfe: Merge "Mention ECDHE_PSK bug in Javadoc of PskKeyManager." into lmp-docs

* commit 'dcf5af38bfd306af77613aa051393bf7d8e8fb44':
  Mention ECDHE_PSK bug in Javadoc of PskKeyManager.

9 years agoam 84ca5ddb: am bdb1cf0c: Merge "docs: Add links to Wear UI training from Design...
Ricardo Cervera [Sat, 1 Nov 2014 14:08:31 +0000 (14:08 +0000)]
am 84ca5ddb: am bdb1cf0c: Merge "docs: Add links to Wear UI training from Design pages." into lmp-dev

* commit '84ca5ddb0844146408e241e7022c78477d9c4a6f':
  docs: Add links to Wear UI training from Design pages.

9 years agoam 43fda072: am 922e6b6a: am 81fcc85c: Merge "docs:studio-update-814" into lmp-docs
Joe Fernandez [Sat, 1 Nov 2014 14:08:18 +0000 (14:08 +0000)]
am 43fda072: am 922e6b6a: am 81fcc85c: Merge "docs:studio-update-814" into lmp-docs

* commit '43fda072c227e7a98dbcb993dc20fb391c1f11fc':
  docs:studio-update-814

9 years agoam 2182bf5a: am 3d875f80: am cf0f740e: (-s ours) If no display settings are matched...
Mark Renouf [Sat, 1 Nov 2014 14:08:13 +0000 (14:08 +0000)]
am 2182bf5a: am 3d875f80: am cf0f740e: (-s ours) If no display settings are matched, return the first one. DO NOT MERGE

* commit '2182bf5ac836fcc740fd5c65e76890ca53dce1b7':
  If no display settings are matched, return the first one. DO NOT MERGE

9 years agoam dfeb6055: am b31c2b07: am 397eb67f: Merge "docs: Cherry pick from lmp-dev update...
Scott Rowe [Sat, 1 Nov 2014 14:07:41 +0000 (14:07 +0000)]
am dfeb6055: am b31c2b07: am 397eb67f: Merge "docs: Cherry pick from lmp-dev update screen shot Change-Id: I9eeed45c7dea9f1b988544c75a906f234a787905" into lmp-docs

* commit 'dfeb60558e87879c9575b32281e9c22fec623198':
  docs: Cherry pick from lmp-dev update screen shot Change-Id: I9eeed45c7dea9f1b988544c75a906f234a787905

9 years agoam 6497dd73: am b5c5a0dc: am 7be03da0: (-s ours) Merge "Preserve explicit consumed...
Mark Renouf [Sat, 1 Nov 2014 14:07:35 +0000 (14:07 +0000)]
am 6497dd73: am b5c5a0dc: am 7be03da0: (-s ours) Merge "Preserve explicit consumed state in replaceSystemWindowInsets DO NOT MERGE" into klp-modular-dev

* commit '6497dd732565f4cadfe0e808d3075de95ecff80e':
  Preserve explicit consumed state in replaceSystemWindowInsets DO NOT MERGE

9 years agoam 62b532c7: am d2d8c553: am e91c37de: Fixes wrongly nested braces. Bug: 17499985
David Friedman [Sat, 1 Nov 2014 14:07:19 +0000 (14:07 +0000)]
am 62b532c7: am d2d8c553: am e91c37de: Fixes wrongly nested braces. Bug: 17499985

* commit '62b532c7f4d7e6a868b8b007829dab9622ee5423':
  Fixes wrongly nested braces. Bug: 17499985

9 years agoImplement multi-press behavior for power key.
Jeff Brown [Fri, 31 Oct 2014 21:45:50 +0000 (14:45 -0700)]
Implement multi-press behavior for power key.

Added support for brightness boost or setting theater
mode from the power key.  This behavior is disabled by default and
must be enabled for specific products in a config.xml overlay.

Because the power key is already so overloaded, refactored the
code to split out handling of the similar ENDCALL button and
renamed all of the state that has to do with screenshot chord
detection to avoid confusion.

Bug: 17949215
Change-Id: Id282133188e3781472aabb64fabcee7b98d0c77d

9 years agoAdd a function to boost screen brightness temporarily.
Jeff Brown [Tue, 28 Oct 2014 20:48:55 +0000 (13:48 -0700)]
Add a function to boost screen brightness temporarily.

When PowerManager.boostScreenBrightness() is called, the screen
brightness is set to maximum for 5 seconds.  This action is
also considered to be user activity.

Bug: 17934954
Change-Id: I1cb4a03a60705c6c1c5cc9ff84b1c5dbd2932fcd

9 years agoMerge "Conditionally allow non-primay profiles to use TextServices" into lmp-mr1-dev
Yohei Yukawa [Sat, 1 Nov 2014 01:29:23 +0000 (01:29 +0000)]
Merge "Conditionally allow non-primay profiles to use TextServices" into lmp-mr1-dev

9 years agoam 20207a83: am e8ad737d: docs: multidex - building apps with over 65K method references
Joe Fernandez [Sat, 1 Nov 2014 01:25:26 +0000 (01:25 +0000)]
am 20207a83: am e8ad737d: docs: multidex - building apps with over 65K method references

* commit '20207a83c989fde1d57b45a4c1373ca25fd49bd7':
  docs: multidex - building apps with over 65K method references

9 years agoam e8ad737d: docs: multidex - building apps with over 65K method references
Joe Fernandez [Sat, 1 Nov 2014 01:14:15 +0000 (01:14 +0000)]
am e8ad737d: docs: multidex - building apps with over 65K method references

* commit 'e8ad737db6b35bfe342dc0a1674f1200d08e45f5':
  docs: multidex - building apps with over 65K method references

9 years agoFix SetupWizard black screen issue for EDU devices
Jim Miller [Sat, 1 Nov 2014 00:27:13 +0000 (17:27 -0700)]
Fix SetupWizard black screen issue for EDU devices

This fixes a problem where EDU devices show a black screen if
the device is rebooted after setting a pin/pattern/password but
before completing SetupWizard.

The issue is that the system doesn't expect to see a state
where the device is not provisioned but has a pin/pattern/password
because it wasn't possible before. With the addition of the ability
for EDU devices to add a pin/pattern/password, we can now get
into this unforseen state.

The fix ignores provisioning if a password is set so that the
user can reach the security screen to unlock the device and
continue with SetupWizard.

Fixes bug 18022051

Change-Id: Ie88a75530d964c02458c25866f0629877214edf4