OSDN Git Service

android-x86/packages-apps-Trebuchet.git
9 years agoam 52cdcb1e: am 8af8b1c1: am b0e2221f: am 03a526b2: Merge "Stop using a separate...
Michael Jurka [Thu, 23 Oct 2014 17:29:56 +0000 (17:29 +0000)]
am 52cdcb1e: am 8af8b1c1: am b0e2221f: am 03a526b2: Merge "Stop using a separate ImageView for default wallpaper" into jb-ub-now-jetsonic

* commit '52cdcb1e83e11ed3eb8963c4c9c0dfcae07b7d40':

9 years agoam 067b816f: am 6850097f: am 9775c0f3: am a718fc27: Merge "Cleaning some page animati...
Adam Cohen [Thu, 23 Oct 2014 17:29:54 +0000 (17:29 +0000)]
am 067b816f: am 6850097f: am 9775c0f3: am a718fc27: Merge "Cleaning some page animations" into jb-ub-now-jetsonic

* commit '067b816f4988e337011907023f77760ea3d4cd8b':

9 years agoam 3bbca716: am 224ae860: am 87082b39: am 0b5e98f7: am 55585dbc: Fix loading widgets...
Daniel Sandler [Thu, 23 Oct 2014 17:29:51 +0000 (17:29 +0000)]
am 3bbca716: am 224ae860: am 87082b39: am 0b5e98f7: am 55585dbc: Fix loading widgets in <include>d workspaces.

* commit '3bbca7160c69cf5475cd545e8e3978c455d20668':

9 years agoam 214b8869: am eed2cbac: am 3e56fbf0: am 3d7f086f: Merge "Prevent memory leaks comin...
Michael Jurka [Thu, 23 Oct 2014 17:29:48 +0000 (17:29 +0000)]
am 214b8869: am eed2cbac: am 3e56fbf0: am 3d7f086f: Merge "Prevent memory leaks coming from LauncherAnimUtils" into jb-ub-now-jetsonic

* commit '214b8869b47cc987d15aca3cc01183992246bbe6':

9 years agoam 5b1b9d10: am bd9ea192: am 65b4a2ef: am d9546fc6: Don\'t recreate pages every time...
Michael Jurka [Thu, 23 Oct 2014 17:29:45 +0000 (17:29 +0000)]
am 5b1b9d10: am bd9ea192: am 65b4a2ef: am d9546fc6: Don\'t recreate pages every time you go to All Apps

* commit '5b1b9d10cb1eae937cf86aa0da03408c1ca76f5b':

9 years agoam d86e73d3: am c5c018dc: am ed28bda7: am 00a4093f: Merge "Add script to push changes...
Michael Jurka [Thu, 23 Oct 2014 17:29:42 +0000 (17:29 +0000)]
am d86e73d3: am c5c018dc: am ed28bda7: am 00a4093f: Merge "Add script to push changes to system wallpaper cropper" into jb-ub-now-jetsonic

* commit 'd86e73d36862edd0f3140b46e488e8d96b698eab':

9 years agoam ae9aa80b: am a1e3a879: am 7bed521e: am 39789cba: Merge "Removing tablet-specific...
Winson Chung [Thu, 23 Oct 2014 17:29:40 +0000 (17:29 +0000)]
am ae9aa80b: am a1e3a879: am 7bed521e: am 39789cba: Merge "Removing tablet-specific assets." into jb-ub-now-jetsonic

* commit 'ae9aa80b42b3fd23a868156ceb701831622f26a0':

9 years agoam 9f67b025: (-s ours) am cc364275: am cd3b8ccf: am 401dc411: (-s ours) am 4d3f022c...
Adam Cohen [Thu, 23 Oct 2014 17:29:39 +0000 (17:29 +0000)]
am 9f67b025: (-s ours) am cc364275: am cd3b8ccf: am 401dc411: (-s ours) am 4d3f022c: (-s ours) Merge "DO NOT MERGE: Fix leak when animations are created but never started" into jb-ub-now-indigo-rose

* commit '9f67b0255760fb20ab1eb2b5ddf3f9085d2f1203':

9 years agoam 84286d8b: (-s ours) am 5dabb58d: am 1a3708ec: am 9ba343d7: (-s ours) am a78b25f8...
Winson Chung [Thu, 23 Oct 2014 17:29:37 +0000 (17:29 +0000)]
am 84286d8b: (-s ours) am 5dabb58d: am 1a3708ec: am 9ba343d7: (-s ours) am a78b25f8: (-s ours) DO NOT MERGE

* commit '84286d8bf6b985e708a6ca296dcc64f13a82d944':

9 years agoam 44c09616: am 194f2e46: am 9fdc19ea: am 313bbd2f: Merge "Clearing reference to...
Adam Cohen [Thu, 23 Oct 2014 17:29:35 +0000 (17:29 +0000)]
am 44c09616: am 194f2e46: am 9fdc19ea: am 313bbd2f: Merge "Clearing reference to SavedState bundle after restoring from it. (Bug 11322014)" into jb-ub-now-jetsonic

* commit '44c096165ca669923944257bf2f6be4de0c0c7dd':

9 years agoam a832c408: am 608de004: am 327d5ce3: am 4edc9315: Merge "Fix leak when animations...
Michael Jurka [Thu, 23 Oct 2014 17:29:33 +0000 (17:29 +0000)]
am a832c408: am 608de004: am 327d5ce3: am 4edc9315: Merge "Fix leak when animations are created but never started" into jb-ub-now-jetsonic

* commit 'a832c4080b663ad4c4dd45d5fa452c828c818fe4':

9 years agoam 550be055: am b052483f: am df087f53: am 862f7e39: Load images on a bg thread
Michael Jurka [Thu, 23 Oct 2014 17:29:31 +0000 (17:29 +0000)]
am 550be055: am b052483f: am df087f53: am 862f7e39: Load images on a bg thread

* commit '550be05585bd0f1569c1f0d0f0f99284c184fdf2':

9 years agoam 722d3004: am 5bbe8f30: am 3c4dd321: am 4f98332b: am 6811c5a4: override Launcher2...
Ed Heyl [Thu, 23 Oct 2014 17:29:29 +0000 (17:29 +0000)]
am 722d3004: am 5bbe8f30: am 3c4dd321: am 4f98332b: am 6811c5a4: override Launcher2 (aosp)

