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

220272 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Andrei Stingaceanu
fa7834379f Merge "Fix toolbar flickering in ExtractedMode when longpressing." into mnc-dr-dev am: ee4ab0a55b am: 24fc647e70 am: 509a74972a 
am: fe622345b0

* commit 'fe622345b02656b9e049dde9936987f38984e97d':
  Fix toolbar flickering in ExtractedMode when longpressing.
 2015-10-21 17:11:52 +00:00
Andrei Stingaceanu
f1755d5875 Merge branch \'mnc-dr-dev-plus-aosp\' of /usr/local/google/game/mirror/googleplex-android_googlesource_com/platform/frameworks/base into mnc-dr-dev-plus-aosp 
am: da113efda2

* commit 'da113efda21ae5f23713db585262e796c5e2dd3b':
 2015-10-21 17:11:16 +00:00
Geoff Mendal
61b81ab942 Merge "Import translations. DO NOT MERGE" into cw-e-dev am: b8f70e10ef -s ours 
am: bd0cfcf867  -s ours

* commit 'bd0cfcf8675ae1fc4d960aadced501cd59f04107':
  Import translations. DO NOT MERGE
 2015-10-21 17:11:14 +00:00
Andrei Stingaceanu
dd3d9d88b4 Merge "Fix toolbar flickering in ExtractedMode when longpressing." into mnc-dr-dev am: ee4ab0a55b am: 24fc647e70 am: 509a74972a 
am: fe622345b0

* commit 'fe622345b02656b9e049dde9936987f38984e97d':
  Fix toolbar flickering in ExtractedMode when longpressing.
 2015-10-21 17:09:33 +00:00
Michael Wright
ea84cff8fd Add new Cut / Copy / Paste keys. 
Bug: 25120948
Change-Id: I401792b8c88584d8c389fa356186ccea943d5dd4
 2015-10-21 18:08:30 +01:00
Paul Lawrence
ae79b87393 Merge branch \'mnc-dr-dev-plus-aosp\' of /usr/local/google/game/mirror/googleplex-android_googlesource_com/platform/frameworks/base into mnc-dr-dev-plus-aosp 
am: 175cef67ec

* commit '175cef67ec887b5f4d33a7494459c80b9a0e0895':
 2015-10-21 17:07:53 +00:00
Geoff Mendal
ea6ea27ba6 Merge "Import translations. DO NOT MERGE" into cw-e-dev 
am: a73a642bfe  -s ours

* commit 'a73a642bfedd0a2fe0854329081354869bf70039':
  Import translations. DO NOT MERGE
 2015-10-21 17:07:21 +00:00
Paul Lawrence
80f8a2d1ce Merge branch \'mnc-ub-dev\' of /usr/local/google/game/mirror/googleplex-android_googlesource_com/platform/frameworks/base into mnc-ub-dev am: 2a75ecbe9d 
am: 30866628b8

* commit '30866628b82b93824c08219eb4a43af26a0291df':
 2015-10-21 17:06:35 +00:00
Geoff Mendal
1622b4459a Merge branch 'mnc-ub-dev' of /usr/local/google/game/mirror/googleplex-android_googlesource_com/platform/frameworks/base into mnc-ub-dev 2015-10-21 17:06:27 +00:00
Geoff Mendal
c6fe063ddf Merge branch \'cw-e-dev\' of /usr/local/google/game/mirror/googleplex-android_googlesource_com/platform/frameworks/base into cw-e-dev 
am: 84ab40cab2

* commit '84ab40cab243ac76a83c3d15478699998ba68236':
  Import translations. DO NOT MERGE
 2015-10-21 17:06:03 +00:00
Geoff Mendal
899d016e89 Merge branch 'mnc-ub-dev' of /usr/local/google/game/mirror/googleplex-android_googlesource_com/platform/frameworks/base into mnc-ub-dev 2015-10-21 17:05:16 +00:00
Paul Lawrence
9991e5f382 Merge branch \'cw-e-dev\' of /usr/local/google/game/mirror/googleplex-android_googlesource_com/platform/frameworks/base into cw-e-dev am: 8deb694779 am: 146ef50d5b 
am: dc4c11ff9f

