Commit Graph

8659 Commits

Author SHA1 Message Date
Sunny Goyal ff901b8a00 am 9202c64f: am fdbfba88: am 8cce9dd8: DO NOT MERGE Rechecking unrestored items when launcher gets created
* commit '9202c64f75cfd422c8a9a143dd71dd30e109301b':
  DO NOT MERGE Rechecking unrestored items when launcher gets created
2014-10-18 16:27:59 +00:00
Ian Parkinson 69cf1b8736 am 1beba0a0: am 3d78b80e: am 0c2918f4: Use View.generateViewId if available
* commit '1beba0a0b63293567b87e5c4a6ba6728d67c0f12':
  Use View.generateViewId if available
2014-10-18 16:27:58 +00:00
Adam Cohen a31166280e am b97fb75b: am 49e2f10e: am 4b8d11fc: Add missing xxhdpi asset
* commit 'b97fb75bfd472b45bf3a3d9c71aa977c30b52341':
  Add missing xxhdpi asset
2014-10-18 16:27:58 +00:00
Kenny Guy b36d10d559 am ad7be0b2: am 5f2a520f: am 0cd27191: Merge "Remove reference to CODENAME from compat code." into ub-now-porkchop
* commit 'ad7be0b20952740a1de452ffac182dd51bc4f16b':
  Remove reference to CODENAME from compat code.
2014-10-18 16:27:57 +00:00
Adam Cohen b1e6628ee8 am f38a2eb1: am 91c11b28: am 52077b7a: Merge "Don\'t let old Launcher activity interfere with new one" into ub-now-porkchop
* commit 'f38a2eb1648dffc44ada50d4344f37679ae55b34':
  Don't let old Launcher activity interfere with new one
2014-10-18 16:27:57 +00:00
Bjorn Bringert f6b97f7391 am d54cf543: am c656245b: am 2ed99e86: Build Launcher3 against prebuilt SDK 21
* commit 'd54cf54387d8c434fefd18ce7a6bdbf3ea586b39':
  Build Launcher3 against prebuilt SDK 21
2014-10-18 16:27:56 +00:00
Sunny Goyal be7e26bee8 am cc483537: am e7599d69: am 6d467e27: Merge "Resetting launcherProvider data if restore set was empty" into ub-now-porkchop
* commit 'cc483537e9033a2d9c04bae85723f0f942b10a2e':
  Resetting launcherProvider data if restore set was empty
2014-10-18 16:27:56 +00:00
Baligh Uddin 42c645e803 am 32b2735a: (-s ours) am ab474588: (-s ours) am 10047138: (-s ours) Merge "Import translations. DO NOT MERGE" into ub-now-porkchop
* commit '32b2735ae2e720ba301d946cc8e8b2dedf556fc6':
  Import translations. DO NOT MERGE
2014-10-18 16:27:55 +00:00
Sunny Goyal 5dbae54dfb am 06871183: am e43f0d64: am c5fb59fb: Fixing loadWorkspace being called multiple times Using right intent when refreshing shortcut icons
* commit '06871183b1d94acd7f52db6a4892c2dbea931ca1':
  Fixing loadWorkspace being called multiple times Using right intent when refreshing shortcut icons
2014-10-18 16:27:55 +00:00
Sunny Goyal 5f248bd5f2 am 45f01219: am 50141452: am f876301d: UI Fixes
* commit '45f012197c41e905c84878c0826d01a3d37c15f7':
  UI Fixes
2014-10-18 16:27:54 +00:00
Adam Cohen 451d68d50e am 250678ad: am cb20616a: am d8f6253e: Merge "When ensuring screen exists, make sure it\'s actually referring to a screen, not a rank" into ub-now-porkchop
* commit '250678ad773cfa51d31e8c457b35a37e0b5b1a32':
  When ensuring screen exists, make sure it's actually referring to a screen, not a rank
2014-10-18 16:27:54 +00:00
Baligh Uddin e81650071c am 1dd8d00b: (-s ours) am 6317598a: (-s ours) am 68207e25: (-s ours) Merge "Import translations. DO NOT MERGE" into ub-now-porkchop
* commit '1dd8d00ba22c44e83139af7fe2261936219863c9':
  Import translations. DO NOT MERGE
2014-10-18 16:27:53 +00:00
Sunny Goyal 9202c64f75 am fdbfba88: am 8cce9dd8: DO NOT MERGE Rechecking unrestored items when launcher gets created
* commit 'fdbfba88d4f08d7a721d91b7e3d30ee5a290be6e':
  DO NOT MERGE Rechecking unrestored items when launcher gets created
2014-10-18 16:08:17 +00:00
Ian Parkinson 1beba0a0b6 am 3d78b80e: am 0c2918f4: Use View.generateViewId if available
* commit '3d78b80ecdfeec7704b2aa82ce39823fa903ea61':
  Use View.generateViewId if available
