git.osdn.net Git - android-x86/frameworks-base.git/log

OSDN Git Service

(root) / android-x86 / frameworks-base.git / log

commit | commitdiff | tree

Geoff Mendal [Wed, 3 Feb 2016 13:05:48 +0000 (13:05 +0000)]

Merge branch 'master' of /usr/local/google/game/mirror/googleplex-android_googlesource_com/platform/frameworks/base

commit | commitdiff | tree

Robin Lee [Mon, 1 Feb 2016 11:37:02 +0000 (11:37 +0000)]

[Metrics] declare a constant for user credentials

Bug: 22541933
Change-Id: I774f74f3dd21f242a821bb08db6c09a8fc668671

commit | commitdiff | tree

Geoff Mendal [Wed, 3 Feb 2016 13:01:25 +0000 (13:01 +0000)]

Merge "Import translations. DO NOT MERGE" into mnc-dr2-dev am: e8f321c778  -s ours
am: acbdeaba70  -s ours

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

commit | commitdiff | tree

Geoff Mendal [Wed, 3 Feb 2016 12:56:49 +0000 (12:56 +0000)]

Merge branch 'master' of /usr/local/google/game/mirror/googleplex-android_googlesource_com/platform/frameworks/base

commit | commitdiff | tree

Geoff Mendal [Wed, 3 Feb 2016 12:52:23 +0000 (12:52 +0000)]

Merge "Import translations. DO NOT MERGE" into mnc-dr2-dev am: 091a828fb5  -s ours
am: b73c44bbcc  -s ours

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

commit | commitdiff | tree

Geoff Mendal [Wed, 3 Feb 2016 12:52:08 +0000 (12:52 +0000)]

Merge branch 'master' of /usr/local/google/game/mirror/googleplex-android_googlesource_com/platform/frameworks/base

commit | commitdiff | tree

Geoff Mendal [Wed, 3 Feb 2016 12:47:59 +0000 (12:47 +0000)]

Merge "Import translations. DO NOT MERGE" into mnc-dr2-dev am: 091a828fb5  -s ours
am: b73c44bbcc  -s ours

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

commit | commitdiff | tree

Geoff Mendal [Wed, 3 Feb 2016 12:47:50 +0000 (12:47 +0000)]

Merge branch 'master' of /usr/local/google/game/mirror/googleplex-android_googlesource_com/platform/frameworks/base

commit | commitdiff | tree

Geoff Mendal [Wed, 3 Feb 2016 12:43:25 +0000 (12:43 +0000)]

Merge "Import translations. DO NOT MERGE" into mnc-dr2-dev am: f47a2c9fb9  -s ours
am: 02171a04a6  -s ours

* commit '02171a04a6d416f6c769c79174548a83cd564027':
  Import translations. DO NOT MERGE

commit | commitdiff | tree

Geoff Mendal [Wed, 3 Feb 2016 12:41:58 +0000 (12:41 +0000)]

Merge "Import translations. DO NOT MERGE" into mnc-dr2-dev am: f47a2c9fb9  -s ours
am: 02171a04a6  -s ours

* commit '02171a04a6d416f6c769c79174548a83cd564027':
  Import translations. DO NOT MERGE

commit | commitdiff | tree

Geoff Mendal [Wed, 3 Feb 2016 12:37:14 +0000 (12:37 +0000)]

Merge branch 'master' of /usr/local/google/game/mirror/googleplex-android_googlesource_com/platform/frameworks/base

commit | commitdiff | tree

Geoff Mendal [Wed, 3 Feb 2016 12:34:19 +0000 (12:34 +0000)]

Merge "Import translations. DO NOT MERGE" into mnc-dr2-dev am: 762829795f  -s ours
am: 77ceede11b  -s ours

* commit '77ceede11b89918f649b4f6d5aca98cee55569fd':
  Import translations. DO NOT MERGE

commit | commitdiff | tree

Geoff Mendal [Wed, 3 Feb 2016 12:25:16 +0000 (12:25 +0000)]