* commit 'dc4c11ff9f9c108e80163ee7ed45bb42db855942':
 2015-10-21 17:05:11 +00:00
Geoff Mendal
96b250771e Merge "Import translations. DO NOT MERGE" into mnc-dr-dev am: 8ba1cdd946 -s ours 
am: 762ce0fc44  -s ours

* commit '762ce0fc448ebd41225ef0600fb5d258de434de7':
  Import translations. DO NOT MERGE
 2015-10-21 17:04:43 +00:00
Geoff Mendal
b9315af10d Merge branch \'cw-e-dev\' of /usr/local/google/game/mirror/googleplex-android_googlesource_com/platform/frameworks/base into cw-e-dev 
am: 84ab40cab2

* commit '84ab40cab243ac76a83c3d15478699998ba68236':
  Import translations. DO NOT MERGE
 2015-10-21 17:04:18 +00:00
Geoff Mendal
fc7130c913 Merge branch 'mnc-ub-dev' of /usr/local/google/game/mirror/googleplex-android_googlesource_com/platform/frameworks/base into mnc-ub-dev 2015-10-21 17:04:07 +00:00
Geoff Mendal
be8fe13d12 Import translations. DO NOT MERGE 
Change-Id: Ie4b7d4378ff46c26fa5da8449fca10274beef157
Auto-generated-cl: translation import
 2015-10-21 10:03:57 -07:00
Paul Lawrence
d76d1d25cb Merge "Don\'t include password on default encryption command" into mnc-dr-dev am: 68521fd7ce am: 29c5fb2646 am: eab4352d9b 
am: 74a3281e9c

* commit '74a3281e9c7ec37ffcc826ee7ac8cdd4b57dfab8':
  Don't include password on default encryption command
 2015-10-21 17:03:46 +00:00
Geoff Mendal
38d9cb21b3 Merge "Import translations. DO NOT MERGE" into cw-e-dev 
am: 7f174ff665  -s ours

* commit '7f174ff6653154c4f1c3b184c402e92a4f53b7dd':
  Import translations. DO NOT MERGE
 2015-10-21 17:03:40 +00:00
Geoff Mendal
a948cfe393 Merge "Import translations. DO NOT MERGE" into mnc-dr-dev am: 8ba1cdd946 -s ours 
am: 762ce0fc44  -s ours

* commit '762ce0fc448ebd41225ef0600fb5d258de434de7':
  Import translations. DO NOT MERGE
 2015-10-21 17:02:59 +00:00
Geoff Mendal
9db863761e Merge branch 'mnc-ub-dev' of /usr/local/google/game/mirror/googleplex-android_googlesource_com/platform/frameworks/base into mnc-ub-dev 2015-10-21 17:02:06 +00:00
Geoff Mendal
ad7f07c95e Import translations. DO NOT MERGE am: fde4111eea -s ours am: c37fe84736 -s ours am: 03c5ec76d6 -s ours 
am: e4936c9fed  -s ours

* commit 'e4936c9fed2c3dc259df76e763f2539be9faf380':
  Import translations. DO NOT MERGE
 2015-10-21 17:01:45 +00:00
Geoff Mendal
7829bc5ad4 Merge "Import translations. DO NOT MERGE" into cw-e-dev 
am: 55bc169d50  -s ours

* commit '55bc169d5094ef1faf1cdca6c9952f29c7189d9d':
  Import translations. DO NOT MERGE
 2015-10-21 17:01:41 +00:00
Geoff Mendal
f7e27a2dc1 Merge "Import translations. DO NOT MERGE" into cw-e-dev 
am: 7f174ff665  -s ours

* commit '7f174ff6653154c4f1c3b184c402e92a4f53b7dd':
  Import translations. DO NOT MERGE
 2015-10-21 17:00:53 +00:00
