summaryrefslogtreecommitdiffstats
path: root/res
Commit message (Collapse)AuthorAgeFilesLines
* Merge "Import translations. DO NOT MERGE" into ub-now-novaBaligh Uddin2014-04-241-2/+2
|\
| * Import translations. DO NOT MERGEBaligh Uddin2014-04-231-2/+2
| | | | | | | | | | Change-Id: I4c91fa67d3ea6c6831d685d6457cab78537aa0c1 Auto-generated-cl: translation import
* | Avoid wrapping cling titles on small screens.Jeff Sharkey2014-04-231-2/+2
|/ | | | | | | Only allow font size bump on large-screen English devices. Bug: 13340779 Change-Id: I21e10bd21b30803386fdb62b87b0fbdf8efd6731
* Merge "Allow the old launcher content URI to be overrided" into ↵Adam Cohen2014-04-171-0/+4
|\ | | | | | | ub-now-mister-ugly
| * Allow the old launcher content URI to be overridedJason Monk2014-03-211-0/+4
| | | | | | | | | | | | | | | | | | | | Move the URI used to import favorites from launcher2 to be loaded from a string resource. This allows it to be overridden. This will enable permissions fix for GoogleSearch. Bug: 12058200 Change-Id: I31243fe89f545c9771d5cceffe1c9e7668a42bc5
* | Import translations. DO NOT MERGEBaligh Uddin2014-04-091-1/+1
| | | | | | | | | | Change-Id: I79cba96f30222edc7c238c69ba39c42e5796dc94 Auto-generated-cl: translation import
* | Import translations. DO NOT MERGEBaligh Uddin2014-04-0755-110/+55
| | | | | | | | | | Change-Id: I1e236770eb6f0b892aa0062eee00f9cdb918d307 Auto-generated-cl: translation import
* | Import translations. DO NOT MERGEBaligh Uddin2014-04-0256-56/+111
| | | | | | | | | | Change-Id: If301cb07c8b50249a8e657c2ebe6d0f86f613b26 Auto-generated-cl: translation import
* | update strings for welcome backChris Wren2014-04-011-1/+1
| | | | | | | | | | Bug: 13531041 Change-Id: Iabcb40df50850bd91b9ec972b407e4267960e4b9
* | Import translations. DO NOT MERGEBaligh Uddin2014-03-194-5/+5
|/ | | | | Change-Id: Ie0317b94dd08597383b981fa196391728baa0b09 Auto-generated-cl: translation import
* Import translations. DO NOT MERGEGeoff Mendal2014-03-1727-261/+131
| | | | | Change-Id: I6bcf984e6fdb29a2a3b6f449e27bf2da2b7d95b3 Auto-generated-cl: translation import
* Import translations. DO NOT MERGEBaligh Uddin2014-03-1256-1/+416
| | | | | Change-Id: Ie89bb39579db28c38425b05d1fa62cbcbf77696f Auto-generated-cl: translation import
* Merge "update promise icon status" into ub-now-mister-uglyChris Wren2014-03-112-0/+33
|\
| * update promise icon statusChris Wren2014-03-112-0/+33
| | | | | | | | | | | | | | also fix a crash in LauncherModel.DEBUG_LOADERS Bug: 10778992 Change-Id: Iafc28c1e0c2f2a1283783a7ce27e181634b62993
* | Merge "Add support for uri favorites and resolve groups" into ub-now-mister-uglyJason Monk2014-03-102-24/+73
|\ \ | |/ |/|
| * Add support for uri favorites and resolve groupsJason Monk2014-03-072-24/+73
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Adds support for new types in default_workspace xml files. Adds support to favorite that attempts to resolve an intent specified by URI. If a logical choice can be found from the resolve, it adds the shortcut. Adds support for a resolve, which contains several favorites and attempts to add the shortcuts until one is successful. Bug: 10547358 Change-Id: Ia30341e77e7d4a0bd4a4f4e6a3d9ce2a48a46237
* | Import translations. DO NOT MERGEBaligh Uddin2014-02-2456-224/+0
|/ | | | | Change-Id: I695c7a40bf0130120d380c788841cedfc7b91c34 Auto-generated-cl: translation import
* Fix issue where clings didn't appear after set up wizard (issue 13077829)Adam Cohen2014-02-212-44/+0
| | | | | | | | | | | -> Also removed the db-created as a criteria for showing the clings (this was a bit problematic in some cases and going forward) -> Instead, we use database upgrade as a signal to not show the clings. This is used instead of the above criteria (to prevent old users from seeing the migration cling and losing their data.) -> Stripped some old code related to custom clings that's no longer used. Change-Id: Ib5e5285e5ddbc60e69eb998ee9fd092ae879150d
* Import translations. DO NOT MERGEBaligh Uddin2014-02-101-2/+2
| | | | | Change-Id: Icb76bf81b4253215543f7e384efac9eb23e0c432 Auto-generated-cl: translation import
* Merge "Missing paddingRight added." into ub-now-lunchboxYura2014-02-041-0/+1
|\
| * Missing paddingRight added.Yura2014-02-041-0/+1
| | | | | | | | | | Bug: 8166178 Change-Id: Ie2ba02a1ad85d29f1028fe021ade37975b453305
* | Import translations. DO NOT MERGEGeoff Mendal2014-02-031-2/+2
|/ | | | | Change-Id: Ieaf2484f1b08841a5fecd5050c4df75125e1cecf Auto-generated-cl: translation import
* Import translations. DO NOT MERGEBaligh Uddin2014-01-2329-107/+57
| | | | | Change-Id: I2e2a6f98fd63d04c55e08e0c11d256105701457a Auto-generated-cl: translation import
* am f8584042: Merge "Updating Tablet clings. (Bug 11973614)" into ↵Winson Chung2014-01-1620-192/+765
|\ | | | | | | | | | | | | jb-ub-now-kermit * commit 'f8584042713aad82f9d057ecaace8a9ad1aad0bc': Updating Tablet clings. (Bug 11973614)
| * Merge "Updating Tablet clings. (Bug 11973614)" into jb-ub-now-kermitWinson Chung2014-01-1620-192/+765
| |\
| | * Updating Tablet clings. (Bug 11973614)Winson Chung2014-01-1620-192/+765
| | | | | | | | | | | | Change-Id: I6cb10424a345691d50c4fac7969e0b97bbee4b3c
* | | am e1b0682a: Merge "Updating screen background assets. (Bug 12136457)" into ↵Winson Chung2014-01-164-0/+0
|\| | | | | | | | | | | | | | | | | | | | jb-ub-now-kermit * commit 'e1b0682af062bc85b7328f5c635a21d9ce420d8e': Updating screen background assets. (Bug 12136457)
| * | Updating screen background assets. (Bug 12136457)Winson Chung2014-01-164-0/+0
| |/ | | | | | | Change-Id: I48d235d9c44a53b5fbf6c244736e86cbc9f19162
| * Import translations. DO NOT MERGEGeoff Mendal2014-01-1556-179/+199
| | | | | | | | | | Change-Id: I7f6ec7de198d8fd863c1a56294609474d2e02a32 Auto-generated-cl: translation import
* | Import translations. DO NOT MERGEGeoff Mendal2014-01-1556-179/+199
| | | | | | | | | | Change-Id: I8f07cab26ae1bd70357157730b8dbe36eca34e0d Auto-generated-cl: translation import
* | am 33778ec0: Merge "Replace "hotseat" with "Favorites tray" in user visible ↵Adrian Roos2014-01-151-2/+2
|\| | | | | | | | | | | | | strings." into jb-ub-now-kermit * commit '33778ec01983646a7941c9b274618126cf1f464e': Replace "hotseat" with "Favorites tray" in user visible strings.
| * Merge "Replace "hotseat" with "Favorites tray" in user visible strings." ↵Adrian Roos2014-01-151-2/+2
| |\ | | | | | | | | | into jb-ub-now-kermit
| | * Replace "hotseat" with "Favorites tray" in user visible strings.Adrian Roos2014-01-141-2/+2
| | | | | | | | | | | | | | | Bug: 12078955 Change-Id: I824948d8820276caab18d6df095754a4cfb67640
* | | am c27a0513: Merge "Remove settings in overview mode for Launcher3." into ↵Jorim Jaggi2014-01-151-1/+2
|\| | | | | | | | | | | | | | | | | | | | jb-ub-now-kermit * commit 'c27a05132042149fdcc926aeebc1a284cece1aa4': Remove settings in overview mode for Launcher3.
| * | Merge "Remove settings in overview mode for Launcher3." into jb-ub-now-kermitJorim Jaggi2014-01-151-1/+2
| |\ \ | | |/ | |/|
| | * Remove settings in overview mode for Launcher3.Jorim Jaggi2014-01-141-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The appereance of the settings button in overview mode is now dependent on a overridable method, such that we can have it in GEL, but not in Launcher3. This change also adjusts the logic of how wide the overview panel is, depending on how many items we have. Bug: 12441429 Change-Id: Ibf537c26602785f565292cbfa213eb123469ebcd
* | | am 24ce0b37: Fixing drop targets in phone / small tablet landscape (issue ↵Adam Cohen2014-01-1510-23/+9
|\| | | | | | | | | | | | | | | | | | | | 12192781) * commit '24ce0b3708b44e738d6ee52477aa4dd917b547e7': Fixing drop targets in phone / small tablet landscape (issue 12192781)
| * | Fixing drop targets in phone / small tablet landscape (issue 12192781)Adam Cohen2014-01-1410-23/+9
| |/ | | | | | | Change-Id: I4dc8a82c8cd5ef279506e7868e33a455fba5a3be
* | am c83d136c: Increasing string length for translation (Bug 12524122)Winson Chung2014-01-131-1/+1
|\| | | | | | | | | * commit 'c83d136ce4a7bde768cbea4d4b263ab6e4eaa9f1': Increasing string length for translation (Bug 12524122)
| * Increasing string length for translation (Bug 12524122)Winson Chung2014-01-131-1/+1
| | | | | | | | Change-Id: I24e053790812779ec07de99c6f763965584a1bb7
| * Import translations. DO NOT MERGEGeoff Mendal2014-01-1356-57/+315
| | | | | | | | | | Change-Id: Ib79d541dac6867d262bb02f04eda43728d7a8357 Auto-generated-cl: translation import
* | Import translations. DO NOT MERGEGeoff Mendal2014-01-1356-57/+315
| | | | | | | | | | Change-Id: I6cf43d3ab8f99f3bda1fd114e2135d7c89797b11 Auto-generated-cl: translation import
* | am 5317c2b7: Updating assets and text for migration cling. (Bug 11973614)Winson Chung2014-01-108-16/+193
|\| | | | | | | | | * commit '5317c2b7adfbfef97edc6ad9b7e007160ef689f4': Updating assets and text for migration cling. (Bug 11973614)
| * Updating assets and text for migration cling. (Bug 11973614)Winson Chung2014-01-108-16/+193
| | | | | | | | Change-Id: I69ffc1581cc43511b4f42ebb2735afe4c0b44131
* | am 234b506f: Merge "Adding migration Clings. (Bug 11973614)" into ↵Winson Chung2014-01-104-0/+181
|\| | | | | | | | | | | | | jb-ub-now-kermit * commit '234b506f4625b23172d437a2ba0b47d63cc2e3dd': Adding migration Clings. (Bug 11973614)
| * Merge "Adding migration Clings. (Bug 11973614)" into jb-ub-now-kermitWinson Chung2014-01-104-0/+181
| |\
| | * Adding migration Clings. (Bug 11973614)Winson Chung2014-01-104-0/+181
| | | | | | | | | | | | | | | - Refactoring Launcher cling code out to LauncherClings. Change-Id: Iff4f84f5b8bfeb69b1be0b4802022c3eb20b6f2c
* | | am 24fa33f8: Merge "Allow DISABLE_ALL_APPS to be set using a system ↵Nilesh Agrawal2014-01-101-0/+3
|\| | | | | | | | | | | | | | | | | | | | property." into jb-ub-now-kermit * commit '24fa33f8c7949d5e7fff4831f5903d70e1017091': Allow DISABLE_ALL_APPS to be set using a system property.
| * | Allow DISABLE_ALL_APPS to be set using a system property.Nilesh Agrawal2014-01-091-0/+3
| |/ | | | | | | | | | | | | | | | | - Moving the property to LauncherAppState - The property is only read on dogfood builds. The property can be set using setprop or /data/local.prop Change-Id: I14c7354efb12edb93f97e81687a6f920cc634e9a
* | am 0bae5b22: Merge "Moved paddingStart to -v17 folder." into jb-ub-now-kermitYura2014-01-095-5/+21
|\| | | | | | | | | * commit '0bae5b220a24541dbc69fb2cb755f303776d0a59': Moved paddingStart to -v17 folder.