2014-10-18 16:08:16 +00:00
Adam Cohen b97fb75bfd am 49e2f10e: am 4b8d11fc: Add missing xxhdpi asset
* commit '49e2f10ee205d6190f0d4c589ba31b6763e9b0d3':
  Add missing xxhdpi asset
2014-10-18 16:08:15 +00:00
Kenny Guy ad7be0b209 am 5f2a520f: am 0cd27191: Merge "Remove reference to CODENAME from compat code." into ub-now-porkchop
* commit '5f2a520f0cd47b274bdf809d7b665c956c2717ed':
  Remove reference to CODENAME from compat code.
2014-10-18 16:08:14 +00:00
Adam Cohen f38a2eb164 am 91c11b28: am 52077b7a: Merge "Don\'t let old Launcher activity interfere with new one" into ub-now-porkchop
* commit '91c11b28d57c026d507488c58feedebf7fee6f31':
  Don't let old Launcher activity interfere with new one
2014-10-18 16:08:14 +00:00
Bjorn Bringert d54cf54387 am c656245b: am 2ed99e86: Build Launcher3 against prebuilt SDK 21
* commit 'c656245b9cbc370537afb18e7fb38ea87c233fd1':
  Build Launcher3 against prebuilt SDK 21
2014-10-18 16:08:13 +00:00
Sunny Goyal cc483537e9 am e7599d69: am 6d467e27: Merge "Resetting launcherProvider data if restore set was empty" into ub-now-porkchop
* commit 'e7599d694313845a41221dfa0d7f6dca3aedd02c':
  Resetting launcherProvider data if restore set was empty
2014-10-18 16:08:13 +00:00
Baligh Uddin 32b2735ae2 am ab474588: (-s ours) am 10047138: (-s ours) Merge "Import translations. DO NOT MERGE" into ub-now-porkchop
* commit 'ab474588ce7d9cddff2b2dc0a2fd91b4ae532e05':
  Import translations. DO NOT MERGE
2014-10-18 16:08:12 +00:00
Sunny Goyal 06871183b1 am e43f0d64: am c5fb59fb: Fixing loadWorkspace being called multiple times Using right intent when refreshing shortcut icons
* commit 'e43f0d646c60c6f59333224686725717cdf2ccbc':
  Fixing loadWorkspace being called multiple times Using right intent when refreshing shortcut icons
2014-10-18 16:08:12 +00:00
Sunny Goyal 45f012197c am 50141452: am f876301d: UI Fixes
* commit '501414523ef1e3dc394746ea01489a934e826865':
  UI Fixes
2014-10-18 16:08:11 +00:00
Adam Cohen 250678ad77 am cb20616a: am d8f6253e: Merge "When ensuring screen exists, make sure it\'s actually referring to a screen, not a rank" into ub-now-porkchop
* commit 'cb20616a180de2855cc35e6c1ce8dfb8082ea41c':
  When ensuring screen exists, make sure it's actually referring to a screen, not a rank
2014-10-18 16:08:11 +00:00
Sunny Goyal 824be94f31 am acefecbf: Merge "Updating promise icon\'s bitmap and label when onBadgingChanged is received" into ub-now-porkchop
* commit 'acefecbff3141b43dc55fe18146cf842d1d4a8ae':
  Updating promise icon's bitmap and label when onBadgingChanged is received
2014-10-18 16:08:10 +00:00
Baligh Uddin 1dd8d00ba2 am 6317598a: (-s ours) am 68207e25: (-s ours) Merge "Import translations. DO NOT MERGE" into ub-now-porkchop
* commit '6317598a196ada3f32950c7f4a8d5cfe005acf42':
  Import translations. DO NOT MERGE
2014-10-18 16:08:10 +00:00
Sunny Goyal 0995af83e7 am 7e053f87: Merge "Changing intent action for auto installs" into ub-now-porkchop
* commit '7e053f8784c886359f911161db5fd8b61333450d':
  Changing intent action for auto installs
2014-10-18 16:08:09 +00:00
Sunny Goyal 240f3985ab am 66af82cc: Merge "Adding support to delete unrestored icons and widgets" into ub-now-porkchop
* commit '66af82cca76b313366e5429489aed85679c2c76e':
  Adding support to delete unrestored icons and widgets
2014-10-18 16:08:09 +00:00
Sunny Goyal f290736f67 am 92e97dcc: Merge "Fix: First run cling shoud show \'Welcome\' when there is no migration cling" into ub-now-porkchop
* commit '92e97dccab3d7016e0740648e1d467e37a42f3f8':
  Fix: First run cling shoud show 'Welcome' when there is no migration cling
2014-10-18 16:08:08 +00:00
Sunny Goyal fdbfba88d4 am 8cce9dd8: DO NOT MERGE Rechecking unrestored items when launcher gets created
* commit '8cce9dd83aecd90920db751ab3f8fb6969f087c5':
  DO NOT MERGE Rechecking unrestored items when launcher gets created
2014-10-18 16:05:47 +00:00
Ian Parkinson 3d78b80ecd am 0c2918f4: Use View.generateViewId if available
* commit '0c2918f4f4c4a9a6609b82cf23155ed51840f2c8':
  Use View.generateViewId if available