Geoff Mendal
5bb1fa58d7 Import translations. DO NOT MERGE 
Change-Id: I6766fce7213a69ce3e08ce5de869714b89e62adf
Auto-generated-cl: translation import
 2015-10-21 10:00:28 -07:00
Geoff Mendal
c49ecff854 Merge "Import translations. DO NOT MERGE" into cw-e-dev 
am: 55bc169d50  -s ours

* commit '55bc169d5094ef1faf1cdca6c9952f29c7189d9d':
  Import translations. DO NOT MERGE
 2015-10-21 16:58:59 +00:00
Geoff Mendal
9aa4c094c1 Merge "Import translations. DO NOT MERGE" into cw-e-dev 
am: 721249f22b  -s ours

* commit '721249f22b11b45ff26045cc7c718334a12b7400':
  Import translations. DO NOT MERGE
 2015-10-21 16:57:46 +00:00
Geoff Mendal
a400a1236c Import translations. DO NOT MERGE 
Change-Id: If77b4f540cb80ac3d88c56d043069c4fd890b81a
Auto-generated-cl: translation import
 2015-10-21 09:56:57 -07:00
Andrei Stingaceanu
da113efda2 Merge branch 'mnc-dr-dev-plus-aosp' of /usr/local/google/game/mirror/googleplex-android_googlesource_com/platform/frameworks/base into mnc-dr-dev-plus-aosp 2015-10-21 16:56:12 +00:00
Geoff Mendal
4c96a0331c Merge "Import translations. DO NOT MERGE" into cw-e-dev 
am: 04733e23a3  -s ours

* commit '04733e23a316cfec96e195d05235e57b13439454':
  Import translations. DO NOT MERGE
 2015-10-21 16:55:59 +00:00
Andrei Stingaceanu
fe622345b0 Merge "Fix toolbar flickering in ExtractedMode when longpressing." into mnc-dr-dev am: ee4ab0a55b am: 24fc647e70 
am: 509a74972a

* commit '509a74972af13c845a67ad9edddd8e413cc7884a':
  Fix toolbar flickering in ExtractedMode when longpressing.
 2015-10-21 16:55:37 +00:00
Andrei Stingaceanu
0b7d715e2c Merge branch 'mnc-dr-dev-plus-aosp' of /usr/local/google/game/mirror/googleplex-android_googlesource_com/platform/frameworks/base into mnc-dr-dev-plus-aosp 2015-10-21 16:55:11 +00:00
Andrei Stingaceanu
ee417ca5c3 Merge "Fix toolbar flickering in ExtractedMode when longpressing." into mnc-dr-dev am: ee4ab0a55b am: 24fc647e70 
am: 509a74972a

* commit '509a74972af13c845a67ad9edddd8e413cc7884a':
  Fix toolbar flickering in ExtractedMode when longpressing.
 2015-10-21 16:54:43 +00:00
Geoff Mendal
a9af8921f1 Merge "Import translations. DO NOT MERGE" into cw-e-dev 
am: cd000a2228  -s ours

* commit 'cd000a22282cea343b9265ab63b4e316fca64925':
  Import translations. DO NOT MERGE
 2015-10-21 16:54:33 +00:00
Paul Lawrence
175cef67ec Merge branch 'mnc-dr-dev-plus-aosp' of /usr/local/google/game/mirror/googleplex-android_googlesource_com/platform/frameworks/base into mnc-dr-dev-plus-aosp 2015-10-21 16:53:53 +00:00
Paul Lawrence
30866628b8 Merge branch \'mnc-ub-dev\' of /usr/local/google/game/mirror/googleplex-android_googlesource_com/platform/frameworks/base into mnc-ub-dev 
am: 2a75ecbe9d

* commit '2a75ecbe9d09eee73a0e11511a8e49e14542ca28':
 2015-10-21 16:53:22 +00:00