* commit '722d30043b06bfdd8adf91681a8d0aed92e8022e':

9 years agoam a8a62569: am c688ddbd: am 0d166d87: am 1fa05179: Merge "Ensuring that we have...
Winson Chung [Thu, 23 Oct 2014 17:29:28 +0000 (17:29 +0000)]
am a8a62569: am c688ddbd: am 0d166d87: am 1fa05179: Merge "Ensuring that we have a valid name for installed shortcuts. (Bug 11266005)" into jb-ub-now-jetsonic

* commit 'a8a62569d6b1f898143fc1dbcc47a1f3c3131fd4':

9 years agoam 97dead1e: am 5cafbe93: am 9e8e38a8: am 681a4ace: Merge "Updating folder icons...
Winson Chung [Thu, 23 Oct 2014 17:29:27 +0000 (17:29 +0000)]
am 97dead1e: am 5cafbe93: am 9e8e38a8: am 681a4ace: Merge "Updating folder icons when the shortcut is updated. (Bug 10803060)" into jb-ub-now-jetsonic

* commit '97dead1ee7b4aaa36f8829dfd2b40bf04a8d9457':

9 years agoam e7d1b745: am e27da37a: am 42bfb12c: am 6d00d54e: Merge "Ensuring disabled packages...
Winson Chung [Thu, 23 Oct 2014 17:29:26 +0000 (17:29 +0000)]
am e7d1b745: am e27da37a: am 42bfb12c: am 6d00d54e: Merge "Ensuring disabled packages remove all components on the workspace. (Bug 11172454)" into jb-ub-now-jetsonic

* commit 'e7d1b745f9ed291cd43ab738b63f0565eeb77ddc':

9 years agoam b6bfb739: am bdaff6fb: am 0942bf8e: am 9933a5eb: am 235a50e0: Merge "Fix Concurren...
Bjorn Bringert [Thu, 23 Oct 2014 17:29:25 +0000 (17:29 +0000)]
am b6bfb739: am bdaff6fb: am 0942bf8e: am 9933a5eb: am 235a50e0: Merge "Fix ConcurrentModificationException in InstallShortcutReceiver" into jb-ub-now-indigo-rose

* commit 'b6bfb739727143dbf2eaf0ef427df49d8999f111':

9 years agoam 80480a9d: (-s ours) am bdcc7d4a: (-s ours) am be3adf36: (-s ours) am 80a603f7...
Baligh Uddin [Thu, 23 Oct 2014 17:29:24 +0000 (17:29 +0000)]
am 80480a9d: (-s ours) am bdcc7d4a: (-s ours) am be3adf36: (-s ours) am 80a603f7: (-s ours) am b178a362: (-s ours) Import translations. DO NOT MERGE

* commit '80480a9dca4471751f5d5503a2a2dbc287cf1ff5':

9 years agoam 0b866e59: (-s ours) am 20dcb55c: (-s ours) am 9a646bbb: (-s ours) Merge "Import...
Baligh Uddin [Thu, 23 Oct 2014 17:29:23 +0000 (17:29 +0000)]
am 0b866e59: (-s ours) am 20dcb55c: (-s ours) am 9a646bbb: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-ub-now-kermit

* commit '0b866e599f31ea5291cae30c81e9df53a06ca1cf':

9 years agoam 7e638c72: (-s ours) am 34df5a5b: (-s ours) am a678d906: (-s ours) am 3aadac7f...
Baligh Uddin [Thu, 23 Oct 2014 17:29:22 +0000 (17:29 +0000)]
am 7e638c72: (-s ours) am 34df5a5b: (-s ours) am a678d906: (-s ours) am 3aadac7f: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-ub-now-jetsonic

* commit '7e638c722830ed05a2aa17fc1fc02d7842b8103d':

9 years agoam c5473a46: am 0c0e543a: am 2f3ecab0: am 51b9f6a5: Merge "Refactor RTL wallpaper...
Michael Jurka [Thu, 23 Oct 2014 17:29:21 +0000 (17:29 +0000)]
am c5473a46: am 0c0e543a: am 2f3ecab0: am 51b9f6a5: Merge "Refactor RTL wallpaper code to use getLayoutTransitionOffsetForPage" into jb-ub-now-jetsonic

* commit 'c5473a46b4b056fb8f6e816489b9796a33f61eee':

9 years agoam de420b20: am ffed6aa2: am 6dec01ca: am 5801ef04: Lazy load default app icon in...
Winson Chung [Thu, 23 Oct 2014 17:29:20 +0000 (17:29 +0000)]
am de420b20: am ffed6aa2: am 6dec01ca: am 5801ef04: Lazy load default app icon in LauncherModel. (Bug 11203738)

* commit 'de420b206cf070f9ee4ea2ada435b2a482cdaa79':

9 years agoam c251158e: am 898f67d0: am bb84fa9e: am 3798b643: Fix issue where you could trigger...
Adam Cohen [Thu, 23 Oct 2014 17:29:20 +0000 (17:29 +0000)]
am c251158e: am 898f67d0: am bb84fa9e: am 3798b643: Fix issue where you could trigger a click after long pressing a widget (issue 11186227)

* commit 'c251158e629cf49a199afd9d75ec44e0efd16ab7':

9 years agoam 382726b7: am b15e9f89: am 550d5869: am da6ab129: Merge "Use new default wallpaper...
Michael Jurka [Thu, 23 Oct 2014 17:29:19 +0000 (17:29 +0000)]
am 382726b7: am b15e9f89: am 550d5869: am da6ab129: Merge "Use new default wallpaper API" into jb-ub-now-jetsonic

* commit '382726b7ee5703f6e428ff8e0223a0650e1decda':

9 years agoam cde2338a: am 2c368cf6: am 04c6f8f0: am 09d85a14: am 8246a143: Shortcut show/hideSe...
Mac Duy Hai [Thu, 23 Oct 2014 17:29:17 +0000 (17:29 +0000)]
am cde2338a: am 2c368cf6: am 04c6f8f0: am 09d85a14: am 8246a143: Shortcut show/hideSearchBar with new conditions.

* commit 'cde2338a164c0f4a71882fdfa2362ee7a93d6964':

9 years agoam 58999a45: am e21a9405: am 4349d2d2: am 28f852ab: Fix drop animation issue in sprin...
Adam Cohen [Thu, 23 Oct 2014 17:29:15 +0000 (17:29 +0000)]
am 58999a45: am e21a9405: am 4349d2d2: am 28f852ab: Fix drop animation issue in springloaded

