summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Import translations. DO NOT MERGEBaligh Uddin2014-04-0256-56/+111
| | | | | Change-Id: I86d2cd7fcf495f5810cfac5c2f6b4037a49b2ebf Auto-generated-cl: translation import
* am 2204dc6b: am 7f83b228: Merge "update strings for welcome back" into ↵Chris Wren2014-04-021-1/+1
|\ | | | | | | | | | | | | ub-now-mister-ugly * commit '2204dc6b63b9e0c681c7280364263dfcbcb3a7bf': update strings for welcome back
| * am 7f83b228: Merge "update strings for welcome back" into ub-now-mister-uglyChris Wren2014-04-021-1/+1
| |\ | | | | | | | | | | | | * commit '7f83b228353ff2af5ef8d48ad48fdd4082f67aa3': update strings for welcome back
| | * Merge "update strings for welcome back" into ub-now-mister-uglyChris Wren2014-04-021-1/+1
| | |\
| | | * update strings for welcome backChris Wren2014-04-011-1/+1
| | | | | | | | | | | | | | | | | | | | Bug: 13531041 Change-Id: Iabcb40df50850bd91b9ec972b407e4267960e4b9
* | | | am 7727179c: am dcb173d0: Make sure the workspace screens don\'t get updated ↵Adam Cohen2014-04-011-1/+24
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | while workspace is loading * commit '7727179cd92caa992def57947c5772447a060e36': Make sure the workspace screens don't get updated while workspace is loading
| * | | am dcb173d0: Make sure the workspace screens don\'t get updated while ↵Adam Cohen2014-04-011-1/+24
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | workspace is loading * commit 'dcb173d0e348c23d967bb0939e63b6ce4e1bd503': Make sure the workspace screens don't get updated while workspace is loading
| | * | Make sure the workspace screens don't get updated while workspace is loadingAdam Cohen2014-04-011-1/+24
| | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | -> Found another path that could lead to the same issue [add shortcut with config activity to an existing folder, when config activity launches, kill launcher, configure shortcut. observe crash and data loss]. -> Plugged up above, and a couple other potential holes -> Initial fix probably took care of the main issue Issue 12523285 Change-Id: I29db9da4af4a8bf22047eb46bd49354447d04b8d
* | | am 804bcbf3: am 8440e7ce: Merge "Increase delay before dismissing intro ↵Adam Cohen2014-03-311-1/+1
|\| | | | | | | | | | | | | | | | | | | | screen (issue 13691305)" into ub-now-mister-ugly * commit '804bcbf34295090b28c5a6a374ab464ea2726349': Increase delay before dismissing intro screen (issue 13691305)
| * | am 8440e7ce: Merge "Increase delay before dismissing intro screen (issue ↵Adam Cohen2014-03-311-1/+1
| |\| | | | | | | | | | | | | | | | | | | 13691305)" into ub-now-mister-ugly * commit '8440e7ce17a3d54254217c69982c2ec2937ba4ba': Increase delay before dismissing intro screen (issue 13691305)
| | * Merge "Increase delay before dismissing intro screen (issue 13691305)" into ↵Adam Cohen2014-03-311-1/+1
| | |\ | | | | | | | | | | | | ub-now-mister-ugly
| | | * Increase delay before dismissing intro screen (issue 13691305)Adam Cohen2014-03-281-1/+1
| | | | | | | | | | | | | | | | Change-Id: I0b81d61b922278e0e72c3055086010612687c7d9
* | | | am dc493591: am 4a9423d6: Add method to determine if first run activity has ↵Adam Cohen2014-03-281-1/+4
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | been shown (issue 13680732) * commit 'dc493591f8917822f8f991e849e8e9eba5e65356': Add method to determine if first run activity has been shown (issue 13680732)
| * | | am 4a9423d6: Add method to determine if first run activity has been shown ↵Adam Cohen2014-03-281-1/+4
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | (issue 13680732) * commit '4a9423d6ddda9009f9489d5546a822f9222e78c4': Add method to determine if first run activity has been shown (issue 13680732)
| | * | Add method to determine if first run activity has been shown (issue 13680732)Adam Cohen2014-03-281-1/+4
| | |/ | | | | | | | | | Change-Id: Ia0da4148fd0365c6ae9c3a5a4cff7118959f6382
* | | am 08d79b78: am 31442560: Fixed crash when setting wallpaper with built in ↵Selim Cinek2014-03-271-7/+8
|\| | | | | | | | | | | | | | | | | | | | rotation * commit '08d79b786476146e7dc3fbabea696d7609b94e37': Fixed crash when setting wallpaper with built in rotation
| * | am 31442560: Fixed crash when setting wallpaper with built in rotationSelim Cinek2014-03-271-7/+8
| |\| | | | | | | | | | | | | * commit '314425602a7ccd9cc2bdef1a11f5e51211201b6f': Fixed crash when setting wallpaper with built in rotation
| | * Fixed crash when setting wallpaper with built in rotationSelim Cinek2014-03-271-7/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | If an image had a built-in rotation, a crash could occur, when setting it. An example was a panorama image which had a rotation of 90 degrees. Change-Id: Iede8226dac3a40f08d39a69162eb388e6aba97ec Bug: 13507421
* | | am 68f8cf93: am 7c989e90: Fixed wallpaper bug where wrong size was taken ↵Selim Cinek2014-03-241-3/+5
|\| | | | | | | | | | | | | | | | | | | | when cropping * commit '68f8cf930a49cdf8db71c612f5bc5a64ff91902b': Fixed wallpaper bug where wrong size was taken when cropping
| * | am 7c989e90: Fixed wallpaper bug where wrong size was taken when croppingSelim Cinek2014-03-241-3/+5
| |\| | | | | | | | | | | | | * commit '7c989e90e84b29f4762abaf2c80ecafc1a9e99d4': Fixed wallpaper bug where wrong size was taken when cropping
| | * Fixed wallpaper bug where wrong size was taken when croppingSelim Cinek2014-03-241-3/+5
| | | | | | | | | | | | | | | | | | | | | | | | When cropping, the selected area of the image was incorrectly cropped to the size of the view instead of the size of the image Bug: 13617446 Change-Id: I0b40711c04f3d3b5929e7bb037d6cf21d4bb5bcb
* | | am 8db5a859: am 4dfbe829: Merge "Fix missing stack trace on ↵Jason Monk2014-03-211-1/+2
|\| | | | | | | | | | | | | | | | | | | | checkItemInfoLocked call" into ub-now-mister-ugly * commit '8db5a8596f48db54eb16f523024e4ddefbc65304': Fix missing stack trace on checkItemInfoLocked call
| * | am 4dfbe829: Merge "Fix missing stack trace on checkItemInfoLocked call" ↵Jason Monk2014-03-211-1/+2
| |\| | | | | | | | | | | | | | | | | | | into ub-now-mister-ugly * commit '4dfbe82910151b3b19c756404d49e0c16d62532c': Fix missing stack trace on checkItemInfoLocked call
| | * Merge "Fix missing stack trace on checkItemInfoLocked call" into ↵Jason Monk2014-03-211-1/+2
| | |\ | | | | | | | | | | | | ub-now-mister-ugly
| | | * Fix missing stack trace on checkItemInfoLocked callJason Monk2014-03-201-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Just put this change into Launcher2, now adding to Launcher3 The call to checkItemInfoLocked from addItemToDatabase was missing a stack trace so that if the check failed, the stack trace did not contain what triggered the add. Change-Id: Ia2e2aae20b16d4adadfe1da53b49e93073fab55c
* | | | am cd4af2b5: am 36a62885: Merge "Adding in-activity intro screen (issue ↵Adam Cohen2014-03-202-27/+114
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | 12905636)" into ub-now-mister-ugly * commit 'cd4af2b5a6024258cc47bcea29adf7e1502097bf': Adding in-activity intro screen (issue 12905636)
| * | | am 36a62885: Merge "Adding in-activity intro screen (issue 12905636)" into ↵Adam Cohen2014-03-202-27/+114
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | ub-now-mister-ugly * commit '36a6288545060415189803f24bb6252b98e071e3': Adding in-activity intro screen (issue 12905636)
| | * | Merge "Adding in-activity intro screen (issue 12905636)" into ub-now-mister-uglyAdam Cohen2014-03-202-27/+114
| | |\ \
| | | * | Adding in-activity intro screen (issue 12905636)Adam Cohen2014-03-202-27/+114
| | | | | | | | | | | | | | | | | | | | Change-Id: Ifb016ca6e5052fd91535b98a39f78569200955a8
* | | | | am bba150b6: (-s ours) am febf1b9c: (-s ours) Merge "Import translations. DO ↵Baligh Uddin2014-03-200-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | NOT MERGE" into ub-now-mister-ugly * commit 'bba150b6fc733847a04014abb22624c2c9456025': Import translations. DO NOT MERGE
| * | | | am febf1b9c: (-s ours) Merge "Import translations. DO NOT MERGE" into ↵Baligh Uddin2014-03-200-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ub-now-mister-ugly * commit 'febf1b9c39c109c23297787dfc5fc0476e184c41': Import translations. DO NOT MERGE
| | * | | Merge "Import translations. DO NOT MERGE" into ub-now-mister-uglyBaligh Uddin2014-03-204-5/+5
| | |\ \ \ | | | |_|/ | | |/| |
| | | * | Import translations. DO NOT MERGEBaligh Uddin2014-03-194-5/+5
| | | |/ | | | | | | | | | | | | | | | | Change-Id: Ie0317b94dd08597383b981fa196391728baa0b09 Auto-generated-cl: translation import
* | | | am a321f527: (-s ours) Merge "Import translations. DO NOT MERGE" into ↵Baligh Uddin2014-03-200-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | ub-now-nova * commit 'a321f5274b2fbb45932908690a84342ce63de453': Import translations. DO NOT MERGE
| * | | Merge "Import translations. DO NOT MERGE" into ub-now-novaBaligh Uddin2014-03-204-5/+5
| |\ \ \
| | * | | Import translations. DO NOT MERGEBaligh Uddin2014-03-194-5/+5
| | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I061d2ef75aafe8631270c534d142f01f5e7ab5ea Auto-generated-cl: translation import
* | | | | Merge "Import translations. DO NOT MERGE" into ub-now-masterBaligh Uddin2014-03-2056-2/+287
|\ \ \ \ \
| * | | | | Import translations. DO NOT MERGEBaligh Uddin2014-03-1956-2/+287
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I1612ffca561c82ebdfc28aeac6dbddb7ffbef955 Auto-generated-cl: translation import
* | | | | | am c9f9fcc0: am fa4c799a: Fix concurrent drawable usage resulting in native ↵Adrian Roos2014-03-201-3/+12
|\ \ \ \ \ \ | | |/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | crash * commit 'c9f9fcc06e9d46d89900ad7cb8b6864d01b230e4': Fix concurrent drawable usage resulting in native crash
| * | | | | am fa4c799a: Fix concurrent drawable usage resulting in native crashAdrian Roos2014-03-201-3/+12
| |\ \ \ \ \ | | | |_|/ / | | |/| | | | | | | | | | | | | | | * commit 'fa4c799a9bc6b2eb55ce21609591d49f5c5ea9ba': Fix concurrent drawable usage resulting in native crash
| | * | | | Fix concurrent drawable usage resulting in native crashAdrian Roos2014-03-191-3/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | One of widget preview drawables was drawn concurrently from a thread pool, causing a native Skia crash. Bug: 12525890 Change-Id: I2dea7b86ba8b32237f40feff225657dcb2b0061b
* | | | | | am 4cce8104: am 5d2704fb: Clean up dead, ugly and wrong code in icon and ↵Adrian Roos2014-03-203-173/+25
|\| | | | | | |_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | widget preview loading * commit '4cce8104b1f78a665b1060f8d054208ad3aed0bf': Clean up dead, ugly and wrong code in icon and widget preview loading
| * | | | am 5d2704fb: Clean up dead, ugly and wrong code in icon and widget preview ↵Adrian Roos2014-03-203-173/+25
| |\| | | | | |/ / | |/| | | | | | | | | | | | | | | | | | loading * commit '5d2704fbb0a7bb4763d4e2ee031e16a8913ba003': Clean up dead, ugly and wrong code in icon and widget preview loading
| | * | Clean up dead, ugly and wrong code in icon and widget preview loadingAdrian Roos2014-03-193-173/+25
| | |/ | | | | | | | | | | | | | | | | | | | | | | | | Removed and fixed serveral instances of dead code and small bugs that grew in the widget preloading logic, discovered while chasing a bug. Bug: 12525890 Change-Id: I22e03eccecc07b73388cfd3c8462d947601c6e54
* | | am 7b763d01: am e769d168: Merge "Add onClickPagedViewIcon to the Launcher." ↵Mohammadinamul Sheik2014-03-182-2/+12
|\| | | | | | | | | | | | | | | | | | | | into ub-now-mister-ugly * commit '7b763d01b20c453899948f902e795dc01a9f11f2': Add onClickPagedViewIcon to the Launcher.
| * | am e769d168: Merge "Add onClickPagedViewIcon to the Launcher." into ↵Mohammadinamul Sheik2014-03-182-2/+12
| |\| | | | | | | | | | | | | | | | | | | ub-now-mister-ugly * commit 'e769d1681e1177b9e37c0be9e12d1ede55d4e3a9': Add onClickPagedViewIcon to the Launcher.
| | * Merge "Add onClickPagedViewIcon to the Launcher." into ub-now-mister-uglyMohammadinamul Sheik2014-03-182-2/+12
| | |\
| | | * Add onClickPagedViewIcon to the Launcher.Mohammadinamul Sheik2014-03-182-2/+12
| | | | | | | | | | | | | | | | Change-Id: I34505ee5c9a6fe6ddd1a9f3134829fe0481e8bc0
* | | | am 1d719c11: am ef3784cf: Merge "Add LauncherProviderChangeListener" into ↵Anjali Koppal2014-03-173-2/+25
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | ub-now-mister-ugly * commit '1d719c11fb71b2b4d46be821b096242697103624': Add LauncherProviderChangeListener
| * | | am ef3784cf: Merge "Add LauncherProviderChangeListener" into ub-now-mister-uglyAnjali Koppal2014-03-173-2/+25
| |\| | | | | | | | | | | | | | | | | | * commit 'ef3784cf698cd1455f762f66ad6eec32cc8f2fa3': Add LauncherProviderChangeListener