Baligh Uddin
a03da71ae3
am 10047138: (-s ours) Merge "Import translations. DO NOT MERGE" into ub-now-porkchop am: ab474588ce -s ours am: eb8ce94244 -s ours
...
am: 56985a1867 -s ours
* commit '56985a1867525557fd15a1b74fc768945ebc56c6':
2015-10-20 01:12:33 +00:00
Sunny Goyal
d090146ad8
am c5fb59fb: Fixing loadWorkspace being called multiple times Using right intent when refreshing shortcut icons am: e43f0d646c am: ffe21b3129
...
am: f321db6800
* commit 'f321db6800bbfc1e95f82ca6f01002f7d3e5bf2d':
2015-10-20 01:12:27 +00:00
Sunny Goyal
2550c9f472
am f876301d: UI Fixes am: 501414523e am: 2f22fa892b
...
am: 718278e9f4
* commit '718278e9f4323700267f0a04aeb55b532f6aeeec':
2015-10-20 01:12:23 +00:00
Adam Cohen
9975db3a5e
am d8f6253e: Merge "When ensuring screen exists, make sure it\'s actually referring to a screen, not a rank" into ub-now-porkchop am: cb20616a18 am: 86b4730bb5
...
am: 278d4d2d5a
* commit '278d4d2d5af5abff45633301976e861196bd90ac':
2015-10-20 01:12:17 +00:00
Baligh Uddin
03937ac5d7
am 68207e25: (-s ours) Merge "Import translations. DO NOT MERGE" into ub-now-porkchop am: 6317598a19 -s ours am: bfe4347964 -s ours
...
am: 669ef65afb -s ours
* commit '669ef65afbb3799333b4e961371b920653ec870f':
2015-10-20 01:12:12 +00:00
Baligh Uddin
56985a1867
am 10047138: (-s ours) Merge "Import translations. DO NOT MERGE" into ub-now-porkchop am: ab474588ce -s ours
...
am: eb8ce94244 -s ours
* commit 'eb8ce94244706fd12d41740ad949469a10c5ab43':
2015-10-20 00:54:18 +00:00
Sunny Goyal
f321db6800
am c5fb59fb: Fixing loadWorkspace being called multiple times Using right intent when refreshing shortcut icons am: e43f0d646c
...
am: ffe21b3129
* commit 'ffe21b31295b2195b219372394096253dda64e89':
2015-10-20 00:54:14 +00:00
Sunny Goyal
718278e9f4
am f876301d: UI Fixes am: 501414523e
...
am: 2f22fa892b
* commit '2f22fa892bb4cc40d26353cb8946d2a00a26eac4':
2015-10-20 00:54:08 +00:00
Adam Cohen
278d4d2d5a
am d8f6253e: Merge "When ensuring screen exists, make sure it\'s actually referring to a screen, not a rank" into ub-now-porkchop am: cb20616a18
...
am: 86b4730bb5
* commit '86b4730bb5217268c3abd4444c34b2876a7c3ebc':
2015-10-20 00:54:03 +00:00
Baligh Uddin
669ef65afb
am 68207e25: (-s ours) Merge "Import translations. DO NOT MERGE" into ub-now-porkchop am: 6317598a19 -s ours
...
am: bfe4347964 -s ours
* commit 'bfe43479643fece25c8aeabb64b90ca9d6c028be':
2015-10-20 00:53:58 +00:00
Baligh Uddin
eb8ce94244
am 10047138: (-s ours) Merge "Import translations. DO NOT MERGE" into ub-now-porkchop
...
am: ab474588ce -s ours
* commit 'ab474588ce7d9cddff2b2dc0a2fd91b4ae532e05':
2015-10-20 00:28:25 +00:00
Sunny Goyal
ffe21b3129
am c5fb59fb: Fixing loadWorkspace being called multiple times Using right intent when refreshing shortcut icons
...
am: e43f0d646c
* commit 'e43f0d646c60c6f59333224686725717cdf2ccbc':
2015-10-20 00:28:19 +00:00
Sunny Goyal
2f22fa892b
am f876301d: UI Fixes
...
am: 501414523e
* commit '501414523ef1e3dc394746ea01489a934e826865':
2015-10-20 00:28:14 +00:00
Adam Cohen
86b4730bb5
am d8f6253e: Merge "When ensuring screen exists, make sure it\'s actually referring to a screen, not a rank" into ub-now-porkchop
...
am: cb20616a18
* commit 'cb20616a180de2855cc35e6c1ce8dfb8082ea41c':
2015-10-20 00:28:06 +00:00
Baligh Uddin
bfe4347964
am 68207e25: (-s ours) Merge "Import translations. DO NOT MERGE" into ub-now-porkchop
...
am: 6317598a19 -s ours
* commit '6317598a196ada3f32950c7f4a8d5cfe005acf42':
2015-10-20 00:28:00 +00:00
The Android Automerger
51160caf9c
am aae99eaa: am b2b58c8f: merge in lmp-mr1-sdk-release history after reset to lmp-mr1-ub-dev
...
* commit 'aae99eaa148ad74efbcd1519cc34363823e3c560':
fix build
fix build
2015-03-26 21:19:47 +00:00
The Android Automerger
aae99eaa14
am b2b58c8f: merge in lmp-mr1-sdk-release history after reset to lmp-mr1-ub-dev
...
* commit 'b2b58c8f6cbed5a1290dd4d541157e68e3b29a1b':
fix build
fix build
2015-03-26 21:00:22 +00:00
Geoff Mendal
58afc3547e
am 729ad90f: (-s ours) Import translations. DO NOT MERGE
...
* commit '729ad90fb6c1b5c7c6e79507beb00934fbdd44ea':
Import translations. DO NOT MERGE
2015-02-26 23:14:50 +00:00
Geoff Mendal
729ad90fb6
Import translations. DO NOT MERGE
...
Change-Id: Ibdacd9febbe2e1d8a282af7a856d27fbffb1014c
Auto-generated-cl: translation import
2015-02-26 13:21:32 -08:00
Geoff Mendal
da6e2ddb5b
am 875cdbd2: (-s ours) Import translations. DO NOT MERGE
...
* commit '875cdbd24b1ab3627d9663a49fcb943cdb5b91b4':
Import translations. DO NOT MERGE
2015-02-13 01:14:55 +00:00
Geoff Mendal
875cdbd24b
Import translations. DO NOT MERGE
...
Change-Id: I2287d714cc1f58f409083c256fa4431dc1e4a918
Auto-generated-cl: translation import
2015-02-12 17:08:33 -08:00
The Android Automerger
b2b58c8f6c
merge in lmp-mr1-sdk-release history after reset to lmp-mr1-ub-dev
2015-02-03 09:05:59 -08:00
Ying Wang
4b0f7dd2c0
Fix Android.mk.
...
- You don't need to explicitly specify protobuf library; The library
name has been changed and the build system automatically adds it.
- You can't have a file target $(LOCAL_BUILT_MODULE) depend on phony target
launcher_protoutil_lib.
- "include $(call all-makefiles-under,$(LOCAL_PATH))" must be on the
last line.
(cherry picked from commit 3d74c6632e )
Change-Id: I27d967a57d6a9373da50821af32191614a3c8bc7
2015-02-02 11:39:51 -08:00
Jeff Davidson
123d99f0ad
Update protobuf library from 2.3 to 2.6.
...
The dependency here can be removed because it it automatically added
when LOCAL_PROTOC_OPTIMIZE_TYPE=nano by
build/core/host_java_library_common.mk.
Change-Id: I949d32fb5126f1c05e2a6ed48f6636a4a9b15a48
2015-02-02 10:39:11 -08:00
Brian Carlstrom
dc2e074937
Move from host-libprotobuf-java-2.3.0-nano to current version
...
Change-Id: I87e768fc95738358eddcca9b524d7546ed632e4b
2015-01-31 22:46:55 -08:00
Nick Kralevich
ce0117dc59
fix build
...
Bug: 18040469
Change-Id: I24db4d3f4b7ee10ecf5a2c65035ce112271539fb
2015-01-30 14:24:47 -08:00
Nick Kralevich
6c5b4a9420
fix build
...
Bug: 18040469
Change-Id: I2938c7b950470eeacfb20391f109ae44d95060c7
2015-01-30 14:24:40 -08:00
The Android Automerger
4a6287da0f
merge in ub-now-queens-release history after reset to ub-now-queens
2014-12-09 01:22:44 +00:00
Geoff Mendal
e578ad8d93
Import translations. DO NOT MERGE
...
Change-Id: I5afb7119527734723b3bd4e35e66844b62f74d95
Auto-generated-cl: translation import
2014-12-08 11:16:09 -08:00
Adam Cohen
0250945759
Avoid db exception on L and above
...
Bug 18554839
Change-Id: I43f391b7cc376f697ce7b5b363e8be3aa85814b5
2014-12-04 10:35:52 -08:00
Adam Cohen
2975e34145
am d2285942: (-s ours) Merge "Ignoring specific db exception DO NOT MERGE" into ub-now-porkchop
...
* commit 'd2285942dde8f2633f1d79abc01e598da7925090':
Ignoring specific db exception DO NOT MERGE
2014-12-04 18:17:52 +00:00
Adam Cohen
d2285942dd
Merge "Ignoring specific db exception DO NOT MERGE" into ub-now-porkchop
2014-12-04 18:14:22 +00:00
Winson Chung
18ce985698
Ignoring specific db exception DO NOT MERGE
...
Bug 18554839.
Change-Id: I80f2dd62297eea671f2d129ae22263e72e506ae4
(cherry picked from commit 5f05913f71 )
2014-12-04 10:04:30 -08:00
The Android Automerger
5e21d583c8
merge in ub-now-queens-release history after reset to ub-now-queens
2014-12-04 17:56:30 +00:00
Adam Cohen
e6673dc1fa
am 268b8907: Ensure that FirstFrameAnimatorHelper doesn\'t set play time when animation is complete
...
* commit '268b8907d1f2fcf9775880c69899b3c6fbe85ea3':
Ensure that FirstFrameAnimatorHelper doesn't set play time when animation is complete
2014-12-04 17:34:10 +00:00
Adam Cohen
268b8907d1
Ensure that FirstFrameAnimatorHelper doesn't set play time when animation is complete
...
Bug: 18567716
Change-Id: I656e869b8553d650916c2abe6dc83282c8b6fd65
(cherry picked from commit 5c18b80ed9 )
2014-12-04 17:21:12 +00:00
Geoff Mendal
2f805f0d00
Merge "Import translations. DO NOT MERGE" into ub-now-queens
2014-12-04 05:28:02 +00:00
Geoff Mendal
917a33eb1a
Import translations. DO NOT MERGE
...
Change-Id: If32589149a2b776b668510662360e04aa66ade88
Auto-generated-cl: translation import
2014-12-03 11:01:37 -08:00
Sunny Goyal
f204877999
Fixing wrong package check when adding shortcuts
...
Bug: 18571789,18535867
Change-Id: I2544fa634879846d812b00f8649520400f66d29e
2014-12-03 22:32:46 +05:30
Adam Cohen
5c18b80ed9
Ensure that FirstFrameAnimatorHelper doesn't set play time when animation is complete
...
Bug: 18567716
Change-Id: I656e869b8553d650916c2abe6dc83282c8b6fd65
2014-12-02 15:40:19 -08:00
The Android Automerger
5481aab2d6
merge in ub-now-queens-release history after reset to ub-now-queens
2014-12-02 10:20:40 +00:00
Winson Chung
1c96028f41
Merge "Ignoring specific db exception to workaround Bug. 18554839." into ub-now-queens
2014-12-02 00:30:46 +00:00
Winson Chung
5f05913f71
Ignoring specific db exception to workaround Bug. 18554839.
...
Change-Id: I80f2dd62297eea671f2d129ae22263e72e506ae4
2014-12-01 15:06:47 -08:00
Chris Wren
b02e611d15
Don't try to create an app state instance during restore.
...
Added a static utility function to get the DeviceProfile instead.
Bug: 18504164
Change-Id: Ia510a84f1c195e58acf3bf4d1f6a42c739fdd413
2014-11-24 16:57:54 -05:00
Geoff Mendal
ab6527da41
Import translations. DO NOT MERGE
...
Change-Id: I0d7a075387e2ba2c8b9607620ae1d1197cf5cd99
Auto-generated-cl: translation import
2014-11-24 06:21:53 -08:00
The Android Automerger
c3f29614ba
merge in ub-now-queens-release history after reset to ub-now-queens
2014-11-24 13:28:30 +00:00
Sunny Goyal
3da888d17c
Merge "Disabling auto addition of managed profile shortcuts" into ub-now-queens
2014-11-21 02:10:10 +00:00
Sunny Goyal
2a66bbf3f0
Disabling auto addition of managed profile shortcuts
...
Bug: 16188104
Change-Id: Ib6464c22140df6d60112eb35f5983718b3db6288
2014-11-20 17:02:24 -08:00
Adam Cohen
c254da26a6
Updating default page indicator asset
...
Change-Id: If1be59c8c6590125c2347ba2928f61522f15f959
2014-11-20 15:34:03 -08:00
The Android Automerger
273bfa2f28
merge in ub-now-queens-release history after reset to c8f4e1bc88
2014-11-20 23:03:26 +00:00