* commit '58999a45f94e5f5e4430d7b1afc0bd2322ea8cb5':

9 years agoam 0fc0cd0d: am 6f600e6c: am cd8a9f51: am edc43805: am b6d33df9: Fix concurrent modif...
Adam Cohen [Thu, 23 Oct 2014 17:29:14 +0000 (17:29 +0000)]
am 0fc0cd0d: am 6f600e6c: am cd8a9f51: am edc43805: am b6d33df9: Fix concurrent modifcation exception (issue 11234805)

* commit '0fc0cd0d3773632f512069b703466308a2eb9977':

9 years agoam 06db554e: am c5dd0996: am 28c9b3d2: am 540514f3: am e5467dcc: Flushing icons of...
Winson Chung [Thu, 23 Oct 2014 17:29:13 +0000 (17:29 +0000)]
am 06db554e: am c5dd0996: am 28c9b3d2: am 540514f3: am e5467dcc: Flushing icons of the wrong size. (Bug 11203738)

* commit '06db554e4b3b60e1dbf1ce4da72f343417587b25':

9 years agoam 57593750: am 95c925ae: am 91260602: am 6bef14bb: am 2456b973: Merge "Fix issue...
Adam Cohen [Thu, 23 Oct 2014 17:29:12 +0000 (17:29 +0000)]
am 57593750: am 95c925ae: am 91260602: am 6bef14bb: am 2456b973: Merge "Fix issue where custom content pops in (issue 11209357)" into jb-ub-now-indigo-rose

* commit '575937508171ed19bc943615e25d45efd21cbcbf':

9 years agoam dd5f0e7c: am fba5ecd8: am f4b68852: am 3eb3b27a: am 54000490: Ensuring that we...
Winson Chung [Thu, 23 Oct 2014 17:29:11 +0000 (17:29 +0000)]
am dd5f0e7c: am fba5ecd8: am f4b68852: am 3eb3b27a: am 54000490: Ensuring that we are calling setCompoundDrawable() instead of using intrinsic bounds. (Bug 11203738)

* commit 'dd5f0e7cc4bb6ff40e91568fbda0861f278bbeca':

9 years agoam 5a341135: am fca80dec: am 41776eca: am 2cc2e4ab: am 2ac85a6d: Merge "Ensuring...
Adam Cohen [Thu, 23 Oct 2014 17:29:10 +0000 (17:29 +0000)]
am 5a341135: am fca80dec: am 41776eca: am 2cc2e4ab: am 2ac85a6d: Merge "Ensuring that we restore bounds when resizing them for folder preview drawing. (Bug 11203738)" into jb-ub-now-indigo-rose

* commit '5a3411352320d7fb6c58822cbf4711e6b33ce088':

9 years agoam 81d24da1: am d6216b6a: am 16b194f8: am 8e93c09c: am 9e91b7d5: Merge "Don\'t crash...
Michael Jurka [Thu, 23 Oct 2014 17:29:09 +0000 (17:29 +0000)]
am 81d24da1: am d6216b6a: am 16b194f8: am 8e93c09c: am 9e91b7d5: Merge "Don\'t crash if WallpaperCropActivity isn\'t passed a URI" into jb-ub-now-indigo-rose

* commit '81d24da13ba8bb7c9f9b852f5f5d96b75924d8ba':

9 years agoam 13d8d2d6: am c270b8d9: am 44dfaf26: am 6eabacd4: am 140e79bb: Merge "Workaround...
Winson Chung [Thu, 23 Oct 2014 17:29:08 +0000 (17:29 +0000)]
am 13d8d2d6: am c270b8d9: am 44dfaf26: am 6eabacd4: am 140e79bb: Merge "Workaround for small icons. Draw icon drawables at the expected icon size. (Bug 11203738)" into jb-ub-now-indigo-rose

* commit '13d8d2d6682fbfba3262d1485c6cebf9665d751e':

9 years agoam f1ecf499: am bc310cf9: am 55296036: am f55ea2f8: am decbaa69: Do not shortcut...
Mac Duy Hai [Thu, 23 Oct 2014 17:29:07 +0000 (17:29 +0000)]
am f1ecf499: am bc310cf9: am 55296036: am f55ea2f8: am decbaa69: Do not shortcut show/hideSearchbar.

* commit 'f1ecf4997904664be1dd9e7555f40df4647c2c4d':

9 years agoam 2b32d2a1: am eacb0877: am 71aa8226: am a9ba5e0f: am 207a7bd8: Tweaking workspace...
Winson Chung [Thu, 23 Oct 2014 17:29:06 +0000 (17:29 +0000)]
am 2b32d2a1: am eacb0877: am 71aa8226: am a9ba5e0f: am 207a7bd8: Tweaking workspace cling due to mirrored default hotseat. (Bug 11142616)

* commit '2b32d2a1f453f05d60422205c730b57c7c6be862':

9 years agoam a9fe2cb9: am 722719a6: am 27470623: am b93da8d6: am 01c0214f: Merge "Fix bugs...
Adam Cohen [Thu, 23 Oct 2014 17:29:05 +0000 (17:29 +0000)]
am a9fe2cb9: am 722719a6: am 27470623: am b93da8d6: am 01c0214f: Merge "Fix bugs / jank with folder creation feedback (issue 11195148)" into jb-ub-now-indigo-rose

* commit 'a9fe2cb974e627a309b0c3ce00718786890c5aab':

9 years agoam d7081f7c: am b51788b0: am bbdb00a7: am 3dfe0d75: am e8b600c5: Merge "Add transluce...
John Spurlock [Thu, 23 Oct 2014 17:29:05 +0000 (17:29 +0000)]
am d7081f7c: am b51788b0: am bbdb00a7: am 3dfe0d75: am e8b600c5: Merge "Add translucent bar attributes to sw720dp values override." into jb-ub-now-indigo-rose

* commit 'd7081f7c934515d748b1f6da246d5853dcd2d20b':

9 years agoam 72537b1c: am 98c3d6c9: am 16290220: am 039a2c11: am 13348ffc: Merge "Simplify...
Daniel Sandler [Thu, 23 Oct 2014 17:29:04 +0000 (17:29 +0000)]
am 72537b1c: am 98c3d6c9: am 16290220: am 039a2c11: am 13348ffc: Merge "Simplify wallpaper strip animation." into jb-ub-now-indigo-rose

