Proto commits in CyanogenMod/android_packages_apps_Trebuchet

These 19 commits are when the Protocol Buffers files have changed:

Commit:8d43f06
Author:Sunny Goyal
Committer:Danesh M

Updating backup restore logic > Adding DeviceProfile information in the backup > Removing SharedPreference backup > Adding helper methods to abort backup in the middle > Comparing keys against the backup journal during restore to avoid restoring corrupt/lost entries > Old backups are still compatible, but lost keys verification will be ignored in that case. Bug: 17937935 Bug: 17951775 Bug: 17260941 Change-Id: Iad48646cfdd69abaff5c163b2055f3b8a9b39b19

Commit:519a40f
Author:Adam Cohen
Committer:Android Git Automerger

am a547c451: Revert "Add proto flag "javanano_use_deprecated_package" to avoid build breakage" * commit 'a547c4516c1a2dfd87f3466fccffd5ca6c5cab8c': Revert "Add proto flag "javanano_use_deprecated_package" to avoid build breakage"

The documentation is generated from this commit.

Commit:a547c45
Author:Adam Cohen

Revert "Add proto flag "javanano_use_deprecated_package" to avoid build breakage" This reverts commit cb7674118c6fa6849e657fb8fea25c8fd93477cc. Change-Id: I831abe3746be49fd164046655e8c5e059bae074f

Commit:e40e77b
Author:Adam Cohen
Committer:Android Git Automerger

am cb767411: Add proto flag "javanano_use_deprecated_package" to avoid build breakage * commit 'cb7674118c6fa6849e657fb8fea25c8fd93477cc': Add proto flag "javanano_use_deprecated_package" to avoid build breakage

Commit:cb76741
Author:Adam Cohen
Committer:Adam Cohen

Add proto flag "javanano_use_deprecated_package" to avoid build breakage Change-Id: Iea8a7bc2bb385e066b3f972105224fee3eb7c894

Commit:107ea63
Author:Sunny Goyal
Committer:Sunny Goyal

Adding rank column in backup > targetType was only added for M builds, so it can also be considered as v4 change. V3 which introduced minSpanX and minSpanY didn't contain targetType Bug: 22417713 Change-Id: I5c353674f7e0c2b5b4ab46e574fdb347d82028cd

The documentation is generated from this commit.

Commit:e612775
Author:Hyunyoung Song
Committer:Ed Heyl

resolved conflicts for merge of 13ef17a3 to mnc-dr-dev b/22609402 Change-Id: I140cf972d57e14737a6f91c0b4a8ec6c7ff1af2b

Commit:3a30cfe
Author:Sunny Goyal
Committer:Sunny Goyal

Adding minSpanX and minSpanY for all the launcher widgets Bug: 22353460 Change-Id: Id4450dee42a83e4603dcd56e1c4dec2b0e405858

Commit:249a510
Author:Sunny Goyal
Committer:Sunny Goyal

[DO NOT MERGE] Adding minSpanX and minSpanY for all the launcher widgets Bug: 22353460 Change-Id: Id4450dee42a83e4603dcd56e1c4dec2b0e405858

Commit:9e0fcdb
Author:Sunny Goyal
Committer:Android Git Automerger

am 1d8f4ad5: Revert "Add "option javanano_use_deprecated_package = true;\n" to protos compiled with the nano proto compiler that are referenced in Java files." * commit '1d8f4ad59dbb17d80c6b910be8ad85904cb08d68': Revert "Add "option javanano_use_deprecated_package = true;\n" to protos compiled with the nano proto compiler that are referenced in Java files."

Commit:487c4aa
Author:Sunny Goyal
Committer:Android Git Automerger

am 469fea0b: Add "option javanano_use_deprecated_package = true;\n" to protos compiled with the nano proto compiler that are referenced in Java files. * commit '469fea0b390e893c1eb8115ff6c5f997916be4c1': Add "option javanano_use_deprecated_package = true;\n" to protos compiled with the nano proto compiler that are referenced in Java files.

Commit:1d8f4ad
Author:Sunny Goyal

Revert "Add "option javanano_use_deprecated_package = true;\n" to protos compiled with the nano proto compiler that are referenced in Java files." This reverts commit 469fea0b390e893c1eb8115ff6c5f997916be4c1. Change-Id: I2977f49a9836fd08038028c6cd8d3eed73185dde

Commit:469fea0
Author:Sunny Goyal

Add "option javanano_use_deprecated_package = true;\n" to protos compiled with the nano proto compiler that are referenced in Java files. Bug: 21273801 Change-Id: I6d9986f5f93980d8a3400e488609a28082fc2cdb

Commit:bb3b02f
Author:Sunny Goyal
Committer:Sunny Goyal

Replacing hotseat icon to an appropriate system app > During backupi, store the hotseat target app type, based on some predefined common system apps > During restore, save this app type in the restore flag, if it is a hotseat app > During first launcher load, if an app is not being restored, try to replace it with an appropriate replacement for that type, otherwise delete it. Bug: 18764649 Change-Id: Ic49e40bd707bd8d7de18bbab8b1e58a0a36426a2

Commit:7d17629
Author:Dave Hawkey

Add syntax option to backup.proto. This is required to properly compile the file in google3. Change-Id: Ib9ff3163974a5180797c0ecadb833dae93619b2c

Commit:33d4438
Author:Sunny Goyal
Committer:Sunny Goyal

Updating backup restore logic > Adding DeviceProfile information in the backup > Removing SharedPreference backup > Adding helper methods to abort backup in the middle > Comparing keys against the backup journal during restore to avoid restoring corrupt/lost entries > Old backups are still compatible, but lost keys verification will be ignored in that case. Bug: 17937935 Bug: 17951775 Bug: 17260941 Change-Id: Iad48646cfdd69abaff5c163b2055f3b8a9b39b19

Commit:fd13c71
Author:Chris Wren
Committer:Chris Wren

backup widget assets. Bug: 10778984 Change-Id: I842a88c517401fa4eb3798fd03e0fbc3634e3144

Commit:22e130d
Author:Chris Wren
Committer:Chris Wren

backup launcher icons Only allow a small number of icons to be backed up in any given pass. Also refactor common code out of favorite and screen backups. Bug: 10778984 Change-Id: I54bc769c1d1c1c9087ea4bc58f258bd15c167aea

Commit:1ada10d
Author:Chris Wren
Committer:Chris Wren

add a backup agent. backup only, restore path is just debugging/verification. todo: restore path todo: additional asset backup for widgets and launcher items Bug: 10778984 Change-Id: I01aed4794a02f03daf21bca28f99cfbea90e4967