2014-10-18 16:05:46 +00:00
Adam Cohen 49e2f10ee2 am 4b8d11fc: Add missing xxhdpi asset
* commit '4b8d11fcb396760eca75cf2b055a7acd05c594ec':
  Add missing xxhdpi asset
2014-10-18 16:05:46 +00:00
Kenny Guy 5f2a520f0c am 0cd27191: Merge "Remove reference to CODENAME from compat code." into ub-now-porkchop
* commit '0cd271918a7c7baa69e872f7128351a0c7dbbbae':
  Remove reference to CODENAME from compat code.
2014-10-18 16:05:45 +00:00
Adam Cohen 91c11b28d5 am 52077b7a: Merge "Don\'t let old Launcher activity interfere with new one" into ub-now-porkchop
* commit '52077b7a951153ce77e7354c6096b3bcfbec8c3e':
  Don't let old Launcher activity interfere with new one
2014-10-18 16:05:45 +00:00
Bjorn Bringert c656245b9c am 2ed99e86: Build Launcher3 against prebuilt SDK 21
* commit '2ed99e861b4be73620fd6fdc24a13230e096921c':
  Build Launcher3 against prebuilt SDK 21
2014-10-18 16:05:44 +00:00
Sunny Goyal e7599d6943 am 6d467e27: Merge "Resetting launcherProvider data if restore set was empty" into ub-now-porkchop
* commit '6d467e27b7e16442d3fb56af2aa3d94e657dff25':
  Resetting launcherProvider data if restore set was empty
2014-10-18 16:05:44 +00:00
Baligh Uddin ab474588ce am 10047138: (-s ours) Merge "Import translations. DO NOT MERGE" into ub-now-porkchop
* commit '1004713867fa4476201c02c95f35c64361a6dcf2':
  Import translations. DO NOT MERGE
2014-10-18 16:05:43 +00:00
Sunny Goyal e43f0d646c am c5fb59fb: Fixing loadWorkspace being called multiple times Using right intent when refreshing shortcut icons
* commit 'c5fb59fb9a36180ce962f565d85aa92f9991da1a':
  Fixing loadWorkspace being called multiple times Using right intent when refreshing shortcut icons
2014-10-18 16:05:43 +00:00
Sunny Goyal 501414523e am f876301d: UI Fixes
* commit 'f876301d0a460bec260a3c7a6ab260a06d5817ba':
  UI Fixes
2014-10-18 16:05:42 +00:00
Adam Cohen cb20616a18 am d8f6253e: Merge "When ensuring screen exists, make sure it\'s actually 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
2014-10-18 16:05:42 +00:00
Baligh Uddin 6317598a19 am 68207e25: (-s ours) Merge "Import translations. DO NOT MERGE" into ub-now-porkchop
* commit '68207e2532b2059e513a1c4e33c3c52e1ac1e559':
  Import translations. DO NOT MERGE
2014-10-18 16:05:41 +00:00
Nick Kralevich f1d64584de fix build
Bug: 18040469
Change-Id: I2938c7b950470eeacfb20391f109ae44d95060c7
2014-10-18 08:14:19 -07:00
Nick Kralevich a93e74578e fix build
Bug: 18040469
Change-Id: I24db4d3f4b7ee10ecf5a2c65035ce112271539fb
2014-10-18 14:22:26 +00:00
Sunny Goyal 8cce9dd83a DO NOT MERGE
Rechecking unrestored items when launcher gets created

Bug: 17941096
Change-Id: Ic54464a9c64442d6784cda44ef22fa3d08e22f1f
2014-10-14 14:02:31 -07:00
Ian Parkinson 0c2918f4f4 Use View.generateViewId if available
Bug: 17456181
Change-Id: Ib7e310ba38ed5e392c5c9b8734f197212f518389
2014-10-06 14:27:16 +01:00
Adam Cohen 4b8d11fcb3 Add missing xxhdpi asset
Bug: 17813013
Change-Id: If1e3448fb109e3f7f0c1ae6562a795fecf3bdf42
2014-10-03 13:47:11 -07:00
Kenny Guy 0cd271918a Merge "Remove reference to CODENAME from compat code." into ub-now-porkchop 2014-10-03 12:16:59 +00:00
Kenny Guy 92d6d3b275 Remove reference to CODENAME from compat code.
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
2014-10-03 12:15:53 +01:00
Adam Cohen 52077b7a95 Merge "Don't let old Launcher activity interfere with new one" into ub-now-porkchop 2014-09-30 23:03:40 +00:00
Bjorn Bringert 2ed99e861b Build Launcher3 against prebuilt SDK 21
Bug: 17507423
Change-Id: I9d6dc856bb29e5d0b3926bde437895d0f2ca7b74
2014-09-30 18:53:39 +01:00
Adam Cohen 1a85c5839c Don't let old Launcher activity interfere with new one
-> 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
2014-09-30 10:23:18 -07:00