* commit '72537b1c745eb22f5bc585cb3bff0abb6c2aecb7':

9 years agoam ee7d3bc9: am 377a60a2: am 80663ba2: am b6d09a72: am ceb0b557: Merge "Add EXIF...
Adam Cohen [Thu, 23 Oct 2014 17:29:03 +0000 (17:29 +0000)]
am ee7d3bc9: am 377a60a2: am 80663ba2: am b6d09a72: am ceb0b557: Merge "Add EXIF rotation support to wallpaper picker" into jb-ub-now-indigo-rose

* commit 'ee7d3bc92757da0d540eac91400916b5a129aa12':

9 years agoam 3110a270: (-s ours) am 56928729: (-s ours) am 92375487: (-s ours) am 36a300e1...
Baligh Uddin [Thu, 23 Oct 2014 17:29:02 +0000 (17:29 +0000)]
am 3110a270: (-s ours) am 56928729: (-s ours) am 92375487: (-s ours) am 36a300e1: (-s ours) am e1bc1951: (-s ours) Import translations. DO NOT MERGE

* commit '3110a270e2965be286b368ed8d0dc7377f8182df':

9 years agoam b1f7866b: (-s ours) am 6b79a084: (-s ours) am 8609c70a: (-s ours) am 91b90c09...
Baligh Uddin [Thu, 23 Oct 2014 17:29:01 +0000 (17:29 +0000)]
am b1f7866b: (-s ours) am 6b79a084: (-s ours) am 8609c70a: (-s ours) am 91b90c09: (-s ours) Import translations. DO NOT MERGE

* commit 'b1f7866b65c80a0b5599acf0cd2dbf50876bb9ea':

9 years agoam 30146cb9: (-s ours) am 4e7091d3: (-s ours) am 73b1d566: (-s ours) Import translati...
Baligh Uddin [Thu, 23 Oct 2014 17:29:00 +0000 (17:29 +0000)]
am 30146cb9: (-s ours) am 4e7091d3: (-s ours) am 73b1d566: (-s ours) Import translations. DO NOT MERGE

* commit '30146cb92d6e792dfa5639bc6aff6494c4a425ae':

9 years agoam 1d907f50: am 6f34a11e: am 51898f05: am 162f5387: am 982470ea: Merge "Speed up...
Adam Cohen [Thu, 23 Oct 2014 17:28:59 +0000 (17:28 +0000)]
am 1d907f50: am 6f34a11e: am 51898f05: am 162f5387: am 982470ea: Merge "Speed up overview transition" into jb-ub-now-indigo-rose

* commit '1d907f5012c33d46d778789b95874cb6497aa984':

9 years agoam e341694e: am 6b38191b: am 5ca57897: am 1f8edc21: am 920a9c25: Merge "Clean up...
Adam Cohen [Thu, 23 Oct 2014 17:28:58 +0000 (17:28 +0000)]
am e341694e: am 6b38191b: am 5ca57897: am 1f8edc21: am 920a9c25: Merge "Clean up interpolators on overview mode transition fades" into jb-ub-now-indigo-rose

* commit 'e341694ee91532eeeff3a60661836e02f2d84f00':

9 years agoam 5315e31a: am 102cff96: am 47747fd4: am 0b2b235c: am 019f5892: Merge "Fix issue...
Adam Cohen [Thu, 23 Oct 2014 17:28:57 +0000 (17:28 +0000)]
am 5315e31a: am 102cff96: am 47747fd4: am 0b2b235c: am 019f5892: Merge "Fix issue with extra empty screen left over after widget add cancel (issue 10865959)" into jb-ub-now-indigo-rose

* commit '5315e31a65cb912a748fe5d4d734a789168895a2':

9 years agoam 38892095: am 4f2443a5: am bc8da2c7: am 30b63be1: am 1226be43: Merge "Fix custom...
Adam Cohen [Thu, 23 Oct 2014 17:28:56 +0000 (17:28 +0000)]
am 38892095: am 4f2443a5: am bc8da2c7: am 30b63be1: am 1226be43: Merge "Fix custom content scroll effects bug (recent regression) (issue 11188769)" into jb-ub-now-indigo-rose

* commit '3889209563c118bb2f6e663b5fed5c25a0f84dce':

9 years agoam 918569e8: am a69e9b9a: am a78bfcc9: am 8c9802ef: am dc734ef2: Merge "Fixing issue...
Winson Chung [Thu, 23 Oct 2014 17:28:56 +0000 (17:28 +0000)]
am 918569e8: am a69e9b9a: am a78bfcc9: am 8c9802ef: am dc734ef2: Merge "Fixing issue where the PagedView scroll is out of sync with the current page. (Bug 11050528)" into jb-ub-now-indigo-rose

* commit '918569e864c3c38e96d68e65969042852a9135f7':

9 years agoam e8af58e5: am 105faef1: am 005f4ad0: am 78531cf0: am 88986e1c: Update all apps...
Adam Cohen [Thu, 23 Oct 2014 17:28:55 +0000 (17:28 +0000)]
am e8af58e5: am 105faef1: am 005f4ad0: am 78531cf0: am 88986e1c: Update all apps pressed state (issue 11113963)

* commit 'e8af58e5644e5d87f446234dbd8f8237d4472840':

9 years agoam 78fb4dce: am a6bd99ae: am 3826cb36: am b8a0fe4e: am a5f4e488: Guarantee views...
Adam Cohen [Thu, 23 Oct 2014 17:28:54 +0000 (17:28 +0000)]
am 78fb4dce: am a6bd99ae: am 3826cb36: am b8a0fe4e: am a5f4e488: Guarantee views are invisible after being faded (issue 11112570)

* commit '78fb4dceed432d764339d39020e3e8aa7d5c18ec':

9 years agoam 00801c36: am 4b817692: am 03e0ad01: am 91778264: am f7d45854: Altering the workspa...
Winson Chung [Thu, 23 Oct 2014 17:28:53 +0000 (17:28 +0000)]
am 00801c36: am 4b817692: am 03e0ad01: am 91778264: am f7d45854: Altering the workspace padding to account for default widget padding (Bug 11116452)

* commit '00801c3609e605594a2409eb1d9fb258079b3a3a':

