summaryrefslogtreecommitdiffstats
path: root/src
Commit message (Collapse)AuthorAgeFilesLines
* Trebuchet: Change multiplication signblack2014-11-192-5/+4
| | | | Change-Id: I3f91cb651af53f5d2a4005477011b7a48e4a46e7
* Customizeable Dynamic Grid:Raj Yengisetty2014-11-199-122/+508
| | | | | | | | | | | | | | | | | | | - Presets - Comfortable (+0) - Cozy (+1) - Condensed (+2) - Custom option with min, max Reordering items in the settings pane for better organization Modifying Settings Layout for readability Conflicts: res/layout/settings_pane_list_item.xml res/values/cm_strings.xml src/com/android/launcher3/DeviceProfile.java src/com/android/launcher3/list/SettingsPinnedHeaderAdapter.java Change-Id: I5c926b6ca4b2ed73c263ef34eeb368caeb7af9b5
* Trebuchet: Change icon labels option stringsblack2014-11-192-16/+50
| | | | | | | Conflicts: src/com/android/launcher3/OverviewSettingsPanel.java Change-Id: I499ec846bf2c7b2dc1c0d39c2c62a2525412335c
* Replace ugly Drawer setting (Sort Mode)Raj Yengisetty2014-11-192-3/+17
| | | | Change-Id: Iabedd48c43cd30ea747af093fad6d3874495bced
* Remove old preference activityRaj Yengisetty2014-11-191-1/+1
| | | | | | | | | | | * Also cleanup & remove unused strings Conflicts: AndroidManifest.xml WallpaperPicker/src/com/android/launcher3/WallpaperPickerActivity.java res/values/cm_strings.xml Change-Id: I0b9f2405ab98b0df612a18ccfaa5d9ba98876d8a
* Move Scrolling Wallpaper to new Trebuchet SettingsRaj Yengisetty2014-11-192-0/+47
| | | | | | | | Conflicts: src/com/android/launcher3/OverviewSettingsPanel.java src/com/android/launcher3/list/SettingsPinnedHeaderAdapter.java Change-Id: I57961ae9b6f0df334ddd2c4563ddfd7e2939f01e
* Fixed: Empty status for Protected Apps any other non-state settings don't ↵Raj Yengisetty2014-11-191-0/+13
| | | | | | | | | get cached view information from other settings. Conflicts: src/com/android/launcher3/list/SettingsPinnedHeaderAdapter.java Change-Id: I8be1949ccaad326ce97ed76f0ce8ec328b757a6e
* Protected App [3/3] Trebuchet - Protected Apps - Build fixed to work with ↵Raj Yengisetty2014-11-1912-13/+832
| | | | | | | | | | | | | | | | | LOCAL_SDK_VERSION - Fixed adding components to protected folders and adding protected folders to other folders - Fixed issues with EditText for FolderName - Adding support for Settings hooks - Uses Setting's LockPattern for Protected Apps - Add Read from Settings Secure DB (DO NOT WRITE!) - Protecting a folder updates Launcher without restart - Batch send component visibility Conflicts: AndroidManifest.xml res/values/preferences_defaults.xml src/com/android/launcher3/AppsCustomizePagedView.java src/com/android/launcher3/Folder.java src/com/android/launcher3/FolderIcon.java src/com/android/launcher3/Launcher.java src/com/android/launcher3/LauncherModel.java src/com/android/launcher3/LauncherProvider.java src/com/android/launcher3/OverviewSettingsPanel.java Change-Id: I41c295e7f2c9abc9b2e77e6e3d39b7ca60d47139
* Trebuchet: Remove duplicate stringMichael Bestas2014-11-193-11/+9
| | | | Change-Id: I5a1ed314ca05eb4771038c0e08c4695ed51b3f92
* PagedView: Transition EffectsNebojsa Cvetkovic2014-11-199-122/+735
| | | | | | | | | | | | | | | | Conflicts: res/layout/overview_panel.xml res/values/cm_arrays.xml res/values/cm_strings.xml res/values/dimens.xml res/values/preferences_defaults.xml src/com/android/launcher3/AppsCustomizePagedView.java src/com/android/launcher3/Launcher.java src/com/android/launcher3/PagedView.java src/com/android/launcher3/Workspace.java src/com/android/launcher3/settings/SettingsProvider.java Change-Id: Ib134705952877165c334181548d577b3dceece68
* Trebuchet Settings UI Refresh.Raj Yengisetty2014-11-1916-80/+3834
| | | | | | | | | | | | | | | | | | - Overview Panel contains all Launcher Settings - Accessible through long press on Workspace or HW Menu button - Settings are held in a SlidingPanel in the Overview Panel - Replace the Settings shortcut in Overview Panel with Themes shortcut - Replace widgets icon with new widgets icon from Launcher3 - Trebuchet Settings changes no longer require restarting Process - Transition Effects have PNG Sequence to show animation sequence - Remove PageIndicator click event to open Overview Panel in AppTray Contributors: Adrian Foulk - UX Lead Abishek Devkota - Project Manager Hayden Schoen - UX Designer Change-Id: I2186213960cf12e840e814757894fe104551856b
* Merge "Fixing typo from previous CL" into ub-now-porkchopAdam Cohen2014-10-141-0/+1
|\
| * Fixing typo from previous CLAdam Cohen2014-10-141-0/+1
| | | | | | | | | | | | Bug 17969770 Change-Id: I4ea04864000d2ed8368ca81ba8cff42b4208d13d
* | Merge "Fix missing screen when adding widget directly to provider" into ↵Adam Cohen2014-10-141-20/+31
|\| | | | | | | ub-now-porkchop
| * Fix missing screen when adding widget directly to providerAdam Cohen2014-10-141-20/+31
| | | | | | | | | | bug: 17969770 Change-Id: Icbd8451d8adde0519917a7bf06365517405759fe
* | DO NOT MERGESunny Goyal2014-10-143-2/+79
|/ | | | | | | Rechecking unrestored items when launcher gets created Bug: 17941096 Change-Id: Ic54464a9c64442d6784cda44ef22fa3d08e22f1f
* Use View.generateViewId if availableIan Parkinson2014-10-061-12/+13
| | | | | Bug: 17456181 Change-Id: Ib7e310ba38ed5e392c5c9b8734f197212f518389
* 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
* | 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
* Resetting launcherProvider data if restore set was emptySunny Goyal2014-09-283-7/+39
| | | | | Bug: 17332300 Change-Id: I6d2187cd1b1fa7a53e49b96eb109263f6b74b258
* 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
* UI FixesSunny Goyal2014-09-231-1/+2
| | | | | | | | | | | | > 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
* 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
* | 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
* | | 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
* | | 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
* | | 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
* | 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
* | | Merge "Update calls now we have an L API version." into ub-now-porkchopKenny Guy2014-09-187-19/+19
|\ \ \
| * | | Update calls now we have an L API version.Kenny Guy2014-09-187-19/+19
| |/ / | | | | | | | | | | | | Bug: 17543647 Change-Id: I92c652a4ced5a5e783b24e42f9da4d9dfe1118ba
* / / Remove catch now api has hit googlefood.Kenny Guy2014-09-181-10/+2
|/ / | | | | | | | | Bug: 17543647 Change-Id: Ie0b57719393a705e8c02b226d3e3f57dbf43d800
* / Fix NPE in WorkspaceAdam Cohen2014-09-171-1/+1
|/ | | | | Bug: 17503479 Change-Id: Ib20dfd67c5a755cd4b684163bb538a1bf77fa6ca
* Merge "Setting context in LauncherAppState before initialising it, as it can ↵Sunny Goyal2014-09-171-0/+1
|\ | | | | | | be called from a BroadcastReceiver" into ub-now-porkchop
| * Setting context in LauncherAppState before initialising it,Sunny Goyal2014-09-161-0/+1
| | | | | | | | | | | | | | as it can be called from a BroadcastReceiver Bug: 17519159 Change-Id: I0434a3d1c392e8861eb759d88942deaf98116c19
* | Merge "Null check in flushInvalidIcons" into ub-now-porkchopSunny Goyal2014-09-171-1/+2
|\ \
| * | Null check in flushInvalidIconsSunny Goyal2014-09-151-1/+2
| |/ | | | | | | | | | | | | | | > Icons in a CacheEntry can be null, for a restored app. No need to flush such entries on DeviceProfileChange Bug: 17489687 Change-Id: If6e76206ae5bd8201c9928257706224f2f34c232
* | Merge "Updating shourcuts only when the corresponding user also matches the ↵Sunny Goyal2014-09-171-15/+28
|\ \ | | | | | | | | | AppInfo" into ub-now-porkchop
| * | Updating shourcuts only when the corresponding user also matches the AppInfoSunny Goyal2014-09-121-15/+28
| | | | | | | | | | | | | | | issue: 17480447 Change-Id: I0afbd80e760b7b73b84e483be325b2e905d65a00
* | | Merge "Using ApplicationContext in static objects" into ub-now-porkchopSunny Goyal2014-09-173-7/+5
|\ \ \
| * | | Using ApplicationContext in static objectsSunny Goyal2014-09-153-7/+5
| | |/ | |/| | | | | | | | | | Bug: 17507543 Change-Id: I1651b694acabaf62188dd4ba42739b64a60194c3
* | | Merge "Remove STOPSHIPs from GSA 4.0" into ub-now-porkchopDharmesh Mokani2014-09-173-33/+7
|\ \ \ | |/ / |/| |
| * | Remove STOPSHIPs from GSA 4.0Dharmesh Mokani2014-09-123-33/+7
| | | | | | | | | | | | | | | | | | | | | Added stopships so that GSA won't crash on older L release. Bug: 17443440 Change-Id: I792eb53d5021118bdb09c44ffae7a8286a0cd69b
* | | Merge "Disabling debug logs" into ub-now-porkchopSunny Goyal2014-09-141-2/+2
|\ \ \ | |/ / |/| |