summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Removing duplicated and/or unused resources from WallpaperPicker that ↵Cameron Neale2014-10-203-24/+0
| | | | | | conflict with Launcher 3 resources. The resource duplicated between the two is now only held within Launcher3. These changes are necessary in order for GSA to build in Google3. Change-Id: I70f5a250db52303c876e6abedd9c6d32d1d4761e
* am 2fb6609c: Merge "Showing widgets in a disabled state, when running in ↵Sunny Goyal2014-10-204-29/+58
|\ | | | | | | | | | | | | safe mode" into ub-now-queens * commit '2fb6609c318f1ba8ee75194c5cbc6de982a0a5a7': Showing widgets in a disabled state, when running in safe mode
| * Merge "Showing widgets in a disabled state, when running in safe mode" into ↵Sunny Goyal2014-10-204-29/+58
| |\ | | | | | | | | | ub-now-queens
| | * Showing widgets in a disabled state, when running in safe modeSunny Goyal2014-10-164-29/+58
| | | | | | | | | | | | | | | | | | Bug: 15172107 Change-Id: I7209836ca4ffacde7b7b232e230e9b9f1a0e54bb
* | | am c69b9218: Merge "Using LinearLayout for overview panel" into ub-now-queensSunny Goyal2014-10-202-22/+23
|\ \ \ | |/ / | | | | | | | | | * commit 'c69b92185aeb7adc57f0007f5659c531e1a8c050': Using LinearLayout for overview panel
| * | Merge "Using LinearLayout for overview panel" into ub-now-queensSunny Goyal2014-10-202-22/+23
| |\ \
| | * | Using LinearLayout for overview panelSunny Goyal2014-10-162-22/+23
| | |/ | | | | | | | | | | | | | | | | | | | | | > Using equal weight to ensure that all items are of same width > The total width of the panel is set in DeviceProfile#layout Bug: 17456856 Change-Id: Ic98f5c4f7befd4d32d1b52dfe8c9f5b6c58b020a
* | | am 3a5a9d18: Refactoring layout parsing codeSunny Goyal2014-10-203-749/+455
|\ \ \ | |/ / | | | | | | | | | * commit '3a5a9d18daacb878a3eb379fce540ee6c67063e6': Refactoring layout parsing code
| * | Refactoring layout parsing codeSunny Goyal2014-10-173-749/+455
| | | | | | | | | | | | Change-Id: Iee5b2280cb1e841bcfe91fdcf523de6fa7f7f3b8
* | | am 91d79e82: Merge "Adding ability to list folder items in separate file" ↵Adam Cohen2014-10-207-202/+21
|\ \ \ | |/ / | | | | | | | | | | | | | | | into ub-now-queens * commit '91d79e820aed570ccd2b1a6b10a7b3cabad99479': Adding ability to list folder items in separate file
| * | Merge "Adding ability to list folder items in separate file" into ub-now-queensAdam Cohen2014-10-177-202/+21
| |\ \
| | * | Adding ability to list folder items in separate fileAdam Cohen2014-10-177-202/+21
| | |/ | | | | | | | | | | | | | | | | | | -> remove all apps default layouts Bug 17569015 Change-Id: I39b899b61d5b1cff2d7801d281dacfc804c403c5
* | | am c565c104: Merge "Removing all traces of Market button and TabIndicator" ↵Sunny Goyal2014-10-2046-217/+0
|\ \ \ | |/ / | | | | | | | | | | | | | | | into ub-now-queens * commit 'c565c104a6b9f74e68a93108141431d8415881a5': Removing all traces of Market button and TabIndicator
| * | Merge "Removing all traces of Market button and TabIndicator" into ub-now-queensSunny Goyal2014-10-1746-217/+0
| |\ \
| | * | Removing all traces of Market button and TabIndicatorSunny Goyal2014-10-1746-217/+0
| | |/ | | | | | | Change-Id: I9dc10d990321697723560986834ebeef3e0f1c0d
* | | am 4514aa24: Merge "Moving the focus indicator instantly to the target ↵Sunny Goyal2014-10-201-16/+50
|\ \ \ | |/ / | | | | | | | | | | | | | | | position, instead of begining the next animation from the middle." into ub-now-queens * commit '4514aa24c814b2c6c408b852f0d972a2d537af75': Moving the focus indicator instantly to the target position, instead of begining the next animation from the middle.
| * | Merge "Moving the focus indicator instantly to the target position, instead ↵Sunny Goyal2014-10-171-16/+50
| |\ \ | | | | | | | | | | | | of begining the next animation from the middle." into ub-now-queens
| | * | Moving the focus indicator instantly to the target position, insteadSunny Goyal2014-10-141-16/+50
| | | | | | | | | | | | | | | | | | | | | | | | | | | | of begining the next animation from the middle. Bug: 17958897 Change-Id: Ie5a39b80ff9788edf368e0f4e23c07c2ed5b3d2c
* | | | am 736f5af0: Fixing some IconCache methods not thread safeSunny Goyal2014-10-202-108/+70
|\ \ \ \ | |/ / / | | | | | | | | | | | | * commit '736f5af04cfb6f168c1f643874a7d3f82b5f51cc': Fixing some IconCache methods not thread safe
| * | | Fixing some IconCache methods not thread safeSunny Goyal2014-10-162-108/+70
| | |/ | |/| | | | | | | | | | Bug: 17981568 Change-Id: I0d49604c2e38bc9017cba527d87e24e8b086f1da
* | | am d37a1f5a: Merge "Add more Launcher files to delete on Clear Launcher ↵Helena Josol2014-10-206-23/+33
|\ \ \ | |/ / | | | | | | | | | | | | | | | Data" into ub-now-queens * commit 'd37a1f5abec5a442508d850a0e26c96ece225f91': Add more Launcher files to delete on Clear Launcher Data
| * | Merge "Add more Launcher files to delete on Clear Launcher Data" into ↵Helena Josol2014-10-166-23/+33
| |\ \ | | | | | | | | | | | | ub-now-queens
| | * | Add more Launcher files to delete on Clear Launcher DataHelena Josol2014-10-166-23/+33
| | | | | | | | | | | | | | | | | | | | Bug: 12753154 Change-Id: I00679bdc6eff70a1398122aaa955c08eabd556b1
* | | | am 34899b9c: Merge "Use LauncherCallbacks model instead of method overrides" ↵Adam Cohen2014-10-203-55/+294
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | into ub-now-queens * commit '34899b9c1a65827ab510d6c6c2e3dd84a824b472': Use LauncherCallbacks model instead of method overrides
| * | | Merge "Use LauncherCallbacks model instead of method overrides" into ↵Adam Cohen2014-10-153-55/+294
| |\ \ \ | | | | | | | | | | | | | | | ub-now-queens
| | * | | Use LauncherCallbacks model instead of method overridesAdam Cohen2014-10-153-55/+294
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | -> When extending the Launcher Activity, instead of overriding public and protected methods, create a proper interface -> This helps define the interface when extending Launcher more formally and more clearly Change-Id: Ib38e8a376b2242d4078bf6856bb145f5b5f0da80
* | | | | am 1e76f888: Merge "Adding NPE check in InstallShortcutReceiver" into ↵Sunny Goyal2014-10-203-34/+17
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | ub-now-queens * commit '1e76f8882ec9b0505baf8350f000b97bddc90578': Adding NPE check in InstallShortcutReceiver
| * | | | Merge "Adding NPE check in InstallShortcutReceiver" into ub-now-queensSunny Goyal2014-10-153-34/+17
| |\ \ \ \
| | * | | | Adding NPE check in InstallShortcutReceiverSunny Goyal2014-10-143-34/+17
| | | |_|/ | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | > Removing some unused methods Bug: 17971165 Change-Id: I1bc5c764fd65b44c950a58371b60d2b53c221995
* | | | | am 6c2e0066: (-s ours) Import translations. DO NOT MERGEGeoff Mendal2014-10-200-0/+0
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | * commit '6c2e00663442641a6bc28f4b319b6e57c86f8f77': Import translations. DO NOT MERGE
| * | | | Import translations. DO NOT MERGEGeoff Mendal2014-10-151-2/+1
| | |_|/ | |/| | | | | | | | | | | | | | Change-Id: Ied5954dcd88f900ae2f9e21b1ec0cdbe01cad06b Auto-generated-cl: translation import
* | | | Import translations. DO NOT MERGEGeoff Mendal2014-10-151-2/+1
| | | | | | | | | | | | | | | | | | | | Change-Id: I90af76842559cbe6a1a9629b9291eac0ea62db27 Auto-generated-cl: translation import
* | | | am 951e8812: am ae5f7ce8: Merge "Fixing typo from previous CL" into ↵Adam Cohen2014-10-141-0/+1
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | ub-now-porkchop * commit '951e8812abb5a104abbbdd708e69262aa539e6d2': Fixing typo from previous CL
| * | | am ae5f7ce8: Merge "Fixing typo from previous CL" into ub-now-porkchopAdam Cohen2014-10-141-0/+1
| |\ \ \ | | | | | | | | | | | | | | | | | | | | * commit 'ae5f7ce8ed2e385cba8d65a67d9b108c9c3590e8': Fixing typo from previous CL
| | * \ \ 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
* | | | | | am 4079337e: am 755dd702: Merge "Fix missing screen when adding widget ↵Adam Cohen2014-10-141-20/+31
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | directly to provider" into ub-now-porkchop * commit '4079337ea73706931cae80f35aba8375ff729816': Fix missing screen when adding widget directly to provider
| * | | | | am 755dd702: Merge "Fix missing screen when adding widget directly to ↵Adam Cohen2014-10-141-20/+31
| |\ \ \ \ \ | | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | provider" into ub-now-porkchop * commit '755dd70238162d0b631a8a17c42047c61318be30': Fix missing screen when adding widget directly to provider
| | * | | | 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
* | | | | | am c03f8c04: (-s ours) am 8cce9dd8: (-s ours) DO NOT MERGE Rechecking ↵Sunny Goyal2014-10-140-0/+0
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | unrestored items when launcher gets created * commit 'c03f8c04714b919999dafa1551d6a2834ce6e15b': DO NOT MERGE Rechecking unrestored items when launcher gets created
| * | | | | am 8cce9dd8: (-s ours) DO NOT MERGE Rechecking unrestored items when ↵Sunny Goyal2014-10-140-0/+0
| |\ \ \ \ \ | | |/ / / / | | | | / / | | |_|/ / | |/| | | | | | | | | | | | | launcher gets created * commit '8cce9dd83aecd90920db751ab3f8fb6969f087c5': DO NOT MERGE Rechecking unrestored items when launcher gets created
| | * | | DO NOT MERGESunny Goyal2014-10-143-2/+79
| | |/ / | | | | | | | | | | | | | | | | | | | | | | | | Rechecking unrestored items when launcher gets created Bug: 17941096 Change-Id: Ic54464a9c64442d6784cda44ef22fa3d08e22f1f
* | | | am 76229a7c: (-s ours) Import translations. DO NOT MERGEGeoff Mendal2014-10-130-0/+0
|\ \ \ \ | |/ / / | | | | | | | | | | | | * commit '76229a7ccca69e92700f7b5f9d54739ee67276be': Import translations. DO NOT MERGE
| * | | Import translations. DO NOT MERGEGeoff Mendal2014-10-1355-23/+79
| | |/ | |/| | | | | | | | | | Change-Id: Iebcf569cfe852de6157c7dae569f7c607a63671d Auto-generated-cl: translation import
* | | Import translations. DO NOT MERGEGeoff Mendal2014-10-1355-23/+79
| | | | | | | | | | | | | | | Change-Id: I9c6ef0fac498e06571d99b3117509d1fdeddd792 Auto-generated-cl: translation import
* | | am 0014ca20: Removing some dead codeAdam Cohen2014-10-101-25/+0
|\ \ \ | |/ / | | | | | | | | | * commit '0014ca20aa35f8937ff0df105e620fba02a538a3': Removing some dead code
| * | Removing some dead codeAdam Cohen2014-10-091-25/+0
| | | | | | | | | | | | Change-Id: Idbd49302fc7123f72c7dad4c50612aaa662cca0d
* | | am 05700ad3: Merge "Keeping icons in disabled state when SD-card is ↵Sunny Goyal2014-10-089-71/+171
|\ \ \ | |/ / | | | | | | | | | | | | | | | unmounted" into ub-now-queens * commit '05700ad38f07d859f28a8e5d0cf65137c7c85d23': Keeping icons in disabled state when SD-card is unmounted
| * | Merge "Keeping icons in disabled state when SD-card is unmounted" into ↵Sunny Goyal2014-10-089-71/+171
| |\ \ | | | | | | | | | | | | ub-now-queens