Merge "Import translations. DO NOT MERGE" into mnc-dr2-dev am: 762829795f  -s ours
am: 77ceede11b  -s ours

* commit '77ceede11b89918f649b4f6d5aca98cee55569fd':
  Import translations. DO NOT MERGE

commit | commitdiff | tree

Geoff Mendal [Wed, 3 Feb 2016 12:20:50 +0000 (12:20 +0000)]

Merge branch 'master' of /usr/local/google/game/mirror/googleplex-android_googlesource_com/platform/frameworks/base

commit | commitdiff | tree

Clara Bayarri [Wed, 3 Feb 2016 12:17:12 +0000 (12:17 +0000)]

Merge "Keyboard Shortcuts Helper: Use App name for default group"

commit | commitdiff | tree

Geoff Mendal [Wed, 3 Feb 2016 12:16:37 +0000 (12:16 +0000)]

Merge "Import translations. DO NOT MERGE" into mnc-dr2-dev am: fd92981842  -s ours
am: e7dccbd97c  -s ours

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

commit | commitdiff | tree

Geoff Mendal [Wed, 3 Feb 2016 12:15:54 +0000 (12:15 +0000)]

Merge branch 'master' of /usr/local/google/game/mirror/googleplex-android_googlesource_com/platform/frameworks/base

commit | commitdiff | tree

Geoff Mendal [Wed, 3 Feb 2016 12:12:57 +0000 (12:12 +0000)]

Merge "Import translations. DO NOT MERGE" into mnc-dr2-dev am: 45267b2f06  -s ours
am: 892160a1c5  -s ours

* commit '892160a1c53265207878c199f0dbdc7a524979d3':
  Import translations. DO NOT MERGE

commit | commitdiff | tree

Geoff Mendal [Wed, 3 Feb 2016 12:12:08 +0000 (12:12 +0000)]

Merge branch 'master' of /usr/local/google/game/mirror/googleplex-android_googlesource_com/platform/frameworks/base

commit | commitdiff | tree

Geoff Mendal [Wed, 3 Feb 2016 12:07:59 +0000 (12:07 +0000)]

Merge branch 'master' of /usr/local/google/game/mirror/googleplex-android_googlesource_com/platform/frameworks/base

commit | commitdiff | tree

Geoff Mendal [Wed, 3 Feb 2016 12:07:42 +0000 (12:07 +0000)]

Merge "Import translations. DO NOT MERGE" into mnc-dr2-dev am: 45267b2f06  -s ours
am: 892160a1c5  -s ours

* commit '892160a1c53265207878c199f0dbdc7a524979d3':
  Import translations. DO NOT MERGE

commit | commitdiff | tree

Geoff Mendal [Wed, 3 Feb 2016 12:03:36 +0000 (12:03 +0000)]

Merge "Import translations. DO NOT MERGE" into mnc-dr2-dev am: 38f33925f8  -s ours
am: 0ba5990d99  -s ours

* commit '0ba5990d99fe96e5c6c1b864c4a23899be8b258a':
  Import translations. DO NOT MERGE

commit | commitdiff | tree

Geoff Mendal [Wed, 3 Feb 2016 12:03:17 +0000 (12:03 +0000)]

Merge branch 'master' of /usr/local/google/game/mirror/googleplex-android_googlesource_com/platform/frameworks/base

commit | commitdiff | tree

Geoff Mendal [Wed, 3 Feb 2016 11:58:56 +0000 (11:58 +0000)]

Merge "Import translations. DO NOT MERGE" into mnc-dr2-dev am: 38f33925f8  -s ours
am: 0ba5990d99  -s ours

* commit '0ba5990d99fe96e5c6c1b864c4a23899be8b258a':
  Import translations. DO NOT MERGE

commit | commitdiff | tree

Geoff Mendal [Wed, 3 Feb 2016 11:58:11 +0000 (11:58 +0000)]

Merge branch 'master' of /usr/local/google/game/mirror/googleplex-android_googlesource_com/platform/frameworks/base

