The Android Open Source Project
349564e924
am c8c23821: am 1a37da3b: Reconcile with jb-mr1-release - do not merge
...
* commit 'c8c238212ded8d4e774ad7cdc06de58626fedce2':
2012-11-08 15:42:14 -08:00
The Android Open Source Project
fee1840f3d
am 15d91c6e: Reconcile with jb-mr1-release - do not merge
...
* commit '15d91c6e825d6529cf03478410c3ff92d8879b53':
2012-11-08 14:22:21 -08:00
The Android Open Source Project
15d91c6e82
Reconcile with jb-mr1-release - do not merge
...
Change-Id: Iaa26de823282e7aba1ec495c04de885dd5267982
2012-11-08 14:19:27 -08:00
The Android Automerger
79bf08d246
merge in jb-mr1-release history after reset to jb-mr1-dev
2012-11-08 13:54:19 -08:00
Michael Jurka
8bb938dcc9
am ffffbf40: am d9609fc0: Fix jank after adding a widget for lock screen
...
* commit 'ffffbf400b528262ffee791a0c607a6d2affed72':
Fix jank after adding a widget for lock screen
2012-11-08 13:15:32 -08:00
Michael Jurka
80eed80e3b
am caf13b22: am a108d9fc: Final tweaks to visuals of widget picker
...
* commit 'caf13b22c072dc48ace4c53065c78fd0dac131ef':
Final tweaks to visuals of widget picker
2012-11-08 13:15:31 -08:00
Michael Jurka
ffffbf400b
am d9609fc0: Fix jank after adding a widget for lock screen
...
* commit 'd9609fc0a2be07e9100dbb83f3549dad1d9b3c51':
Fix jank after adding a widget for lock screen
2012-11-08 13:10:47 -08:00
Michael Jurka
caf13b22c0
am a108d9fc: Final tweaks to visuals of widget picker
...
* commit 'a108d9fc0edd3b4f741fae595e35a246fbc700ff':
Final tweaks to visuals of widget picker
2012-11-08 13:10:46 -08:00
Baligh Uddin
62f8e61bdb
am 8c062ff5: (-s ours) am c3876ebb: am f654e3bb: am 9d41995b: Merge "Import translations. DO NOT MERGE" into jb-mr1-lockscreen-dev
...
* commit '8c062ff5c4a167084192e6773a95449781d6f2dc':
Import translations. DO NOT MERGE
2012-11-08 06:32:03 -08:00
Michael Jurka
8ec346c446
am 06dfc8ae: am 4ee20f36: am 4e773619: am f5336fd1: Allowing rotation while adding lockscreen widgets
...
* commit '06dfc8aeb604158a177caddd3194e68ecb38373d':
Allowing rotation while adding lockscreen widgets
2012-11-08 06:32:01 -08:00
Michael Jurka
6602f95990
am dae2b315: am f31af7d1: am ef2b86b4: am a487bca4: Updated layouts for keyguard widget picker
...
* commit 'dae2b315fcbd8961ba0396234eb13baa99464f0b':
Updated layouts for keyguard widget picker
2012-11-08 06:32:00 -08:00
Michael Jurka
b59c43f862
am e2d65f1d: am 686e8287: am 02dd6c42: am c0fb8a39: Merge "Updated assets." into jb-mr1-lockscreen-dev
...
* commit 'e2d65f1d0090be684d6eabfacbbbedeb0685021b':
Updated assets.
2012-11-08 06:31:59 -08:00
Michael Jurka
b7c915088a
am 5bd9c4d6: am 504bd1ee: am ddf272da: am 5c5eff45: Pass argument to lock screen to show widget after adding it
...
* commit '5bd9c4d6c7332e2a0dab0bfc97114f5521862bdd':
Pass argument to lock screen to show widget after adding it
2012-11-08 06:31:57 -08:00
Michael Jurka
0abb4e5730
am 09e9bdd6: am bd533781: am 2419d2ed: am 4119788b: Add widget previews to the key guard widget picker
...
* commit '09e9bdd64d3c720ec9d6d3db75b8dedcd31a6157':
Add widget previews to the key guard widget picker
2012-11-08 06:31:56 -08:00
Baligh Uddin
e77c0b753a
am 470d258e: (-s ours) am cbc0d030: Merge "Import translations. DO NOT MERGE" into jb-mr1-aah-dev
...
* commit '470d258efd29264e893891152aa2992dcffc9711':
Import translations. DO NOT MERGE
2012-11-08 06:31:55 -08:00
Baligh Uddin
8c062ff5c4
am c3876ebb: am f654e3bb: am 9d41995b: Merge "Import translations. DO NOT MERGE" into jb-mr1-lockscreen-dev
...
* commit 'c3876ebb450bd8fbba14d03bdf278243dc825c2d':
Import translations. DO NOT MERGE
2012-11-08 06:27:27 -08:00
Michael Jurka
06dfc8aeb6
am 4ee20f36: am 4e773619: am f5336fd1: Allowing rotation while adding lockscreen widgets
...
* commit '4ee20f36fa71fc0ecd0d1cd3c46d271e7096376d':
Allowing rotation while adding lockscreen widgets
2012-11-08 06:27:26 -08:00
Michael Jurka
dae2b315fc
am f31af7d1: am ef2b86b4: am a487bca4: Updated layouts for keyguard widget picker
...
* commit 'f31af7d14f88ed6cf2c5c6b6067cc9436d98b110':
Updated layouts for keyguard widget picker
2012-11-08 06:27:25 -08:00
Michael Jurka
e2d65f1d00
am 686e8287: am 02dd6c42: am c0fb8a39: Merge "Updated assets." into jb-mr1-lockscreen-dev
...
* commit '686e8287a0b3799aa75258676fc7546691e1a4df':
Updated assets.
2012-11-08 06:27:24 -08:00
Michael Jurka
5bd9c4d6c7
am 504bd1ee: am ddf272da: am 5c5eff45: Pass argument to lock screen to show widget after adding it
...
* commit '504bd1eede2d96260b90a9bdf93d719851605642':
Pass argument to lock screen to show widget after adding it
2012-11-08 06:27:23 -08:00
Michael Jurka
09e9bdd64d
am bd533781: am 2419d2ed: am 4119788b: Add widget previews to the key guard widget picker
...
* commit 'bd5337813f73de3a218ca924163c1a48ef64ff6c':
Add widget previews to the key guard widget picker
2012-11-08 06:27:21 -08:00
Baligh Uddin
470d258efd
am cbc0d030: Merge "Import translations. DO NOT MERGE" into jb-mr1-aah-dev
...
* commit 'cbc0d03093710961bd9abaf0e0f076a2da08ff7d':
Import translations. DO NOT MERGE
2012-11-08 06:26:53 -08:00
The Android Open Source Project
6fafc0e1a6
am 12fde830: (-s ours) am a60f3ae7: am 5a051a7f: Reconcile with jb-mr1-release - do not merge
...
* commit '12fde8304f98aa4a55764c1a4cb749fd775b27e5':
2012-11-08 06:17:44 -08:00
The Android Open Source Project
12fde8304f
am a60f3ae7: am 5a051a7f: Reconcile with jb-mr1-release - do not merge
...
* commit 'a60f3ae723844f72cf81ee442b3a9babf793f731':
2012-11-08 06:12:41 -08:00
Baligh Uddin
90ef462ca7
am 09256980: am c74ef2f2: am 7d6a0f9c: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
...
* commit '09256980960cd5de7633f3a0f69cef2a676a6812':
2012-11-07 18:34:44 -08:00
Baligh Uddin
0925698096
am c74ef2f2: am 7d6a0f9c: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
...
* commit 'c74ef2f28b1b095ecb3dea78ff8d277daec84f58':
2012-11-07 18:29:07 -08:00
Michael Jurka
d9609fc0a2
Fix jank after adding a widget for lock screen
...
After adding a widget, you see a black flash, but
there's also a small sliver of wallpaper left
showing. This change covers up that small bit
of wallpaper.
Bug: 7381803
2012-11-07 16:54:46 -08:00
Evan Charlton
673130bbf8
Use plurals for the developer steps countdown
...
When counting down how many steps are left before the user becomes a
developer, use plurals so that "steps" becomes "step" correctly.
Change-Id: I5dbe2c229c9e6ed0c45aaae8c303b23efc76f75d
2012-11-07 16:18:17 -08:00
Michael Jurka
a108d9fc0e
Final tweaks to visuals of widget picker
2012-11-07 15:32:23 -08:00
Baligh Uddin
c25bfc07af
am 4f1a0932: am 7d6a0f9c: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
...
* commit '4f1a09320321cc758df1d33358e6353d3614bdb0':
Import translations. DO NOT MERGE
2012-11-07 11:53:29 -08:00
Baligh Uddin
c74ef2f28b
am 7d6a0f9c: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
...
* commit '7d6a0f9c8b9494e3b735ea98836ff3b826e11c8e':
Import translations. DO NOT MERGE
2012-11-07 11:51:32 -08:00
Baligh Uddin
4f1a093203
am 7d6a0f9c: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
...
* commit '7d6a0f9c8b9494e3b735ea98836ff3b826e11c8e':
Import translations. DO NOT MERGE
2012-11-07 11:50:53 -08:00
Baligh Uddin
7d6a0f9c8b
Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
2012-11-07 11:49:24 -08:00
The Android Open Source Project
c8c238212d
am 1a37da3b: Reconcile with jb-mr1-release - do not merge
...
* commit '1a37da3bf44546f41734fd7ffdac066a256ea271':
2012-11-07 11:37:20 -08:00
The Android Open Source Project
1a37da3bf4
Reconcile with jb-mr1-release - do not merge
...
Change-Id: I0c96fcfe474c0536ddfaaea7705b4956df0e0f43
2012-11-07 11:35:14 -08:00
The Android Automerger
01785cff5f
merge in jb-mr1-release history after reset to jb-mr1-dev
2012-11-07 11:18:19 -08:00
Baligh Uddin
c3876ebb45
am f654e3bb: am 9d41995b: Merge "Import translations. DO NOT MERGE" into jb-mr1-lockscreen-dev
...
* commit 'f654e3bb5b340360690c45b88442d9bf454fa44c':
Import translations. DO NOT MERGE
2012-11-07 11:14:08 -08:00
Michael Jurka
4ee20f36fa
am 4e773619: am f5336fd1: Allowing rotation while adding lockscreen widgets
...
* commit '4e7736193118373836c6fd558c4142972d6a74e2':
Allowing rotation while adding lockscreen widgets
2012-11-07 11:14:07 -08:00
Michael Jurka
f31af7d14f
am ef2b86b4: am a487bca4: Updated layouts for keyguard widget picker
...
* commit 'ef2b86b40a207b21c7f6b056552a44278d0533f1':
Updated layouts for keyguard widget picker
2012-11-07 11:14:06 -08:00
Michael Jurka
686e8287a0
am 02dd6c42: am c0fb8a39: Merge "Updated assets." into jb-mr1-lockscreen-dev
...
* commit '02dd6c423c362a2975cd2cb33bf98355c3083647':
Updated assets.
2012-11-07 11:14:05 -08:00
Michael Jurka
504bd1eede
am ddf272da: am 5c5eff45: Pass argument to lock screen to show widget after adding it
...
* commit 'ddf272dae119191a5314a8ac76edb53469ed5bec':
Pass argument to lock screen to show widget after adding it
2012-11-07 11:14:03 -08:00
Michael Jurka
bd5337813f
am 2419d2ed: am 4119788b: Add widget previews to the key guard widget picker
...
* commit '2419d2ed3c20261edf18761b87a8bd7b7713171e':
Add widget previews to the key guard widget picker
2012-11-07 11:14:02 -08:00
Baligh Uddin
f654e3bb5b
am 9d41995b: Merge "Import translations. DO NOT MERGE" into jb-mr1-lockscreen-dev
...
* commit '9d41995bd1f158b852b6a12d73390535690b8b7e':
Import translations. DO NOT MERGE
2012-11-07 11:11:53 -08:00
Michael Jurka
4e77361931
am f5336fd1: Allowing rotation while adding lockscreen widgets
...
* commit 'f5336fd114e557fce06197041aab70217308fe90':
Allowing rotation while adding lockscreen widgets
2012-11-07 11:11:51 -08:00
Michael Jurka
ef2b86b40a
am a487bca4: Updated layouts for keyguard widget picker
...
* commit 'a487bca4700a9dbd5d5d72913d0265ae86815edf':
Updated layouts for keyguard widget picker
2012-11-07 11:11:50 -08:00
Michael Jurka
02dd6c423c
am c0fb8a39: Merge "Updated assets." into jb-mr1-lockscreen-dev
...
* commit 'c0fb8a399be0b3e4b365682c681ff24264bbef14':
Updated assets.
2012-11-07 11:11:49 -08:00
Michael Jurka
ddf272dae1
am 5c5eff45: Pass argument to lock screen to show widget after adding it
...
* commit '5c5eff45e97a2bb1b55befb87eb535a438a7bbf8':
Pass argument to lock screen to show widget after adding it
2012-11-07 11:11:48 -08:00
Michael Jurka
2419d2ed3c
am 4119788b: Add widget previews to the key guard widget picker
...
* commit '4119788b1be5d9b51e3c5cfe4e32f2aacc5a2f8f':
Add widget previews to the key guard widget picker
2012-11-07 11:11:47 -08:00
Baligh Uddin
2958debb37
Merge "Import translations. DO NOT MERGE"
2012-11-07 10:03:39 -08:00
Baligh Uddin
9d41995bd1
Merge "Import translations. DO NOT MERGE" into jb-mr1-lockscreen-dev
2012-11-07 10:03:26 -08:00