Geoff Mendal
bd0cfcf867 Merge "Import translations. DO NOT MERGE" into cw-e-dev 
am: b8f70e10ef  -s ours

* commit 'b8f70e10efc2199f383611e3d82f2f1d721d53fc':
  Import translations. DO NOT MERGE
 2015-10-21 16:53:03 +00:00
Paul Lawrence
e1d95ccf5c Merge branch \'mnc-ub-dev\' of /usr/local/google/game/mirror/googleplex-android_googlesource_com/platform/frameworks/base into mnc-ub-dev 
am: 2a75ecbe9d

* commit '2a75ecbe9d09eee73a0e11511a8e49e14542ca28':
 2015-10-21 16:51:56 +00:00
Geoff Mendal
a73a642bfe Merge "Import translations. DO NOT MERGE" into cw-e-dev 2015-10-21 16:51:34 +00:00
Paul Lawrence
dc4c11ff9f Merge branch \'cw-e-dev\' of /usr/local/google/game/mirror/googleplex-android_googlesource_com/platform/frameworks/base into cw-e-dev am: 8deb694779 
am: 146ef50d5b

* commit '146ef50d5baa8ce427c13cfbbcdfb59a50c91a9f':
 2015-10-21 16:50:40 +00:00
Paul Lawrence
74a3281e9c Merge "Don\'t include password on default encryption command" into mnc-dr-dev am: 68521fd7ce am: 29c5fb2646 
am: eab4352d9b

* commit 'eab4352d9bd945c7fa375c6f28972900f0b99671':
  Don't include password on default encryption command
 2015-10-21 16:49:24 +00:00
Geoff Mendal
b4dc6a35d3 Import translations. DO NOT MERGE 
Change-Id: Ie451c3262cd6073b9cbf71ab8d0bc38ad212b0c4
Auto-generated-cl: translation import
 2015-10-21 09:48:43 -07:00
Geoff Mendal
e4936c9fed Import translations. DO NOT MERGE am: fde4111eea -s ours am: c37fe84736 -s ours 
am: 03c5ec76d6  -s ours

* commit '03c5ec76d6c90ac4e840e852c1ef6fc41c4ad67a':
  Import translations. DO NOT MERGE
 2015-10-21 16:47:55 +00:00
Geoff Mendal
84ab40cab2 Merge branch 'cw-e-dev' of /usr/local/google/game/mirror/googleplex-android_googlesource_com/platform/frameworks/base into cw-e-dev 2015-10-21 16:47:40 +00:00
Wale Ogunwale
b3ad483f45 Merge "Ensure state transition of paused activity." am: c2b9c5388a am: 11695e8081 
am: 8d16a3ddea

* commit '8d16a3ddeac89c426c0965d792df63750a35460e':
  Ensure state transition of paused activity.
 2015-10-21 16:47:18 +00:00
Geoff Mendal
762ce0fc44 Merge "Import translations. DO NOT MERGE" into mnc-dr-dev 
am: 8ba1cdd946  -s ours

* commit '8ba1cdd9464b88375755e1976e4ee0f5620ff5be':
  Import translations. DO NOT MERGE
 2015-10-21 16:47:13 +00:00
Geoff Mendal
88f7134584 Merge "Import translations. DO NOT MERGE" into cw-e-dev 2015-10-21 16:45:48 +00:00
Geoff Mendal
7e1d841d63 Import translations. DO NOT MERGE 
Change-Id: Ib804ad4db26e8029d8c55ccda9046273baf93de3
Auto-generated-cl: translation import
 2015-10-21 09:45:23 -07:00
Geoff Mendal
7f174ff665 Merge "Import translations. DO NOT MERGE" into cw-e-dev 2015-10-21 16:44:33 +00:00
Geoff Mendal
55bc169d50 Merge "Import translations. DO NOT MERGE" into cw-e-dev 2015-10-21 16:44:08 +00:00
Geoff Mendal
721249f22b Merge "Import translations. DO NOT MERGE" into cw-e-dev 2015-10-21 16:43:45 +00:00