commit | commitdiff | tree

Geoff Mendal [Wed, 3 Feb 2016 11:55:09 +0000 (11:55 +0000)]

Merge "Import translations. DO NOT MERGE" into mnc-dr2-dev am: e6faf1a713  -s ours
am: f80ebaf32e  -s ours

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

commit | commitdiff | tree

Geoff Mendal [Wed, 3 Feb 2016 11:54:16 +0000 (11:54 +0000)]

Merge branch 'master' of /usr/local/google/game/mirror/googleplex-android_googlesource_com/platform/frameworks/base

commit | commitdiff | tree

Geoff Mendal [Wed, 3 Feb 2016 11:50:07 +0000 (11:50 +0000)]

Merge "Import translations. DO NOT MERGE" into mnc-dr2-dev am: e6faf1a713  -s ours
am: f80ebaf32e  -s ours

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

commit | commitdiff | tree

Geoff Mendal [Wed, 3 Feb 2016 11:49:12 +0000 (11:49 +0000)]

Merge branch 'master' of /usr/local/google/game/mirror/googleplex-android_googlesource_com/platform/frameworks/base

commit | commitdiff | tree

Clara Bayarri [Tue, 2 Feb 2016 18:08:01 +0000 (18:08 +0000)]

Keyboard Shortcuts Helper: Use App name for default group

Change-Id: I802dd6c9dcc838b9f06b29b99dc47dd93634d98b

commit | commitdiff | tree

Geoff Mendal [Wed, 3 Feb 2016 11:44:51 +0000 (11:44 +0000)]

Merge "Import translations. DO NOT MERGE" into mnc-dr2-dev am: fba9bae4d1  -s ours
am: 4b4d63c3a5  -s ours

* commit '4b4d63c3a52d7083fb52f116aecae33e97240a2f':
  Import translations. DO NOT MERGE

commit | commitdiff | tree

Geoff Mendal [Wed, 3 Feb 2016 11:41:05 +0000 (11:41 +0000)]

Merge "Import translations. DO NOT MERGE" into mnc-dr2-dev am: fba9bae4d1  -s ours
am: 4b4d63c3a5  -s ours

* commit '4b4d63c3a52d7083fb52f116aecae33e97240a2f':
  Import translations. DO NOT MERGE

commit | commitdiff | tree

Geoff Mendal [Wed, 3 Feb 2016 11:36:34 +0000 (11:36 +0000)]

Merge branch 'master' of /usr/local/google/game/mirror/googleplex-android_googlesource_com/platform/frameworks/base

commit | commitdiff | tree

Geoff Mendal [Wed, 3 Feb 2016 11:32:37 +0000 (11:32 +0000)]

Merge branch 'master' of /usr/local/google/game/mirror/googleplex-android_googlesource_com/platform/frameworks/base

commit | commitdiff | tree

Geoff Mendal [Wed, 3 Feb 2016 11:32:12 +0000 (11:32 +0000)]

Merge "Import translations. DO NOT MERGE" into mnc-dr2-dev am: 6779c7d415  -s ours
am: 87c4199600  -s ours

* commit '87c4199600dcc6933abffa8bc9c04abf52483575':
  Import translations. DO NOT MERGE

commit | commitdiff | tree

Geoff Mendal [Wed, 3 Feb 2016 11:29:36 +0000 (11:29 +0000)]

Merge "Import translations. DO NOT MERGE" into mnc-dr2-dev am: 6779c7d415  -s ours
am: 87c4199600  -s ours

* commit '87c4199600dcc6933abffa8bc9c04abf52483575':
  Import translations. DO NOT MERGE

commit | commitdiff | tree

Geoff Mendal [Wed, 3 Feb 2016 11:29:03 +0000 (11:29 +0000)]

Merge branch 'master' of /usr/local/google/game/mirror/googleplex-android_googlesource_com/platform/frameworks/base

commit | commitdiff | tree

Geoff Mendal [Wed, 3 Feb 2016 11:28:31 +0000 (11:28 +0000)]

