summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge "Fix typo in preferences" into ub-launcher3-dorval-polishTony Wickham2017-06-121-1/+1
|\ | | | | | | | | | | am: a1840c6e29 Change-Id: Iec1d99618864335438a902be4435c720c783b183
| * Merge "Fix typo in preferences" into ub-launcher3-dorval-polishTony Wickham2017-06-121-1/+1
| |\
| | * Fix typo in preferencesTony2017-06-121-1/+1
| | | | | | | | | | | | | | | Bug: 62299923 Change-Id: I6e76a46f9e1fa7acf4b746840c33c914de364417
* | | Merge "Fix synchronization on a non-final field 'sInstanceLock' by making it ↵Rajeev Kumar2017-06-121-3/+1
|\| | | | | | | | | | | | | | | | | | | | | | | final." into ub-launcher3-dorval-polish am: 98e063e6df Change-Id: I5dd3e60f39a33645b8d29b64d975384047eceeb0
| * | Merge "Fix synchronization on a non-final field 'sInstanceLock' by making it ↵Rajeev Kumar2017-06-121-3/+1
| |\ \ | | | | | | | | | | | | final." into ub-launcher3-dorval-polish
| | * | Fix synchronization on a non-final field 'sInstanceLock' by makingRajeev Kumar2017-06-121-3/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | it final. Bug: 62466540 Change-Id: I28a1c53435d761089b2ee7742d31a0cb482b8afd
* | | | Merge "resolve merge conflicts of 5cc7bbdbb to ub-launcher3-dorval-polish" ↵Sunny Goyal2017-06-120-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into ub-launcher3-dorval-polish am: 76a3d91899 Change-Id: Ibe37f6e438000bb57b92ad232896be9530aaab49
| * | | Merge "resolve merge conflicts of 5cc7bbdbb to ub-launcher3-dorval-polish" ↵Sunny Goyal2017-06-121-11/+4
| |\ \ \ | | | | | | | | | | | | | | | into ub-launcher3-dorval-polish
| | * \ \ resolve merge conflicts of 5cc7bbdbb to ub-launcher3-dorval-polishSunny Goyal2017-06-121-11/+4
| | |\ \ \ | | | |/ / | | |/| | | | | | | | | | | | Test: I solemnly swear I tested this conflict resolution. Change-Id: If3359341d5269f2c908b3a8856b6f38ba69a05eb
* | | | | Merge "Some cleanups in Workspace.java class 1. Make instance variables ↵Rajeev Kumar2017-06-121-37/+34
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | final 2. Get rid of explicit type arguments that can be inferred 3. Get rid of redundant initializer 4. Get rid of unnecessary ;" into ub-launcher3-dorval-polish am: b685d10edb Change-Id: I99e94329319adeb6255365890e75bc3c55823579
| * | | | Merge "Some cleanups in Workspace.java class 1. Make instance variables ↵Rajeev Kumar2017-06-121-37/+34
| |\ \ \ \ | | |/ / / | |/| | | | | | | | final 2. Get rid of explicit type arguments that can be inferred 3. Get rid of redundant initializer 4. Get rid of unnecessary ;" into ub-launcher3-dorval-polish
| | * | | Some cleanups in Workspace.java classRajeev Kumar2017-06-121-37/+34
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 1. Make instance variables final 2. Get rid of explicit type arguments that can be inferred 3. Get rid of redundant initializer 4. Get rid of unnecessary ; Bug: 62466540 Change-Id: Ia534fb032c20447e604011d466aa3efdfade4027
* | | | | Merge "1. Replace use of java.util.HashMap with android.util.ArrayMap in ↵Rajeev Kumar2017-06-121-8/+4
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ShortcutCache class 2. Get rid of unused constants from ShortcutCache class 3. Make instance variables final" into ub-launcher3-dorval-polish am: 606d3836a5 Change-Id: Ic2b454a3fba4092e63933642a7f651f9e2fbea15
| * | | | Merge "1. Replace use of java.util.HashMap with android.util.ArrayMap in ↵Rajeev Kumar2017-06-121-8/+4
| |\ \ \ \ | | |/ / / | |/| | | | | | | | ShortcutCache class 2. Get rid of unused constants from ShortcutCache class 3. Make instance variables final" into ub-launcher3-dorval-polish
| | * | | 1. Replace use of java.util.HashMap with android.util.ArrayMap inRajeev Kumar2017-06-121-8/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ShortcutCache class 2. Get rid of unused constants from ShortcutCache class 3. Make instance variables final Bug: 62466540 Change-Id: I465da77aa1521790c8359d0f9987d3fc1286b44b
* | | | | Merge "Making some constants accessible" into ub-launcher3-dorval-polishSunny Goyal2017-06-121-1/+1
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: 97d7491343 Change-Id: I219f6ccf8a3819b980a7a6fb285767a6aa0d10ed
| * | | | Merge "Making some constants accessible" into ub-launcher3-dorval-polishTreeHugger Robot2017-06-121-1/+1
| |\ \ \ \ | | |/ / / | |/| | |
| | * | | Making some constants accessibleSunny Goyal2017-06-091-1/+1
| | | | | | | | | | | | | | | | | | | | Change-Id: Id5caff8defe8ccc4a79e1c99b0040abb1750b3e1
* | | | | Merge commit 'refs/changes/47/2394847/4' of ↵Sunny Goyal2017-06-121-11/+4
|\ \ \ \ \ | | |_|/ / | |/| | | | | | | | | | | | | | | | | | sso://googleplex-android/platform/packages/apps/Launcher3 into am-5eee1265-440d-4109-93c9-46ee7ae611fc Change-Id: I2cedaed575c90aae3684769ce6621fe68b9f06b3
| * | | | Removing dependency on onAttachedToWindow callback.Sunny Goyal2017-06-121-11/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When resizing in multi-window mode, the system reuses the decorView and may not call onAttachedToWindow. Bug: 62495747 Bug: 38463796 Change-Id: I949f8f8e37b5a4748947024df09097f15c940bf8
* | | | | Merge "Replacing png asset with vector drawable" into ub-launcher3-dorval-polishSunny Goyal2017-06-128-0/+129
|\ \ \ \ \ | | |/ / / | |/| | | | | | | | | | | | | | | | | | am: 9c1e80cfe1 Change-Id: Ic9b2f258950aa5977d7ff55d5052a594e078b400
| * | | | Merge "Replacing png asset with vector drawable" into ub-launcher3-dorval-polishTreeHugger Robot2017-06-128-0/+129
| |\ \ \ \
| | * | | | Replacing png asset with vector drawableSunny Goyal2017-06-118-0/+129
| | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Id3aa5f7a1782052cd646b8935cff5f62e2ee2cdf
* | | | | | Some theme fixesSunny Goyal2017-06-126-31/+27
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: 325b5c7a66 Change-Id: I922c2483680dce3fd4df708141359ab39e3507aa
| * | | | | Some theme fixesSunny Goyal2017-06-116-31/+27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | > workspaceTextColor was not clearly defined to white and relied on HomeScreenElementTheme > Not all attributes were defined in sw720dp. Created a interm style to avoid such errors > Applying proper tint to resize frame > Fixing shadow colors for homescreen icon Change-Id: If8441011c968291de50b2fd8d7612ce3d5353b95
* | | | | | Revert changes made in http://ag/2388716 as we have few open questionsRajeev Kumar2017-06-091-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | about the performance loss because of this CL. Change-Id: I4c499b176dbd80a31f2088ece27346077fbbcdec Bug: 62466540
* | | | | | Replace use of java.util.HashMap with android.util.ArrayMap in ↵Rajeev Kumar2017-06-090-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | AnimationLayerSet. am: 7886c037f8 Change-Id: Iad03819a55b48d0e83102c8b7e04469b156d74ec
| * | | | | Replace use of java.util.HashMap with android.util.ArrayMap inRajeev Kumar2017-06-091-5/+4
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | AnimationLayerSet. Change-Id: I8563d17d97ff36c2b07f73ecb73b0a355780355e Bug: 62466540 (cherry picked from commit 20ecc54ebd2913f1e6a8d156be9ae0f8ca874a37)
* | | | | Merge "Replace use of java.util.HashMap with android.util.ArrayMap in ↵Rajeev Kumar2017-06-091-4/+2
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | DrawableFactory." into ub-launcher3-master
| * | | | | Replace use of java.util.HashMap with android.util.ArrayMapRajeev Kumar2017-06-091-4/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | in DrawableFactory. Change-Id: I4ab7f908c3e8768762942ca83f576197dfea66d6 Bug: 62466540
* | | | | | Merge "Replace use of java.util.HashMap with android.util.ArrayMap in ↵Rajeev Kumar2017-06-093-46/+38
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | AutoInstallsLayout, DefaultLayoutParser, ImportDataTask classes." into ub-launcher3-master
| * | | | | | Replace use of java.util.HashMap with android.util.ArrayMap inRajeev Kumar2017-06-093-46/+38
| |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | AutoInstallsLayout, DefaultLayoutParser, ImportDataTask classes. Change-Id: Idcf1f5f020132ddf43751067a38a64bfc088800e Bug: 62466540
* | | | | | Merge "Replace use of java.util.HashMap with android.util.ArrayMap in ↵Rajeev Kumar2017-06-091-5/+4
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | AnimationLayerSet." into ub-launcher3-master
| * | | | | | Replace use of java.util.HashMap with android.util.ArrayMap inRajeev Kumar2017-06-091-5/+4
| |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | AnimationLayerSet. Change-Id: I8563d17d97ff36c2b07f73ecb73b0a355780355e Bug: 62466540
* | | | | | Merge "Replace use of java.util.HashMap with ↵Rajeev Kumar2017-06-091-2/+2
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | | | | | | android.support.v4.util.ArrayMap." into ub-launcher3-master
| * | | | | Replace use of java.util.HashMap with android.support.v4.util.ArrayMap.Rajeev Kumar2017-06-091-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Note: I could not use android.util.ArrayMap as it is a final class. Change-Id: I1314961885dfbaa427cb830bdbd3d1f494be63d2 Bug: 62466540
* | | | | | Title style for text setting font family.Mario Bertschler2017-06-092-1/+5
|\ \ \ \ \ \ | |/ / / / / |/| / / / / | |/ / / / | | | | | | | | | | am: 93e39ecdeb Change-Id: If2fc91aef3a47524fe9fc1aff1d17f3d515383d5
| * | / / Title style for text setting font family.Mario Bertschler2017-06-092-1/+5
| | |/ / | |/| | | | | | | | | | | | | | | | | | b/62389480 Change-Id: I93135d99487a18e2a74d0e197955898cec40072b
* | | | Fixing Drawable not getting tinted properly if the color is always transparentSunny Goyal2017-06-091-0/+1
|\| | | | | | | | | | | | | | | | | | | | | | | am: 7bffad10cc Change-Id: Ie292bb22e9152f42f0280752adac7be3dc30a29b
| * | | Fixing Drawable not getting tinted properly if the color is always transparentSunny Goyal2017-06-091-0/+1
| | | | | | | | | | | | | | | | | | | | Bug: 62457537 Change-Id: I04b8804162b7338f62d3fdabb87dd31ad507ebaa
* | | | Merge "Updating the WallpaperManagerCompatVL to use JobSchedular instead of ↵Sunny Goyal2017-06-083-22/+72
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | intent service" into ub-launcher3-dorval-polish am: e6711ceeb6 Change-Id: I55c1ebccabdb185e502d1aeef97e808a2cb783e5
| * | | Merge "Updating the WallpaperManagerCompatVL to use JobSchedular instead of ↵TreeHugger Robot2017-06-083-22/+72
| |\ \ \ | | | | | | | | | | | | | | | intent service" into ub-launcher3-dorval-polish
| | * | | Updating the WallpaperManagerCompatVL to use JobSchedular instead of intent ↵Sunny Goyal2017-06-083-22/+72
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | service Bug: 62065291 Change-Id: I5872cea1b110268e9593eeb6397e94ecea1bc03d
* | | | | resolve merge conflicts of 7092db024 to ub-launcher3-dorval-polishTony Wickham2017-06-080-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: 0ecf5bcfcb Change-Id: I53fe694e3fc1c68363cb15ae0f6dbe8097cdcade
| * | | | resolve merge conflicts of 7092db024 to ub-launcher3-dorval-polishTony Wickham2017-06-087-26/+66
| |\ \ \ \ | | |/ / / | |/| / / | | |/ / | | | | Test: I solemnly swear I tested this conflict resolution.x Change-Id: I0f9ed3d42fcb04299c3c23d06629f855614c0538
* | | | Trigger theme change if supportsDarkText is switching.Mario Bertschler2017-06-081-1/+2
|\| | | | | | | | | | | | | | | | | | | | | | | am: 6d55202c9b Change-Id: I36e55960b384ad2d7b927cddf52078c387d4dfcf
| * | | Trigger theme change if supportsDarkText is switching.Mario Bertschler2017-06-081-1/+2
| | | | | | | | | | | | | | | | Change-Id: Id5ec0429b5fb94d742dfac093263144f71f0d6b7
* | | | Merge "Merge commit 'refs/changes/42/2374342/1' of ↵Tony Wickham2017-06-087-26/+66
|\ \ \ \ | | | | | | | | | | | | | | | sso://googleplex-android/platform/packages/apps/Launcher3" into ub-launcher3-master
| * | | | Merge commit 'refs/changes/42/2374342/1' of ↵Tony Wickham2017-06-087-26/+66
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | sso://googleplex-android/platform/packages/apps/Launcher3 Change-Id: I85dc9f76f21ebbe156ef68bcb5a11c28c8d871ba
* | | | | Add support for color extracted notification dots skipped: 7092db0241Tony Wickham2017-06-080-0/+0
|\ \ \ \ \ | | |_|/ / | |/| | | | | | | | Change-Id: I22dab75a3695d509c0453af00b5c0436a69c5f45
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-27 10:35:49 +0000