summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* am 0c2918f4: Use View.generateViewId if availableIan Parkinson2014-10-061-12/+13
|\ | | | | | | | | * commit '0c2918f4f4c4a9a6609b82cf23155ed51840f2c8': Use View.generateViewId if available
| * Use View.generateViewId if availableIan Parkinson2014-10-061-12/+13
| | | | | | | | | | Bug: 17456181 Change-Id: Ib7e310ba38ed5e392c5c9b8734f197212f518389
* | Merge "Create a central list of files the Launcher writes to the app ↵Helena Josol2014-10-065-13/+39
|\ \ | | | | | | | | | directory" into ub-now-queens
| * | Create a central list of files the Launcher writes to the app directoryHelena Josol2014-10-065-13/+39
| | | | | | | | | | | | | | | | | | | | | Replace hardcoded Launcher filenames with the defined constants. Bug: 12753154 Change-Id: I072f202d9388a703b9e6851bde64ea7fafe4b10a
* | | am 4b8d11fc: Add missing xxhdpi assetAdam Cohen2014-10-031-0/+0
|\ \ \ | |/ / |/| / | |/ | | * commit '4b8d11fcb396760eca75cf2b055a7acd05c594ec': Add missing xxhdpi asset
| * Add missing xxhdpi assetAdam Cohen2014-10-031-0/+0
| | | | | | | | | | Bug: 17813013 Change-Id: If1e3448fb109e3f7f0c1ae6562a795fecf3bdf42
* | am 0cd27191: Merge "Remove reference to CODENAME from compat code." into ↵Kenny Guy2014-10-031-3/+4
|\| | | | | | | | | | | | | ub-now-porkchop * commit '0cd271918a7c7baa69e872f7128351a0c7dbbbae': Remove reference to CODENAME from compat code.
| * Merge "Remove reference to CODENAME from compat code." into ub-now-porkchopKenny Guy2014-10-031-3/+4
| |\
| | * Remove reference to CODENAME from compat code.Kenny Guy2014-10-031-3/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes bug with uninstalling apps for managed profile as codename check means it fails to include the user when uninstalling the app. Bug: 17800161 Change-Id: I6901eff5aa8f00fb3b859e8db37930b95f031625
* | | am 52077b7a: Merge "Don\'t let old Launcher activity interfere with new one" ↵Adam Cohen2014-09-302-3/+14
|\| | | | | | | | | | | | | | | | | | | | into ub-now-porkchop * commit '52077b7a951153ce77e7354c6096b3bcfbec8c3e': Don't let old Launcher activity interfere with new one
| * | Merge "Don't let old Launcher activity interfere with new one" into ↵Adam Cohen2014-09-302-3/+14
| |\ \ | | | | | | | | | | | | ub-now-porkchop
| | * | Don't let old Launcher activity interfere with new oneAdam Cohen2014-09-302-3/+14
| | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | -> Launcher uses a static instance of it's loader (across multiple activities) since activities can come and go (configuration change, eg.) but the data model and loading is static. -> Currently, this is not robust to a sequence of events that looks like onCreate(instance A), onCreate(instance B), onDestroy(instance B) -- depending on the timing of those calls. -> This CL addresses a symptom of the above scenario by not allowing an older Launcher Activity cancel the loader / clear the callbacks for a newer Activity. Bug 17679693 Change-Id: I8ece93e288464b0d578b9669c165b67132d997ed
* | | am 2ed99e86: Build Launcher3 against prebuilt SDK 21Bjorn Bringert2014-09-301-2/+1
|\| | | | | | | | | | | | | | * commit '2ed99e861b4be73620fd6fdc24a13230e096921c': Build Launcher3 against prebuilt SDK 21
| * | Build Launcher3 against prebuilt SDK 21Bjorn Bringert2014-09-301-2/+1
| |/ | | | | | | | | Bug: 17507423 Change-Id: I9d6dc856bb29e5d0b3926bde437895d0f2ca7b74
* | am 6d467e27: Merge "Resetting launcherProvider data if restore set was ↵Sunny Goyal2014-09-293-7/+39
|\| | | | | | | | | | | | | empty" into ub-now-porkchop * commit '6d467e27b7e16442d3fb56af2aa3d94e657dff25': Resetting launcherProvider data if restore set was empty
| * Merge "Resetting launcherProvider data if restore set was empty" into ↵Sunny Goyal2014-09-293-7/+39
| |\ | | | | | | | | | ub-now-porkchop
| | * Resetting launcherProvider data if restore set was emptySunny Goyal2014-09-283-7/+39
| | | | | | | | | | | | | | | Bug: 17332300 Change-Id: I6d2187cd1b1fa7a53e49b96eb109263f6b74b258
* | | am 10047138: (-s ours) Merge "Import translations. DO NOT MERGE" into ↵Baligh Uddin2014-09-290-0/+0
|\| | | | | | | | | | | | | | | | | | | | ub-now-porkchop * commit '1004713867fa4476201c02c95f35c64361a6dcf2': Import translations. DO NOT MERGE
| * | Merge "Import translations. DO NOT MERGE" into ub-now-porkchopBaligh Uddin2014-09-283-25/+25
| |\ \ | | |/ | |/|
| | * Import translations. DO NOT MERGEBaligh Uddin2014-09-253-25/+25
| | | | | | | | | | | | | | | Change-Id: I619612c919567fdaec3d7d0f5b9a33c94439c759 Auto-generated-cl: translation import
* | | am c5fb59fb: Fixing loadWorkspace being called multiple times Using right ↵Sunny Goyal2014-09-263-6/+6
|\| | | | | | | | | | | | | | | | | | | | intent when refreshing shortcut icons * commit 'c5fb59fb9a36180ce962f565d85aa92f9991da1a': Fixing loadWorkspace being called multiple times Using right intent when refreshing shortcut icons
| * | Fixing loadWorkspace being called multiple timesSunny Goyal2014-09-263-6/+6
| |/ | | | | | | | | | | | | | | Using right intent when refreshing shortcut icons Bug: 17662782 Bug: 17663766 Bug: 17569197 Change-Id: I8d698c5e2145b8412aff9978db4ec930d89f7f24
* | am f876301d: UI FixesSunny Goyal2014-09-2413-2/+7
|\| | | | | | | | | * commit 'f876301d0a460bec260a3c7a6ab260a06d5817ba': UI Fixes
| * UI FixesSunny Goyal2014-09-2313-2/+7
| | | | | | | | | | | | | | | | | | | | | | | | > Adding a scrim to the longpress cling Bug: 17573777 High level design asks (very low-risk) > Changing the dialog to use device default theme > Updating screenpanel assets Change-Id: Ia0216b60fd8cd607d83a5e7c3d7e6c8255125eda
* | Source change to get code compiling on google3Sameer Padala2014-09-223-4/+4
| | | | | | | | Change-Id: Ib16df8dd9caa04903a664d8cf92767107fe57628
* | am d8f6253e: Merge "When ensuring screen exists, make sure it\'s actually ↵Adam Cohen2014-09-201-2/+12
|\| | | | | | | | | | | | | referring to a screen, not a rank" into ub-now-porkchop * commit 'd8f6253e67d23dcdcf521b0558f193ae832743b2': When ensuring screen exists, make sure it's actually referring to a screen, not a rank
| * Merge "When ensuring screen exists, make sure it's actually referring to a ↵Adam Cohen2014-09-201-2/+12
| |\ | | | | | | | | | screen, not a rank" into ub-now-porkchop
| | * When ensuring screen exists, make sure it's actually referring to a screen, ↵Adam Cohen2014-09-191-2/+12
| | | | | | | | | | | | | | | | | | | | | not a rank Bug: 17496589 Change-Id: If60e22dd71fa32530db91e37057689de5fb25646
* | | am 68207e25: (-s ours) Merge "Import translations. DO NOT MERGE" into ↵Baligh Uddin2014-09-200-0/+0
|\| | | | | | | | | | | | | | | | | | | | ub-now-porkchop * commit '68207e2532b2059e513a1c4e33c3c52e1ac1e559': Import translations. DO NOT MERGE
| * | Merge "Import translations. DO NOT MERGE" into ub-now-porkchopBaligh Uddin2014-09-204-9/+9
| |\ \
| | * | Import translations. DO NOT MERGEBaligh Uddin2014-09-164-9/+9
| | | | | | | | | | | | | | | | | | | | Change-Id: I4deb7f12992c8e75f889a434ce12df204d78265e Auto-generated-cl: translation import
* | | | Merge "Import translations. DO NOT MERGE" into ub-now-queensBaligh Uddin2014-09-204-9/+9
|\ \ \ \
| * | | | Import translations. DO NOT MERGEBaligh Uddin2014-09-164-9/+9
| | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Iaaff1b91e8c73ba13b6755ce8532b6a714c6340a Auto-generated-cl: translation import
* | | | | am acefecbf: Merge "Updating promise icon\'s bitmap and label when ↵Sunny Goyal2014-09-196-8/+95
|\ \ \ \ \ | | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | onBadgingChanged is received" into ub-now-porkchop * commit 'acefecbff3141b43dc55fe18146cf842d1d4a8ae': Updating promise icon's bitmap and label when onBadgingChanged is received
| * | | | Merge "Updating promise icon's bitmap and label when onBadgingChanged is ↵Sunny Goyal2014-09-196-8/+95
| |\ \ \ \ | | | | | | | | | | | | | | | | | | received" into ub-now-porkchop
| | * | | | Updating promise icon's bitmap and label when onBadgingChanged is receivedSunny Goyal2014-09-196-8/+96
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 17583799 Change-Id: I68b4f9d4086c43bd949ad8b46b574ec78edb32db
* | | | | | am 7e053f87: Merge "Changing intent action for auto installs" into ↵Sunny Goyal2014-09-191-1/+1
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ub-now-porkchop * commit '7e053f8784c886359f911161db5fd8b61333450d': Changing intent action for auto installs
| * | | | | Merge "Changing intent action for auto installs" into ub-now-porkchopSunny Goyal2014-09-191-1/+1
| |\ \ \ \ \
| | * | | | | Changing intent action for auto installsSunny Goyal2014-09-191-1/+1
| | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | Bug: 17425805 Change-Id: I12e94860206ed62d6ba04f0b5734cc55ba414e45
* | | | | | am 66af82cc: Merge "Adding support to delete unrestored icons and widgets" ↵Sunny Goyal2014-09-196-19/+72
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into ub-now-porkchop * commit '66af82cca76b313366e5429489aed85679c2c76e': Adding support to delete unrestored icons and widgets
| * | | | | Merge "Adding support to delete unrestored icons and widgets" into ↵Sunny Goyal2014-09-196-19/+72
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | ub-now-porkchop
| | * | | | | Adding support to delete unrestored icons and widgetsSunny Goyal2014-09-196-19/+72
| | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | Bug: 17584719 Change-Id: If8e76fc80ea885c9004c50b7b6a9353525a50105
* | | | | | am 92e97dcc: Merge "Fix: First run cling shoud show \'Welcome\' when there ↵Sunny Goyal2014-09-191-1/+1
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | is no migration cling" into ub-now-porkchop * commit '92e97dccab3d7016e0740648e1d467e37a42f3f8': Fix: First run cling shoud show 'Welcome' when there is no migration cling
| * | | | | Merge "Fix: First run cling shoud show 'Welcome' when there is no migration ↵Sunny Goyal2014-09-191-1/+1
| |\ \ \ \ \ | | |_|_|_|/ | |/| | | | | | | | | | cling" into ub-now-porkchop
| | * | | | Fix: First run cling shoud show 'Welcome' when there is no migration clingSunny Goyal2014-09-191-1/+1
| | |/ / / | | | | | | | | | | | | | | | | | | | | Bug: 17582926 Change-Id: I662e0ed9f12d237ee34a8f4540b339edee08c611
* | | | | am ddd5aaaf: Merge "Perform null check in animation complete" into ↵Adam Cohen2014-09-181-3/+5
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ub-now-porkchop * commit 'ddd5aaaf354beb5add6bcc2560c4f975d49a9f6a': Perform null check in animation complete
| * | | | Merge "Perform null check in animation complete" into ub-now-porkchopAdam Cohen2014-09-181-3/+5
| |\ \ \ \
| | * | | | Perform null check in animation completeAdam Cohen2014-09-181-3/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug 17561235 Change-Id: I280dca9e03eed3f4e1edd97f2f8efac0b5e4b29d
* | | | | | am c0b89b72: Merge "Update calls now we have an L API version." into ↵Kenny Guy2014-09-188-20/+20
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ub-now-porkchop * commit 'c0b89b72af01c6e7bf805f29fa6cc531d6388b6f': Update calls now we have an L API version.
| * | | | | Merge "Update calls now we have an L API version." into ub-now-porkchopKenny Guy2014-09-188-20/+20
| |\ \ \ \ \