Merge "Import translations. DO NOT MERGE" into mnc-dr2-dev
am: e8f321c778 -s ours

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

commit | commitdiff | tree

Geoff Mendal [Wed, 3 Feb 2016 11:25:16 +0000 (11:25 +0000)]

Merge "Import translations. DO NOT MERGE" into mnc-dr1.5-dev am: c0297abd93  -s ours am: 768b07ca66  -s ours
am: 4c3e6f2a53  -s ours

* commit '4c3e6f2a53d4815da8fdaf7431bc8091561551a7':
  Import translations. DO NOT MERGE

commit | commitdiff | tree

Geoff Mendal [Wed, 3 Feb 2016 11:22:48 +0000 (11:22 +0000)]

commit | commitdiff | tree

Geoff Mendal [Wed, 3 Feb 2016 11:21:15 +0000 (11:21 +0000)]

Merge branch 'master' of /usr/local/google/game/mirror/googleplex-android_googlesource_com/platform/frameworks/base

commit | commitdiff | tree

Geoff Mendal [Wed, 3 Feb 2016 11:19:55 +0000 (11:19 +0000)]

Merge "Import translations. DO NOT MERGE" into mnc-dr1.5-dev am: 4a27667bf5  -s ours am: b1be124b15  -s ours
am: 3350974f82  -s ours

* commit '3350974f82c7743e204d57f5f19b554e67bdad63':
  Import translations. DO NOT MERGE

commit | commitdiff | tree

Geoff Mendal [Wed, 3 Feb 2016 11:18:49 +0000 (11:18 +0000)]

Merge branch 'master' of /usr/local/google/game/mirror/googleplex-android_googlesource_com/platform/frameworks/base

commit | commitdiff | tree

Geoff Mendal [Wed, 3 Feb 2016 11:17:36 +0000 (11:17 +0000)]

commit | commitdiff | tree

Geoff Mendal [Wed, 3 Feb 2016 11:17:26 +0000 (11:17 +0000)]

Merge "Import translations. DO NOT MERGE" into mnc-dr2-dev
am: 091a828fb5 -s ours

* commit '091a828fb5220d367124bd72a3e2c020e8200feb':
Import translations. DO NOT MERGE

commit | commitdiff | tree

Geoff Mendal [Wed, 3 Feb 2016 11:16:29 +0000 (11:16 +0000)]

Merge branch 'master' of /usr/local/google/game/mirror/googleplex-android_googlesource_com/platform/frameworks/base

commit | commitdiff | tree

Geoff Mendal [Wed, 3 Feb 2016 11:13:58 +0000 (11:13 +0000)]

Merge "Import translations. DO NOT MERGE" into mnc-dr2-dev
am: f47a2c9fb9 -s ours

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

commit | commitdiff | tree

Geoff Mendal [Wed, 3 Feb 2016 11:11:14 +0000 (11:11 +0000)]

Merge "Import translations. DO NOT MERGE" into mnc-dr1.5-dev am: 091513d6e8  -s ours am: a0159dfc08  -s ours
am: b8758b39a9  -s ours

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

commit | commitdiff | tree

Geoff Mendal [Wed, 3 Feb 2016 11:09:58 +0000 (11:09 +0000)]

Merge "Import translations. DO NOT MERGE" into mnc-dr2-dev
am: 762829795f -s ours

* commit '762829795f52c701f244550ec142fbd35a631a28':
Import translations. DO NOT MERGE

commit | commitdiff | tree

Geoff Mendal [Wed, 3 Feb 2016 11:08:48 +0000 (11:08 +0000)]

commit | commitdiff | tree

Geoff Mendal [Wed, 3 Feb 2016 11:08:42 +0000 (11:08 +0000)]

Merge branch 'master' of /usr/local/google/game/mirror/googleplex-android_googlesource_com/platform/frameworks/base

commit | commitdiff | tree

Geoff Mendal [Wed, 3 Feb 2016 11:05:45 +0000 (11:05 +0000)]