9 years agoam 8c25d3d6: am ec468e6a: am 4bd5f236: am 1111614b: am 3057b1c2: Fixing issue with...
Winson Chung [Thu, 23 Oct 2014 17:28:52 +0000 (17:28 +0000)]
am 8c25d3d6: am ec468e6a: am 4bd5f236: am 1111614b: am 3057b1c2: Fixing issue with folder opening in the wrong bounds (Bug. 11025207)

* commit '8c25d3d64730d62c88bfc3fbe63158f9245febb9':

9 years agoam 1ab5598f: am 82025700: am 23dd2d0c: am 0129cd2f: am c5da25f7: Update description...
Alan Viverette [Thu, 23 Oct 2014 17:28:51 +0000 (17:28 +0000)]
am 1ab5598f: am 82025700: am 23dd2d0c: am 0129cd2f: am c5da25f7: Update description for wallpaper accessibility announcement string

* commit '1ab5598fc65bd0ca5fd2a0e83d7d3a746594538c':

9 years agoam cb8fd7c9: am 27a72302: am 6ea492fe: am 0bf18c64: am 1ad199ad: Merge "Fixing RTL...
Winson Chung [Thu, 23 Oct 2014 17:28:50 +0000 (17:28 +0000)]
am cb8fd7c9: am 27a72302: am 6ea492fe: am 0bf18c64: am 1ad199ad: Merge "Fixing RTL issues with Clings. (Bug 11008488)" into jb-ub-now-indigo-rose

* commit 'cb8fd7c96d925857b0ebaa3e33116f0040eb8973':

9 years agoam 1264b7bb: am 524dbe65: am a80ad91b: am da7a0010: am b6e2aad8: Merge "Fix issue...
Adam Cohen [Thu, 23 Oct 2014 17:28:49 +0000 (17:28 +0000)]
am 1264b7bb: am 524dbe65: am a80ad91b: am da7a0010: am b6e2aad8: Merge "Fix issue where can\'t long click page indicators (issue 11136731)" into jb-ub-now-indigo-rose

* commit '1264b7bb17398055421430f7747729197b74358f':

9 years agoam b69f5f7d: am d565403e: am 4edba504: am 1c6c1d49: am 773824cd: Merge "Change drop...
Michael Jurka [Thu, 23 Oct 2014 17:28:48 +0000 (17:28 +0000)]
am b69f5f7d: am d565403e: am 4edba504: am 1c6c1d49: am 773824cd: Merge "Change drop target to "uninstall" when in All Apps" into jb-ub-now-indigo-rose

* commit 'b69f5f7d3256b88daf93eca2f8cf4ce7e0d50ece':

9 years agoam a04a89d3: am 748c0469: am d5ebb871: am bf18889a: am d1e474a9: Merge "Initial chang...
Winson Chung [Thu, 23 Oct 2014 17:28:47 +0000 (17:28 +0000)]
am a04a89d3: am 748c0469: am d5ebb871: am bf18889a: am d1e474a9: Merge "Initial changes for new clings. (Bug 11142616)" into jb-ub-now-indigo-rose

* commit 'a04a89d3f5bf5c74be2c45edf4a8e2fa26f7b071':

9 years agoam eec6e8a1: am 603389c0: am 50952d75: am 76d0b79e: am bb6fda6a: Provide final callba...
Adam Cohen [Thu, 23 Oct 2014 17:28:46 +0000 (17:28 +0000)]
am eec6e8a1: am 603389c0: am 50952d75: am 76d0b79e: am bb6fda6a: Provide final callbacks before remove CustomContent (issue 11169651)

* commit 'eec6e8a176af7a5767e143e83c9133bd1ee84311':

9 years agoam ca101c6a: am 7838ff6c: am 19e37429: am 3bfe1b38: am 21cd002f: Fix issue where...
Adam Cohen [Thu, 23 Oct 2014 17:28:45 +0000 (17:28 +0000)]
am ca101c6a: am 7838ff6c: am 19e37429: am 3bfe1b38: am 21cd002f: Fix issue where custom content would show up on boot (issue 10713745)

* commit 'ca101c6a3bc0fa8444b369dd644790ae54e47d25':

9 years agoam 9e5a3b0e: am f9c25c37: am e454ebe2: am cbcc4701: am 82e5c984: Update custom conten...
Winson Chung [Thu, 23 Oct 2014 17:28:37 +0000 (17:28 +0000)]
am 9e5a3b0e: am f9c25c37: am e454ebe2: am cbcc4701: am 82e5c984: Update custom content hint after custom content is invalidated (Bug 11067230)

* commit '9e5a3b0e2a0a82c7bd67724fc5f732083cc26c37':

9 years agoam c05143d4: am e9815a85: am 7629f686: am a01d67df: am f248abc1: Merge "Use transluce...
Bjorn Bringert [Thu, 23 Oct 2014 17:28:36 +0000 (17:28 +0000)]
am c05143d4: am e9815a85: am 7629f686: am a01d67df: am f248abc1: Merge "Use translucent decor theme attributes in Launcher3." into jb-ub-now-indigo-rose

* commit 'c05143d432ffb0f2feba4345d11dd76ff4eb11b1':

9 years agoam 4ead85b2: am fe8821ea: am db56b5f3: am 0a5c03c8: am 5511ff96: Merge "Removing...
Winson Chung [Thu, 23 Oct 2014 17:28:34 +0000 (17:28 +0000)]
am 4ead85b2: am fe8821ea: am db56b5f3: am 0a5c03c8: am 5511ff96: Merge "Removing extraneous apps-customize page reset. (Bug 11027505)" into jb-ub-now-indigo-rose

* commit '4ead85b29b5518da05d9ffb06d5fd35b97eb67ff':

9 years agoam 45bfb686: am 0d5c8972: am 46019818: am 695b7229: am 558f1c2a: Fix NPE in CellLayou...
Adam Cohen [Thu, 23 Oct 2014 17:28:33 +0000 (17:28 +0000)]
am 45bfb686: am 0d5c8972: am 46019818: am 695b7229: am 558f1c2a: Fix NPE in CellLayout (issue 11113502)

* commit '45bfb686ef3cd9d5f10caed96c976830606e5cc5':

