summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge "Hide deletion action for currently set Live wallpaper"Ching Sung Li2019-03-141-2/+12
|\
| * Hide deletion action for currently set Live wallpaperChing-Sung Li2019-03-121-2/+12
| | | | | | | | | | | | | | | | Hide deletion action for currently set Live wallpaper in LivePicker Bug: 126453855 Test: Manual Change-Id: I7c35f2820819c66f7377c4c9843d8d6646670953
* | Change page title to fill width in landscape modeKunhung Li2019-03-061-0/+2
|/ | | | | | Bug: 126304553 Test: Manual test Change-Id: Ia01dd866e858b8a8ffea84c7d786157544fa4f9b
* Remove pre-installed check for LivePickerKunhung Li2019-03-051-13/+1
| | | | | | | | | For more apps can easily access delete feature, will remove isPackagePreInstalled(). Bug: 122094510 Test: Manual test Change-Id: I31c773265c959e172d480776b86b0225bbd9956a
* Align info and setting tab to the same heightKunhung Li2019-02-261-9/+13
| | | | | | | | | | | | | It will feel tab jumping while switching to different tab, which causes from info tab and customize tab's height are not the same. Visit all child views first and then determine the maximum height for ViewPager. Bug: 126301901 Test: Manual Test Change-Id: Iada213a96622179b201a96b36ee551c6732dd5cc
* Merge stage-aosp-master into pi-dev-plus-aospXin Li2019-02-250-0/+0
|\ | | | | | | | | | | am: d6a8a147fe Change-Id: I6db81065a306bfdf938b5a1039740107a8ec49bf
| * Merge stage-aosp-master into pi-dev-plus-aospXin Li2019-02-250-0/+0
| |\ | | | | | | | | | | | | Bug: 126125118 Change-Id: I00b212439c090a1a8d8fdafcb306fb3600e29374
| | * DO NOT MERGE - Merge pi-dev@5234907 into stage-aosp-masterXin Li2019-02-212-2/+2
| | |\ | | | | | | | | | | | | | | | | Bug: 120848293 Change-Id: I85dac779f66fb930e656467660d8bc99359387e3
* | | \ Merge "Import translations. DO NOT MERGE"TreeHugger Robot2019-02-2181-162/+81
|\ \ \ \
| * | | | Import translations. DO NOT MERGEBill Yi2019-02-2181-162/+81
| | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I0f18908339456e4638717ce036652d3e48ee841a Auto-generated-cl: translation import
* | | | | [automerger skipped] Import translations. DO NOT MERGE am: f1c1a0bfcd -s oursBill Yi2019-02-210-0/+0
|\ \ \ \ \ | |/ / / / |/| / / / | |/ / / | | | | | | | | | | | | am: c7c8622283 -s ours am skip reason: subject contains skip directive Change-Id: Ia566e62b84907be1202d30f56c0031c48335401d
| * | | [automerger skipped] Import translations. DO NOT MERGEBill Yi2019-02-210-0/+0
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: f1c1a0bfcd -s ours am skip reason: subject contains skip directive Change-Id: Icef1eb7df7baa7e67e56a5de1e2f9899ea763c81
| | * | | Import translations. DO NOT MERGEBill Yi2019-02-211-14/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Auto-generated-cl: translation import Bug: 64712476 Change-Id: I9190533049b449391162a658b2fd86ae6d6be775
* | | | | Import translations. DO NOT MERGEBill Yi2019-02-0713-56/+29
| | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I808636d9155a2c7de497877096458ca740535986 Auto-generated-cl: translation import
* | | | | Import translations. DO NOT MERGEBill Yi2019-02-0284-347/+540
| | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Iab10885fc58823e834d29440181a6536d0f4049b Auto-generated-cl: translation import
* | | | | Merge "Migrate away from temporary androidx.design_design target."TreeHugger Robot2019-01-314-4/+4
|\ \ \ \ \
| * | | | | Migrate away from temporary androidx.design_design target.Aurimas Liutikas2019-01-314-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | androidx.design_design was a target created temporarily while the com.google.android.material_material was being added. This migrated to the final material design class packages. Exempt-From-Owner-Approval: Large scale refactor Test: make -j LiveWallpapersPicker Change-Id: I9c17c0e8f20e86adc84575f77a0e9bc12bec7308
* | | | | | Show comfirm dialog before deleting a wallpaperKunhung Li2019-01-314-3/+41
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 122505782 Test: Manual Change-Id: I013df1e3d8e33268f382cb237447d8ed2bd8a0a6
* | | | | | Merge "Add cinek@ to OWNERS"TreeHugger Robot2019-01-301-0/+1
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | Add cinek@ to OWNERSSantiago Etchebehere2019-01-301-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 123636540 Test: N/A Change-Id: Ib18aaccb07592018b9526680221e32ffd0dad3d9
* | | | | | Merge "Supports inline control for live wallpapers"Richard Chou2019-01-3015-292/+551
|\ \ \ \ \ \
| * | | | | | Supports inline control for live wallpapersRichard Chou2019-01-2615-292/+551
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | To support inline control (Slice), WallpaperInfo has a new attribute settingsSliceUri. A ViewPager is added to LiveWallpapersPicker for the display of both wallpaper attribution and settings Slice. Bug: 111862421 Test: Manual Change-Id: I28e808ec58f12179da1acc000634d6c41eec805b
* | | | | | | Import translations. DO NOT MERGEBill Yi2019-01-2984-0/+167
| |/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | Change-Id: Iadeb20b07082a672b06b7f6246b4ac1d11fb58e7 Auto-generated-cl: translation import
* | | | | | Merge "Add default code reviewers into OWNERS" am: 6b6aa6d2c9 am: cf79c05390Chih-hung Hsieh2019-01-221-0/+6
|\ \ \ \ \ \ | |/ / / / / |/| / / / / | |/ / / / | | | | | | | | | | am: 242c036c86 Change-Id: I00e903928f9ffbf2b8cb750ebd10816f89ea2f5a
| * | | | Merge "Add default code reviewers into OWNERS" am: 6b6aa6d2c9Chih-hung Hsieh2019-01-221-0/+6
| |\ \ \ \ | | | |/ / | | |/| / | | |_|/ | |/| | | | | | am: cf79c05390 Change-Id: I22e2cf0113eb070b94ceb13b0cc534a43513cc12
| | * | Merge "Add default code reviewers into OWNERS"Chih-hung Hsieh2019-01-221-0/+6
| | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | am: 6b6aa6d2c9 Change-Id: I2419018c3db89b501f18a1978d3661a65bb3edc3
| | | * \ Merge "Add default code reviewers into OWNERS"Chih-hung Hsieh2019-01-221-0/+6
| | | |\ \
| | | | * | Add default code reviewers into OWNERSChih-Hung Hsieh2019-01-181-0/+6
| | | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 33166666 Test: gerrit uploader Change-Id: Iab00d06c13fc4f589cb5458089a0c65d8c2e7fb5
* | | | | Delete feature for LivePickerKunhung Li2019-01-155-4/+87
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Provide a delete function in menu item that can notify delete info to wallpaper package then finish back to the requesting activity. Bug: 122094510 Test: Manual Change-Id: I9e7303ee9cbbae0a7987b4b8848a1aa3293c72b3
* | | | | [automerger skipped] Merge "Convert Android.mk file to Android.bp" am: ↵Sasha Smundak2019-01-110-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 0c3aca9360 am: f45318ec50 am: b9b7fa3818 -s ours am skip reason: change_id I70b8a5fd73dc66dcbb763e98cbb94220db22bd42 with SHA1 c0f4e84763 is in history Change-Id: I8d49821c73b8a9ec6e62b83887422169eff4e968
| * | | | Merge "Convert Android.mk file to Android.bp" am: 0c3aca9360Sasha Smundak2019-01-112-67/+44
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | am: f45318ec50 Change-Id: I477f94a3bf28ba1604488332794cdf879fce22c1
| | * | | Merge "Convert Android.mk file to Android.bp"Sasha Smundak2019-01-112-67/+44
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | am: 0c3aca9360 Change-Id: I65d980e3f7e0327109d32aedec4e962c5c10cd1f
| | | * | Merge "Convert Android.mk file to Android.bp"Treehugger Robot2019-01-112-67/+44
| | | |\ \
| | | | * | Convert Android.mk file to Android.bpSasha Smundak2019-01-112-67/+44
| | | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | See build/soong/README.md for more information. Change-Id: If1a91533b6e8087ac5a235cb0ea5ca82f558868a Fixes: 122332996 Test: treehugger Merged-In: I70b8a5fd73dc66dcbb763e98cbb94220db22bd42
* | | | | Convert Android.mk file to Android.bpSasha Smundak2019-01-102-67/+44
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | See build/soong/README.md for more information. Bug: 122332996 Test: treehugger Change-Id: I70b8a5fd73dc66dcbb763e98cbb94220db22bd42
* | | | | API change for support wallpaper on secondary displays.wilsonshih2018-12-051-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 115486823 Test: Manually launch the app without error. Change-Id: Id159156693c9631ecb2cdca25eece49a4f8396b9
* | | | | Merge "Supports wallpaper for multi display, API change."Wei Sheng Shih2018-11-221-3/+4
|\ \ \ \ \
| * | | | | Supports wallpaper for multi display, API change.wilsonshih2018-11-071-3/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | API change on IWallpaperConnection. Bug: 115486823 Test: manual run this app. Test: atest ActivityManagerMultiDisplayTests Change-Id: I13b8644a041d8ee7a5cced4c4f5d33a0f5ae68b4
* | | | | | Temporary fix for live wallpaper surface flickerSantiago Etchebehere2018-11-051-0/+1
|/ / / / / | | | | | | | | | | | | | | | | | | | | Test: manual, load live wallpaper preview and observe Change-Id: I50e248bb9604f91a6b94e68ebbc3858509af3df7
* | | | | [automerger skipped] Merge pie-platform-release to aosp-master - DO NOT ↵Bill Yi2018-10-240-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | MERGE am: c2d4abae31 -s ours am: af5e8c3901 -s ours am: 180a0921c3 -s ours Change-Id: I715583bd47306a6b07669b94f4ec24cf296ff835
| * | | | [automerger skipped] Merge pie-platform-release to aosp-master - DO NOT ↵Bill Yi2018-10-240-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | MERGE am: c2d4abae31 -s ours am: af5e8c3901 -s ours Change-Id: I4c7dd5a1be5f0a4c5ed9e791f7d1013bb16b6107
| | * | | [automerger skipped] Merge pie-platform-release to aosp-master - DO NOT MERGEBill Yi2018-10-240-0/+0
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | am: c2d4abae31 -s ours Change-Id: I091bc32f7b824c69851e371fa8635a6a4340e548
| | | * | Merge pie-platform-release to aosp-master - DO NOT MERGEBill Yi2018-10-240-0/+0
| | | |\ \ | | | | | | | | | | | | | | | | | | Change-Id: Id924273fc17b694a56d241fb8ce8d76e4cea1017
* | | | | | [automerger skipped] Merge pi-platform-release to stage-aosp-master - DO NOT ↵Bill Yi2018-10-240-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | MERGE am: eac8d2dc2c -s ours am: 3b06db2912 -s ours Change-Id: I450a5ccc192825352d6b70fa0de95d589196d007
| * | | | | [automerger skipped] Merge pi-platform-release to stage-aosp-master - DO NOT ↵Bill Yi2018-10-240-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | MERGE am: eac8d2dc2c -s ours Change-Id: I5dbfcb257e2c10461da96d8496ce40967bf65c3e
| | * | | | Merge pi-platform-release to stage-aosp-master - DO NOT MERGEBill Yi2018-10-240-0/+0
| | |\ \ \ \ | | | |/ / / | | |/| / / | | | |/ / Change-Id: I95ca310b02c4d680d1d11bafe17a1880d0be14c6
| | | * | Snap for 4799153 from 0f6e5a85ec95926d748a08f205ca688e18149254 to pi-releaseandroid-build-team Robot2018-05-232-4/+4
| | | |\| | | | | | | | | | | | | | | | Change-Id: I556fc07636cf33f1a674de44f8a074c7bcc8eb04
| | | * | Snap for 4752322 from 5e6dbf35511529c17a3a3ca8ecad49079f6763eb to pi-releaseandroid-build-team Robot2018-04-301-1/+1
| | | |\ \ | | | | | | | | | | | | | | | | | | Change-Id: If424d3d31ac6ce7800c253d2e1590d9e220e486c
| | | * \ \ Snap for 4728508 from 8068ccd982aa325a7bbfb7aaae6e08e68e05cb87 to pi-releaseandroid-build-team Robot2018-04-181-1/+1
| | | |\ \ \ | | | | | | | | | | | | | | | | | | | | | Change-Id: I3173fe8f64f5cf604fc0bb236aa608b6da6e2184
| | | * \ \ \ Snap for 4693621 from 859a377985509a17a358f313d149ad71aa628aca to pi-releaseandroid-build-team Robot2018-04-012-0/+72
| | | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I683c74d67146f1bd42dea79831b0ca9d6e8ad73e