Merge "Import translations. DO NOT MERGE" into mnc-dr1.5-dev am: 1974686db5  -s ours am: a85507482f  -s ours
am: d5668a4a88  -s ours

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

commit | commitdiff | tree

Geoff Mendal [Wed, 3 Feb 2016 11:05:42 +0000 (11:05 +0000)]

Merge "Import translations. DO NOT MERGE" into mnc-dr2-dev
am: fd92981842 -s ours

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

commit | commitdiff | tree

Geoff Mendal [Wed, 3 Feb 2016 11:05:38 +0000 (11:05 +0000)]

Merge branch 'master' of /usr/local/google/game/mirror/googleplex-android_googlesource_com/platform/frameworks/base

commit | commitdiff | tree

Geoff Mendal [Wed, 3 Feb 2016 11:03:41 +0000 (11:03 +0000)]

commit | commitdiff | tree

Geoff Mendal [Wed, 3 Feb 2016 11:03:38 +0000 (11:03 +0000)]

Merge branch 'master' of /usr/local/google/game/mirror/googleplex-android_googlesource_com/platform/frameworks/base

commit | commitdiff | tree

Geoff Mendal [Wed, 3 Feb 2016 11:02:40 +0000 (11:02 +0000)]

Merge "Import translations. DO NOT MERGE" into mnc-dr2-dev
am: 45267b2f06 -s ours

* commit '45267b2f068fda88741ec5f9d949b6b19d232ed3':
Import translations. DO NOT MERGE

commit | commitdiff | tree

Geoff Mendal [Wed, 3 Feb 2016 11:00:08 +0000 (11:00 +0000)]

Merge "Import translations. DO NOT MERGE" into mnc-dr1.5-dev am: 063357312c  -s ours am: 4d79bcf457  -s ours
am: a6f5fe64f4  -s ours

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

commit | commitdiff | tree

Geoff Mendal [Wed, 3 Feb 2016 11:00:03 +0000 (11:00 +0000)]

Merge "Import translations. DO NOT MERGE" into mnc-dr2-dev
am: 38f33925f8 -s ours

* commit '38f33925f87a0d705e4b0f3c2959978368a9c0b6':
Import translations. DO NOT MERGE

commit | commitdiff | tree

Geoff Mendal [Wed, 3 Feb 2016 10:59:15 +0000 (10:59 +0000)]

commit | commitdiff | tree

Geoff Mendal [Wed, 3 Feb 2016 10:57:28 +0000 (10:57 +0000)]

Merge branch 'master' of /usr/local/google/game/mirror/googleplex-android_googlesource_com/platform/frameworks/base

commit | commitdiff | tree

Geoff Mendal [Wed, 3 Feb 2016 10:56:37 +0000 (10:56 +0000)]

Merge "Import translations. DO NOT MERGE" into mnc-dr2-dev
am: e6faf1a713 -s ours

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

commit | commitdiff | tree

Geoff Mendal [Wed, 3 Feb 2016 10:56:31 +0000 (10:56 +0000)]

Merge "Import translations. DO NOT MERGE" into mnc-dr1.5-dev am: 3122eedcd3  -s ours am: aa7e0396c9  -s ours
am: b8783e5933  -s ours

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

commit | commitdiff | tree

Geoff Mendal [Wed, 3 Feb 2016 10:54:21 +0000 (10:54 +0000)]

commit | commitdiff | tree

Geoff Mendal [Wed, 3 Feb 2016 10:54:05 +0000 (10:54 +0000)]

Merge "Import translations. DO NOT MERGE" into mnc-dr2-dev
am: fba9bae4d1 -s ours

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

commit | commitdiff | tree

Geoff Mendal [Wed, 3 Feb 2016 10:49:28 +0000 (10:49 +0000)]

Merge "Import translations. DO NOT MERGE" into mnc-dr2-dev
am: 6779c7d415 -s ours

* commit '6779c7d41583a01ca304543979d3d5a90af5cc57':
Import translations. DO NOT MERGE