9 years agoam 81a35513: am 5c8d5715: am 9f68d4d0: am 3c729910: am 564a2e71: Fix custom content...
Adam Cohen [Thu, 23 Oct 2014 17:28:32 +0000 (17:28 +0000)]
am 81a35513: am 5c8d5715: am 9f68d4d0: am 3c729910: am 564a2e71: Fix custom content state for scroll in RTL (issue 11068877)

* commit '81a355130d2881c4a0fe7e718591243541625fa1':

9 years agoam 84a75f8b: am f9e28fd2: am 21a6c8a9: am 4d89e2af: clean up backup imports
Chris Wren [Thu, 23 Oct 2014 17:28:31 +0000 (17:28 +0000)]
am 84a75f8b: am f9e28fd2: am 21a6c8a9: am 4d89e2af: clean up backup imports

* commit '84a75f8b6ed1835ef9dd73d34a22f02659ac6f29':

9 years agoam f0464c1c: am 7572cca7: am e6f66eaa: am bf03acd6: am fbdf4270: Fix inability to...
Adam Cohen [Thu, 23 Oct 2014 17:28:30 +0000 (17:28 +0000)]
am f0464c1c: am 7572cca7: am e6f66eaa: am bf03acd6: am fbdf4270: Fix inability to long press page indicators (issue 11136731)

* commit 'f0464c1cb170b9f68ee51415020b5cc2e09ccdd9':

9 years agoam b5a6d49e: am b6223b4d: am affeccf1: am e3f3d291: am 129d71d8: Merge "move the...
Chris Wren [Thu, 23 Oct 2014 17:28:29 +0000 (17:28 +0000)]
am b5a6d49e: am b6223b4d: am affeccf1: am e3f3d291: am 129d71d8: Merge "move the provider authority to a config class" into jb-ub-now-indigo-rose

* commit 'b5a6d49e81e3e9d5835c6883f6b876099949e34c':

9 years agoam fe49b895: am f36857e8: am e623e001: am 6ea9add6: am e81400c8: Merge "Fix crash...
Michael Jurka [Thu, 23 Oct 2014 17:28:28 +0000 (17:28 +0000)]
am fe49b895: am f36857e8: am e623e001: am 6ea9add6: am e81400c8: Merge "Fix crash when pick an image for wallpaper" into jb-ub-now-indigo-rose

* commit 'fe49b8959798478bed7d09fe8349de5d56ecb52e':

9 years agoam f7b042cb: am 76d5e31f: am 7164e883: am 0225a4a1: am 6fa44738: Merge "Fix widget...
Adam Cohen [Thu, 23 Oct 2014 17:28:27 +0000 (17:28 +0000)]
am f7b042cb: am 76d5e31f: am 7164e883: am 0225a4a1: am 6fa44738: Merge "Fix widget longpress issue where longpress misfires (issue 10988288)" into jb-ub-now-indigo-rose

* commit 'f7b042cb3a71a380312809f77080e45c3ee4988f':

9 years agoam 60afed6d: am fe95d2dc: am e58c7bc1: am 6dd9ec51: am d706e0a8: Merge "Getting rid...
Adam Cohen [Thu, 23 Oct 2014 17:28:26 +0000 (17:28 +0000)]
am 60afed6d: am fe95d2dc: am e58c7bc1: am 6dd9ec51: am d706e0a8: Merge "Getting rid of additive blending for overscroll (issue 11072246)" into jb-ub-now-indigo-rose

* commit '60afed6ddc739dc4495f1772296e19d973a95ebb':

9 years agoam 610309e5: am f90355b9: am 34a4df42: am 93fb660b: am 9f9d7350: Merge "Announce...
Alan Viverette [Thu, 23 Oct 2014 17:28:25 +0000 (17:28 +0000)]
am 610309e5: am f90355b9: am 34a4df42: am 93fb660b: am 9f9d7350: Merge "Announce wallpaper selection for accessibility" into jb-ub-now-indigo-rose

* commit '610309e532bbf7f77dd184d7b8706e347edb7468':

9 years agoam a8e04b72: am 3c98d683: am 25b57c42: am 97db67ad: am 0553f88a: Merge "Don\'t animat...
Winson Chung [Thu, 23 Oct 2014 17:28:24 +0000 (17:28 +0000)]
am a8e04b72: am 3c98d683: am 25b57c42: am 97db67ad: am 0553f88a: Merge "Don\'t animate search bar when we are not animating the transition to workspace. (Bug 11105305)" into jb-ub-now-indigo-rose

* commit 'a8e04b72ed6667dda05537765ccab6d54eec370c':

9 years agoam 511ced17: am 977b2f80: am 88f2f8fb: am 1d220c31: am 8bcdff50: Merge "Ensuring...
Winson Chung [Thu, 23 Oct 2014 17:28:23 +0000 (17:28 +0000)]
am 511ced17: am 977b2f80: am 88f2f8fb: am 1d220c31: am 8bcdff50: Merge "Ensuring that we offset cell items by their destination cell padding. (Bug 10881814)" into jb-ub-now-indigo-rose

* commit '511ced177b95a1f301af6ff24d4868af6772d831':

9 years agoam 9e40582f: am e6e924ec: am 56a3106a: am fe6f2bca: am 7165f8f3: Merge "Accounting...
Winson Chung [Thu, 23 Oct 2014 17:28:22 +0000 (17:28 +0000)]
am 9e40582f: am e6e924ec: am 56a3106a: am fe6f2bca: am 7165f8f3: Merge "Accounting for background padding when drawing the bg. (Bug 10881814)" into jb-ub-now-indigo-rose

* commit '9e40582f7daa55814a0d74061ac7a404985ad1ab':

9 years agoam 084b4009: am c83923c1: am f4421dce: am 65cff642: am 5376e7a8: Merge "Ensuring...
Winson Chung [Thu, 23 Oct 2014 17:28:21 +0000 (17:28 +0000)]
am 084b4009: am c83923c1: am f4421dce: am 65cff642: am 5376e7a8: Merge "Ensuring that the widget drag outline is padded by the default widget padding. (Bug 10881814)" into jb-ub-now-indigo-rose

* commit '084b400936571f0ca2596ca71f8b8adaff6624a0':

9 years agoam 741d01d2: am 285d2b6f: am fa6938af: am c386993f: am ed307df7: Cleaning up home...
Adam Cohen [Thu, 23 Oct 2014 17:28:20 +0000 (17:28 +0000)]
am 741d01d2: am 285d2b6f: am fa6938af: am c386993f: am ed307df7: Cleaning up home / back behaviour in overview mode (issue 10965421)

* commit '741d01d21b684886c20e6dde95efdc8210272423':

9 years agoam c0d5ab9c: am dce0503e: am 7af3bca2: am 66934966: am d4a55216: Merge "Fix scrolling...
Alan Viverette [Thu, 23 Oct 2014 17:28:19 +0000 (17:28 +0000)]
am c0d5ab9c: am dce0503e: am 7af3bca2: am 66934966: am d4a55216: Merge "Fix scrolling accessibility events sent from PagedView" into jb-ub-now-indigo-rose

* commit 'c0d5ab9c201c3fabc4ad37c73f74ef5239d48c80':

9 years agoam b8ca7ab8: am 8d65ac9e: am 7d4f5081: am 8e25924b: am ba65185e: Merge "Add content...
Michael Jurka [Thu, 23 Oct 2014 17:28:18 +0000 (17:28 +0000)]
am b8ca7ab8: am 8d65ac9e: am 7d4f5081: am 8e25924b: am ba65185e: Merge "Add content description for wallpaper thumbs" into jb-ub-now-indigo-rose

* commit 'b8ca7ab8c3f089f60b785163e3add6fa2c33d5b8':

9 years agoam 78ea90e7: am 3fe985ea: am ae136f68: am 79f403e2: am da608c95: Target SDK 19, fix...
Mathew Inwood [Thu, 23 Oct 2014 17:28:17 +0000 (17:28 +0000)]
am 78ea90e7: am 3fe985ea: am ae136f68: am 79f403e2: am da608c95: Target SDK 19, fix build.

* commit '78ea90e72b22bd22f13843a7003f4f383e8d320b':

9 years agoam 95558baa: am 4faba966: am 11b87e10: am 13647bb6: am fba90848: Merge "Switch to...
Michael Jurka [Thu, 23 Oct 2014 17:28:16 +0000 (17:28 +0000)]
am 95558baa: am 4faba966: am 11b87e10: am 13647bb6: am fba90848: Merge "Switch to using theme for translucent nav bars" into jb-ub-now-indigo-rose

* commit '95558baae4e16fc3fef413eef0671fdbac8f3ab8':

9 years agoam 43f3eae7: am 5a0499ce: am 21501c01: am 78186d9b: am 38848ca3: Offsetting the CellL...
Winson Chung [Thu, 23 Oct 2014 17:28:15 +0000 (17:28 +0000)]
am 43f3eae7: am 5a0499ce: am 21501c01: am 78186d9b: am 38848ca3: Offsetting the CellLayout by the remainder space to center it. (Bug 11030678)

* commit '43f3eae779252b422d31ec046cd7dff4dea3b0f4':

9 years agoam 6332d957: am 723fce8f: am 68d5cf43: am 8187d671: am 2a38c287: roll back market...
Chris Wren [Thu, 23 Oct 2014 17:28:15 +0000 (17:28 +0000)]
am 6332d957: am 723fce8f: am 68d5cf43: am 8187d671: am 2a38c287: roll back market integration

* commit '6332d95722452ba38903eb6ca8eaafc14f07b8a6':

9 years agoam 4974e628: am d22d12fe: am 05a5447c: am d99a88cf: am 0b791c26: Merge "Don\'t measur...
Vladimir Marko [Thu, 23 Oct 2014 17:28:14 +0000 (17:28 +0000)]
am 4974e628: am d22d12fe: am 05a5447c: am d99a88cf: am 0b791c26: Merge "Don\'t measure GONE views." into jb-ub-now-indigo-rose

* commit '4974e62887c7e2a3ea368fec1bc6a272ad8ee599':

9 years agoam 62afccaf: (-s ours) am 5c49a8df: (-s ours) am 4776bdf4: (-s ours) am c4a95d3c...
Baligh Uddin [Thu, 23 Oct 2014 17:28:13 +0000 (17:28 +0000)]
am 62afccaf: (-s ours) am 5c49a8df: (-s ours) am 4776bdf4: (-s ours) am c4a95d3c: (-s ours) am e5128031: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-ub-now-indigo-rose

* commit '62afccafaa29519ef90671b70ce6c174107b782d':

9 years agoam 348df67e: (-s ours) am 542cf02d: (-s ours) am 93e416b2: (-s ours) am fb291f5a...
Baligh Uddin [Thu, 23 Oct 2014 17:28:12 +0000 (17:28 +0000)]
am 348df67e: (-s ours) am 542cf02d: (-s ours) am 93e416b2: (-s ours) am fb291f5a: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-ub-now-jetsonic

* commit '348df67e4ea1dcfb3c41b5729b7187660ad7324d':

9 years agoam 98e5bd3c: (-s ours) am d46f31f6: (-s ours) am eb7ed429: (-s ours) Merge "Import...
Baligh Uddin [Thu, 23 Oct 2014 17:28:11 +0000 (17:28 +0000)]
am 98e5bd3c: (-s ours) am d46f31f6: (-s ours) am eb7ed429: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-ub-now-kermit

* commit '98e5bd3c3f94a159e8c5da8eb5b3bd086f6c4d8d':

9 years agoam 6374f2a8: am e1df1b19: am 95aa995d: am 1c3b122b: am d9ecec11: Merge "Fixing flash...
Adam Cohen [Thu, 23 Oct 2014 17:28:09 +0000 (17:28 +0000)]
am 6374f2a8: am e1df1b19: am 95aa995d: am 1c3b122b: am d9ecec11: Merge "Fixing flash when you swipe a page and go into All Apps (Bug 10971209)" into jb-ub-now-indigo-rose

* commit '6374f2a84e4057fca7704f4f4abb987878860e6e':

9 years agoam c3578e21: am 0c81cd84: am f0d02575: am e07b1569: am a3818ab9: Merge "Hiding side...
Winson Chung [Thu, 23 Oct 2014 17:28:07 +0000 (17:28 +0000)]
am c3578e21: am 0c81cd84: am f0d02575: am e07b1569: am a3818ab9: Merge "Hiding side pages during AllApps transition. (Bug 10971209)" into jb-ub-now-indigo-rose

* commit 'c3578e21fdd276238ac83144e11a96f055f87d5f':