commit | commitdiff | tree

Geoff Mendal [Wed, 3 Feb 2016 10:48:05 +0000 (10:48 +0000)]

Merge "Import translations. DO NOT MERGE" into mnc-dr1.5-dev am: b697973e2a  -s ours am: 0291cf7113  -s ours
am: 3cddac44fd  -s ours

* commit '3cddac44fd60e05047aa510b6d4973b47dec0475':
  Import translations. DO NOT MERGE

commit | commitdiff | tree

Geoff Mendal [Wed, 3 Feb 2016 10:47:14 +0000 (10:47 +0000)]

Merge branch 'master' of /usr/local/google/game/mirror/googleplex-android_googlesource_com/platform/frameworks/base

commit | commitdiff | tree

Geoff Mendal [Wed, 3 Feb 2016 10:46:02 +0000 (10:46 +0000)]

Merge "Import translations. DO NOT MERGE" into mnc-dr1.5-dev am: 21e0a012d8  -s ours am: 008f7facbe  -s ours
am: 6332ec3317  -s ours

* commit '6332ec33172816b2653f82ef70575af478f306ec':
  Import translations. DO NOT MERGE

commit | commitdiff | tree

Geoff Mendal [Wed, 3 Feb 2016 10:46:00 +0000 (10:46 +0000)]

Merge "Import translations. DO NOT MERGE" into mnc-dr1.5-dev am: c0297abd93  -s ours
am: 768b07ca66  -s ours

* commit '768b07ca66e9a0780e17d3d8542b601e2ffc2771':
  Import translations. DO NOT MERGE

commit | commitdiff | tree

Geoff Mendal [Wed, 3 Feb 2016 10:45:34 +0000 (10:45 +0000)]

Merge branch 'master' of /usr/local/google/game/mirror/googleplex-android_googlesource_com/platform/frameworks/base

commit | commitdiff | tree

Geoff Mendal [Wed, 3 Feb 2016 10:44:23 +0000 (10:44 +0000)]

Merge "Import translations. DO NOT MERGE" into mnc-dr1.5-dev am: 497300badb  -s ours am: abaebda3ff  -s ours
am: 381c7ce4ed  -s ours

* commit '381c7ce4ed857113d838743d7de224fab021e278':
  Import translations. DO NOT MERGE

commit | commitdiff | tree

Geoff Mendal [Wed, 3 Feb 2016 10:43:31 +0000 (10:43 +0000)]

commit | commitdiff | tree

Geoff Mendal [Wed, 3 Feb 2016 10:43:24 +0000 (10:43 +0000)]

Merge "Import translations. DO NOT MERGE" into mnc-dr1.5-dev am: 4a27667bf5  -s ours
am: b1be124b15  -s ours

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

commit | commitdiff | tree

Geoff Mendal [Wed, 3 Feb 2016 10:40:53 +0000 (10:40 +0000)]

Merge "Import translations. DO NOT MERGE" into mnc-dr1.5-dev am: 9561ec3353  -s ours am: 6dfc27dac9  -s ours
am: e521419909  -s ours

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

commit | commitdiff | tree

Geoff Mendal [Wed, 3 Feb 2016 10:40:41 +0000 (10:40 +0000)]

Merge "Import translations. DO NOT MERGE" into mnc-dr1.5-dev am: 091513d6e8  -s ours
am: a0159dfc08  -s ours

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

commit | commitdiff | tree

Geoff Mendal [Wed, 3 Feb 2016 10:39:25 +0000 (10:39 +0000)]

Merge "Import translations. DO NOT MERGE" into mnc-dr1.5-dev am: 6f63adbe93  -s ours am: 79d8d1a13f  -s ours
am: 84f4b8a84a  -s ours

* commit '84f4b8a84a00339d2a2f0561e07d475401bc2915':
  Import translations. DO NOT MERGE

commit | commitdiff | tree

Geoff Mendal [Wed, 3 Feb 2016 10:38:09 +0000 (10:38 +0000)]