9 years agoam 468be961: am 1ed9a397: am 6789f458: am d58000b0: am 39511301: Fix crash in crop...
Michael Jurka [Thu, 23 Oct 2014 17:28:04 +0000 (17:28 +0000)]
am 468be961: am 1ed9a397: am 6789f458: am d58000b0: am 39511301: Fix crash in crop view

* commit '468be9612483e62074fa462f8bf87bc9d38bfa3d':

9 years agoam 8abf917e: am 0d80b330: am d175f7bb: am 090c2ce8: am cffa7175: Merge "Disable cling...
Casey Burkhardt [Thu, 23 Oct 2014 17:28:02 +0000 (17:28 +0000)]
am 8abf917e: am 0d80b330: am d175f7bb: am 090c2ce8: am cffa7175: Merge "Disable clings when explore by touch is enabled. Bug: 11067870 Change-Id: If203f3a23de3bd3192ff748bbccc04d74b0a73fa" into jb-ub-now-indigo-rose

* commit '8abf917ee3cd76d1c8d98e15eed3bfd3d799fb07':

9 years agoam a5733216: am 1aca0a2f: am 566ec2a1: am 70e4cf1c: am 225ad9b7: Only show the most...
Adam Cohen [Thu, 23 Oct 2014 17:27:58 +0000 (17:27 +0000)]
am a5733216: am 1aca0a2f: am 566ec2a1: am 70e4cf1c: am 225ad9b7: Only show the most recent screen added to custom content (issue 11087978)

* commit 'a573321674d00403e5d19f41f13dd6e3f639da0a':

9 years agoam c4ee6c33: am 5b04db49: am 53f69b89: am 63bc386d: am 92aa4238: move to backup helpe...
Chris Wren [Thu, 23 Oct 2014 17:27:55 +0000 (17:27 +0000)]
am c4ee6c33: am 5b04db49: am 53f69b89: am 63bc386d: am 92aa4238: move to backup helper architecture

* commit 'c4ee6c33ed85bb0bc8eb2d57362cce9df77e4cf2':

9 years agoam 5b13d28e: am bce12fe2: am 3d5960e3: am 7a8f7682: am d4507eef: Migrate to new WM...
John Spurlock [Thu, 23 Oct 2014 17:27:51 +0000 (17:27 +0000)]
am 5b13d28e: am bce12fe2: am 3d5960e3: am 7a8f7682: am d4507eef: Migrate to new WM.LP.flags based translucent decor API.

* commit '5b13d28e42b1b9a4b675f03061db3a35506d613a':

9 years agoam 4258f621: (-s ours) am 5f4f95ca: (-s ours) am ea8f1f18: (-s ours) am 98989bd7...
Baligh Uddin [Thu, 23 Oct 2014 17:27:49 +0000 (17:27 +0000)]
am 4258f621: (-s ours) am 5f4f95ca: (-s ours) am ea8f1f18: (-s ours) am 98989bd7: (-s ours) am 835c0b74: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-ub-now-indigo-rose

* commit '4258f621fcb18820e1ddb382713bab898e4ef913':

9 years agoam 551d0621: (-s ours) am f0942091: (-s ours) am 861cdc99: (-s ours) am 8446d354...
Baligh Uddin [Thu, 23 Oct 2014 17:27:47 +0000 (17:27 +0000)]
am 551d0621: (-s ours) am f0942091: (-s ours) am 861cdc99: (-s ours) am 8446d354: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-ub-now-jetsonic

* commit '551d0621e317be6cd6d9241a804f41b666a2ff1e':

9 years agoam 1ca1e4e4: (-s ours) am a371f3eb: (-s ours) am edaa63a3: (-s ours) Merge "Import...
Baligh Uddin [Thu, 23 Oct 2014 17:27:45 +0000 (17:27 +0000)]
am 1ca1e4e4: (-s ours) am a371f3eb: (-s ours) am edaa63a3: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-ub-now-kermit

* commit '1ca1e4e4d585c2aa09436ff2ec9ea07c8b3e4723':

9 years agoam 47eed63d: am 2e07afdc: am 136b6f16: am a003ff14: am 4b378879: Fix issue where...
Adam Cohen [Thu, 23 Oct 2014 17:27:44 +0000 (17:27 +0000)]
am 47eed63d: am 2e07afdc: am 136b6f16: am a003ff14: am 4b378879: Fix issue where TalkBack would  announce Apps instead of Widgets (issue 11012666)

* commit '47eed63dcef5d3f60a3be617a5a4d07de139e808':

9 years agoam 32bfe53a: am 26520b47: am a0a5dca6: am 3714119a: am 53805218: First pass on access...
Adam Cohen [Thu, 23 Oct 2014 17:27:41 +0000 (17:27 +0000)]
am 32bfe53a: am 26520b47: am a0a5dca6: am 3714119a: am 53805218: First pass on accessibility

* commit '32bfe53af3dec250dd9783ae16fa6c667f26360d':

9 years agoam 324a4424: am 9a2daeb1: am 11df2825: am 3d14fe94: am 8cffccc1: Merge "Fixing issue...
Winson Chung [Thu, 23 Oct 2014 17:27:40 +0000 (17:27 +0000)]
am 324a4424: am 9a2daeb1: am 11df2825: am 3d14fe94: am 8cffccc1: Merge "Fixing issue with numerous empty screens showing when adding a shortcut to a clear workspace. (Bug 10785413)" into jb-ub-now-indigo-rose

* commit '324a4424be7cc351dbc0c2c8dcd13cdc43b4de55':

9 years agoam 46ee1431: am 933705a6: am 216c0fd9: am aa671a84: am 2fe1530c: Fix NPE
Michael Jurka [Thu, 23 Oct 2014 17:27:38 +0000 (17:27 +0000)]
am 46ee1431: am 933705a6: am 216c0fd9: am aa671a84: am 2fe1530c: Fix NPE

* commit '46ee143121e70721a082f656eb75ff0d819f0084':

9 years agoam 22f48c8c: am a4240d69: am b485c995: am 0c1eeac3: am d8fe6de1: check the state...
Chris Wren [Thu, 23 Oct 2014 17:27:36 +0000 (17:27 +0000)]
am 22f48c8c: am a4240d69: am b485c995: am 0c1eeac3: am d8fe6de1: check the state of launcher before running a backup.

* commit '22f48c8c444dcdec11a11493cdfdfbad8d90908d':