Merge "Import translations. DO NOT MERGE" into mnc-dr1.5-dev am: 1974686db5  -s ours
am: a85507482f  -s ours

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

commit | commitdiff | tree

Geoff Mendal [Wed, 3 Feb 2016 10:37:51 +0000 (10:37 +0000)]

Merge "Import translations. DO NOT MERGE" into mnc-dr1.5-dev am: 26b12b719d  -s ours am: c2ca962f06  -s ours
am: 854926febb  -s ours

* commit '854926febbc7f78a161adc21db6dd4996d34aa7d':
  Import translations. DO NOT MERGE

commit | commitdiff | tree

Geoff Mendal [Wed, 3 Feb 2016 10:37:05 +0000 (10:37 +0000)]

Merge "Import translations. DO NOT MERGE" into mnc-dr1.5-dev am: 063357312c  -s ours
am: 4d79bcf457  -s ours

* commit '4d79bcf457141b91417ae2033ab6b3313665ca8d':
  Import translations. DO NOT MERGE

commit | commitdiff | tree

Geoff Mendal [Wed, 3 Feb 2016 10:36:01 +0000 (10:36 +0000)]

Merge "Import translations. DO NOT MERGE" into mnc-dr1.5-dev am: 3122eedcd3  -s ours
am: aa7e0396c9  -s ours

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

commit | commitdiff | tree

Geoff Mendal [Wed, 3 Feb 2016 10:35:02 +0000 (10:35 +0000)]

Merge "Import translations. DO NOT MERGE" into mnc-dr1.5-dev am: b697973e2a  -s ours
am: 0291cf7113  -s ours

* commit '0291cf7113023c58a02110e8a4f7e191d37510ca':
  Import translations. DO NOT MERGE

commit | commitdiff | tree

Geoff Mendal [Wed, 3 Feb 2016 10:33:55 +0000 (10:33 +0000)]

Merge "Import translations. DO NOT MERGE" into mnc-dr1.5-dev am: 21e0a012d8  -s ours
am: 008f7facbe  -s ours

* commit '008f7facbed95e67cf45ff81013b83e7f44c54aa':
  Import translations. DO NOT MERGE

commit | commitdiff | tree

Geoff Mendal [Wed, 3 Feb 2016 10:32:50 +0000 (10:32 +0000)]

Merge "Import translations. DO NOT MERGE" into mnc-dr1.5-dev am: 497300badb  -s ours
am: abaebda3ff  -s ours

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

commit | commitdiff | tree

Geoff Mendal [Wed, 3 Feb 2016 10:31:45 +0000 (10:31 +0000)]

Merge "Import translations. DO NOT MERGE" into mnc-dr1.5-dev am: 9561ec3353  -s ours
am: 6dfc27dac9  -s ours

* commit '6dfc27dac9eadfa86c811cbbff0e08887d81769d':
  Import translations. DO NOT MERGE

commit | commitdiff | tree

Geoff Mendal [Wed, 3 Feb 2016 10:30:38 +0000 (10:30 +0000)]

Merge "Import translations. DO NOT MERGE" into mnc-dr1.5-dev am: 6f63adbe93  -s ours
am: 79d8d1a13f  -s ours

* commit '79d8d1a13f719edb5238972ab6123643cf911146':
  Import translations. DO NOT MERGE

commit | commitdiff | tree

Geoff Mendal [Wed, 3 Feb 2016 10:29:24 +0000 (10:29 +0000)]

Merge "Import translations. DO NOT MERGE" into mnc-dr1.5-dev am: 26b12b719d  -s ours
am: c2ca962f06  -s ours

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

commit | commitdiff | tree

Calin Juravle [Wed, 3 Feb 2016 10:03:24 +0000 (10:03 +0000)]

Merge "Enable profile support for apps with shared runtime"

commit | commitdiff | tree

Erik Kline [Wed, 3 Feb 2016 08:44:13 +0000 (08:44 +0000)]

Move DHCPv4 mechanics into IpManager
am: 8afa558c52

* commit '8afa558c527b4be4e0e489b17485577e23148636':
Move DHCPv4 mechanics into IpManager

commit | commitdiff | tree

Erik Kline [Tue, 2 Feb 2016 04:06:21 +0000 (13:06 +0900)]

Move DHCPv4 mechanics into IpManager

Bug: 17345682
Change-Id: I2c3d9d665ff3c38f02084c0cf86cd76035e7b0aa

commit | commitdiff | tree

Tomasz Mikolajewski [Wed, 3 Feb 2016 07:53:21 +0000 (16:53 +0900)]

Rename confusing animation naming.

The naming was ANIM_UP, ANIM_DOWN, but the animations were from right and
left. Since right and left are flipped for RTL, this CL renames them
with direction agnostic ANIM_ENTER and ANIM_LEAVE.

Change-Id: I8de1603b1baaef3d4ba8fbd593f5e53143698dff

commit | commitdiff | tree

Tomasz Mikolajewski [Wed, 3 Feb 2016 08:05:18 +0000 (08:05 +0000)]

Merge "Fix directory/root opening animations when launching DocumentsUI."

commit | commitdiff | tree

Tomasz Mikolajewski [Wed, 3 Feb 2016 06:49:58 +0000 (15:49 +0900)]

Fix directory/root opening animations when launching DocumentsUI.

We should only show an opening animation, when back button would get us
back.

Change-Id: I9b3f43592a87c1c13944d382b7201b5727fd08ee

commit | commitdiff | tree

Tomasz Mikolajewski [Wed, 3 Feb 2016 07:02:31 +0000 (07:02 +0000)]

Merge "Do not load Download roots multiple times."

commit | commitdiff | tree

Daichi Hirono [Wed, 3 Feb 2016 06:54:44 +0000 (06:54 +0000)]

Merge "Move logic to skip single storage."

commit | commitdiff | tree

Daichi Hirono [Tue, 2 Feb 2016 07:35:03 +0000 (16:35 +0900)]

Move logic to skip single storage.

The tree structure of MTP model looks like /device/storage/objects. But
almost all MTP device has only single storage, so it's redundant to show
a single storage as a child of device in UI.

MtpDocumentsProvider has a special logic to skip single storage, and
shows storage's object as a children of device in such case. Previously
the logic was applied when MtpDocumentsProvider returned a root
list. The provider returns a storage as a Documents.Root, instead of
device if the device has only one storage.

However the number of root cannot be obtain for closed device. Thus the
previous logic did not work for closed devices that have a single
storage. The CL moves the logic from queryRoot to
queryChildDocuments. Now MtpDocumentsProvider always returns a device as
root, then it returns storage's objects as the device's children, where
we has already opened the device.

BUG=26481574

Change-Id: I25af0fc220410e321a378d67f226798ec4bba19c

commit | commitdiff | tree

Tomasz Mikolajewski [Wed, 3 Feb 2016 06:18:22 +0000 (15:18 +0900)]

Do not load Download roots multiple times.

Change-Id: I26685db7fc7a4fb98db695ba6e0e351974eadd6c

commit | commitdiff | tree

Tomasz Mikolajewski [Mon, 1 Feb 2016 04:01:34 +0000 (13:01 +0900)]

Hide DocumentsContract.FLAG_ARCHIVE.

The API is internal for now.

Bug: 20176812
Change-Id: I9f2c796b144906fdf4a838240c85d26f02dbe175

commit | commitdiff | tree

Wale Ogunwale [Wed, 3 Feb 2016 03:25:59 +0000 (03:25 +0000)]

Merge "Window resize reporting improvement when docked stack is created"

commit | commitdiff | tree

Tomasz Mikolajewski [Wed, 3 Feb 2016 03:20:11 +0000 (03:20 +0000)]

Merge "Open zip files nicely from the Download app with Files app."

frameworks/base

RSS Atom

About OSDN

Find Software

Develop Software

Help