Fan Zhang
a6b9102e34
Don't index icon for support setting.
...
Change-Id: I86c32f45e462330ea74060d60f987d80e45348e5
Fixes: 115555140
Test: reindex
2018-09-13 17:31:01 -07:00
Fan Zhang
29aaf62410
Only replace updated cards after loading from db.
...
There are currently 2 ways a list of contextual cards can be updated:
1. through loader onFinishLoading
2. onContextualCardUpdated
We need to make the data handling logic consistent between the 2 paths.
Also changed some loops to stream for simplicity.
Change-Id: I242732e180a14092f5745271e5f63c18a6e482e0
Fixes: 115572494
Test: robotests
2018-09-13 14:04:07 -07:00
Fan Zhang
0f8536b034
Merge "Create custom card controller/render as soon as possible."
2018-09-13 20:05:58 +00:00
Julia Reynolds
7217c4421f
Prevent non-blockable app from being blocked
...
In the recent notifications display.
Test: manual
Change-Id: I0b14dfbcb8c4a971bb028def7751d083d37958de
Fixes: 111863327
2018-09-13 14:02:50 -04:00
Fan Zhang
a93743f9c4
Create custom card controller/render as soon as possible.
...
Custom cards might need to monitor lifecycle events, waiting for
onFinishLoading is too late.
Also make sure custom cards cannot change card type.
Test: manual
Change-Id: Ib8f8e6e48926a63c9d241ed9e9843c025e3f634a
2018-09-13 09:20:59 -07:00
TreeHugger Robot
a95584eed5
Merge "Revert the mandatory backups feature."
2018-09-13 08:45:34 +00:00
TreeHugger Robot
75e2bdbcc9
Merge "Do not include disabled activity in Default Browser."
2018-09-13 01:57:53 +00:00
TreeHugger Robot
7e8ea8db98
Merge "Fix nits in contextual card package."
2018-09-13 01:36:37 +00:00
Fan Zhang
ff6f6f6991
Merge "Clean up: delete unused methods" am: 41f9566da8
am: b371dea0cb
...
am: 88cbe51f27
Change-Id: Ib166230d692cc7a3973355239161ed88ffd6af60
2018-09-12 17:44:52 -07:00
Fan Zhang
88cbe51f27
Merge "Clean up: delete unused methods" am: 41f9566da8
...
am: b371dea0cb
Change-Id: I0545f7f9914337d64d8d91eb152005e4858b6869
2018-09-12 17:39:21 -07:00
Fan Zhang
b371dea0cb
Merge "Clean up: delete unused methods"
...
am: 41f9566da8
Change-Id: I973b289c688c04c00f70a6c0ba15a5b205d6633a
2018-09-12 17:12:54 -07:00
Fan Zhang
e81063a40d
Merge "Changes on Settings UI for a better user experience" am: 7737b64159
am: 97cb71e978
...
am: 309d86f613
Change-Id: I47d4fba4fddb44c270b37f590c86b736d2ca5271
2018-09-12 16:52:35 -07:00
Fan Zhang
41f9566da8
Merge "Clean up: delete unused methods"
2018-09-12 23:46:31 +00:00
Bill Yi
b05b93e28b
[automerger skipped] Import translations. DO NOT MERGE am: 85c82c5681
-s ours
...
am: a0bfe20b35
-s ours
Change-Id: Ifcf837e01890110d0015ca19fd6fa922d70d8188
2018-09-12 16:33:35 -07:00
TreeHugger Robot
4d44c02b0e
Merge "Remove battery app list feature flag"
2018-09-12 23:26:20 +00:00
Fan Zhang
309d86f613
Merge "Changes on Settings UI for a better user experience" am: 7737b64159
...
am: 97cb71e978
Change-Id: I2862387d1cc18fb8536ed1a1e1c9441b64395977
2018-09-12 16:25:12 -07:00
Fan Zhang
97cb71e978
Merge "Changes on Settings UI for a better user experience"
...
am: 7737b64159
Change-Id: I591b6eac611109bd903c99f79ecd63d37ca59511
2018-09-12 16:13:08 -07:00
Fan Zhang
7737b64159
Merge "Changes on Settings UI for a better user experience"
2018-09-12 22:44:39 +00:00
TreeHugger Robot
b01d15aab1
Merge "Fix visibility of AddUser when toggling multiuser."
2018-09-12 22:34:55 +00:00
Doris Ling
dfe663879d
Do not include disabled activity in Default Browser.
...
- query the intent activites with flags 0, so that only
enabled activities will be returned.
Change-Id: I6ec4e3f3fdff850228a723bcb2d2bdc5721b41eb
Fixes: 111796304
Test: make RunSettingsRoboTests
2018-09-12 15:34:49 -07:00
Bill Yi
a0bfe20b35
[automerger skipped] Import translations. DO NOT MERGE
...
am: 85c82c5681
-s ours
Change-Id: I0e777523597d91407f23f1f5c1ae8f84dd27c051
2018-09-12 15:30:03 -07:00
Fan Zhang
089ed21526
Fix nits in contextual card package.
...
We missed to catch a few nits in previous CLs. This change cleans up
some of it.
Test: manual
Change-Id: Ibd3466f781952f998e1183a49f56e812cbce99a1
2018-09-12 14:07:12 -07:00
Fan Zhang
de3ff1eee1
Merge "Implemented the CardContentLoader"
2018-09-12 20:14:56 +00:00
Fan Zhang
409a5f8c98
Clean up: delete unused methods
...
Test: rebuild
Change-Id: I144ebbdaf137ee091af949a9e38f68d02941f705
2018-09-12 13:08:15 -07:00
jackqdyulei
94b26f12ad
Remove battery app list feature flag
...
It is not used anymore
Bug: 115542275
Test: Build
Change-Id: I931d081a13d5d4b698c785205d356182fec3e02d
2018-09-12 12:58:04 -07:00
Doris Ling
73d7773eb2
Fix visibility of AddUser when toggling multiuser.
...
- when enabling multi user, also need to update the visibility of the
Add user preference, but need to check the add user capability as well.
Change-Id: Ia243901c7537bdb39ca3a39aed559b003f803e4d
Fixes: 115397726
Test: make RunSettingsRoboTests
2018-09-12 12:33:46 -07:00
Jin Dong
c085694cc2
Changes on Settings UI for a better user experience
...
Oem can change the left padding and right padding of main text
in below screens by overlay the relative dimens:
- "Network settings reset"
- "Factory data reset"
- "Screen pinning"
Bug: 113607004
Test: manual
Change-Id: Ief1afd6ee05b9723874866a06f1748d9d9987333
2018-09-12 12:26:18 -07:00
Bill Yi
85c82c5681
Import translations. DO NOT MERGE
...
Auto-generated-cl: translation import
Bug: 64712476
Change-Id: I6f84ca21470e0f9224b2c038b25757f70ff25c8a
2018-09-12 12:07:42 -07:00
Sunny Shao
a87e4cb227
Implemented the CardContentLoader
...
- Implemented the CardContentLoader
- Refactored the CardLoader and increased the code readable
- Added try-with-resource
- Removed all custom card codes
- Modified ContextualCardManager to add CardContentLoaderCallbacks
Bug: 112521307
Test: robotest
Change-Id: Ieb9cdeaacdfb8fdae9747c60395206d15af034c1
2018-09-12 10:34:40 -07:00
TreeHugger Robot
16a71df6a3
Merge "Check for Data Usage intent before populating "Data Usage" summary."
2018-09-12 16:57:19 +00:00
Lenka Trochtova
2f4558d3fc
Revert the mandatory backups feature.
...
Bug: 79736299
Test: make RunSettingsGoogleRoboTests
Test: make RunSettingsRoboTests
Change-Id: Ie9702664c0fb4daccdee74eac6080c959fe1b608
2018-09-12 11:52:11 +02:00
Fan Zhang
d67668a1c3
Merge "Fix a crash when launching app detail for bad package name" am: ada1a39ffb
am: 2e2e1e243d
...
am: 59cd5abb96
Change-Id: I746d5c959761306d463a934e7c01f4155934fd93
2018-09-11 18:53:09 -07:00
Fan Zhang
59cd5abb96
Merge "Fix a crash when launching app detail for bad package name" am: ada1a39ffb
...
am: 2e2e1e243d
Change-Id: I3614f70f71c0e0eb064331175cb51fa30ed5a5b7
2018-09-11 18:49:12 -07:00
Fan Zhang
2e2e1e243d
Merge "Fix a crash when launching app detail for bad package name"
...
am: ada1a39ffb
Change-Id: Ia96ca4a889e9005da4e685b8e04ae2d6b78eff85
2018-09-11 18:28:08 -07:00
Treehugger Robot
ada1a39ffb
Merge "Fix a crash when launching app detail for bad package name"
2018-09-12 00:57:40 +00:00
TreeHugger Robot
cd03bdd9de
Merge "Move ShadowXmlUtils to settingslib"
2018-09-11 23:53:19 +00:00
Fan Zhang
13d2551156
Fix a crash when launching app detail for bad package name
...
Change-Id: I3bfb5f8e003b810c09d295bc89f4a59af186a121
Fixes: 78779901
Test: robotests
2018-09-11 15:12:16 -07:00
Fan Zhang
acb31abf06
[automerger skipped] Merge "Add config to disable app tray preview in display size." am: 98a1ebedcd
-s ours am: 4e8e6c3e67
...
am: 8a25b25da1
-s ours
Change-Id: I0c0d0f338a724cec812d7fcc7e2bc521fc673a35
2018-09-11 13:41:17 -07:00
Fan Zhang
8a25b25da1
[automerger skipped] Merge "Add config to disable app tray preview in display size." am: 98a1ebedcd
-s ours
...
am: 4e8e6c3e67
Change-Id: I47f5ec55e84aae55767d3032bcf04bea257c13c8
2018-09-11 13:27:34 -07:00
Fan Zhang
4e8e6c3e67
[automerger skipped] Merge "Add config to disable app tray preview in display size."
...
am: 98a1ebedcd
-s ours
Change-Id: I36fb69986ab30b14f3040de35cbd9aaa6d7969b1
2018-09-11 13:13:33 -07:00
Fan Zhang
2ee4a4846e
Move ShadowXmlUtils to settingslib
...
Test: robotests
Change-Id: Iadea11ff207cab90a9803cb88d76b7b00b4a03df
2018-09-11 12:54:23 -07:00
TreeHugger Robot
939f3a3823
Merge "Null check for ManagedServiceSetting dialog title"
2018-09-11 19:08:54 +00:00
Fan Zhang
98a1ebedcd
Merge "Add config to disable app tray preview in display size."
2018-09-11 16:27:57 +00:00
Beverly
6543b077cb
Null check for ManagedServiceSetting dialog title
...
Test: manual
Change-Id: If3753b01431ab9690cdbae5a0d7f0edf9c80fcec
Fixes: 114803288
2018-09-11 10:06:13 -04:00
Sunny Shao
744cb8b18f
Merge "Added the bulkInsert for CardContentProvider"
2018-09-11 03:32:34 +00:00
Fan Zhang
18eecb1e67
Add config to disable app tray preview in display size.
...
Also move some files
Change-Id: I4636fcd81425991acadede0b703e09513c82543c
Merged-In: I4636fcd81425991acadede0b703e09513c82543c
Fixes: 113374067
Test: robotests
2018-09-10 19:01:35 -07:00
Fan Zhang
9aca4cb48c
Add config to disable app tray preview in display size.
...
Also move some files
Change-Id: I4636fcd81425991acadede0b703e09513c82543c
Fixes: 113374067
Test: robotests
2018-09-10 15:03:54 -07:00
Fan Zhang
6312aa28e3
Fix resource not found error in robolectric tests
...
Test: rerun tests
Change-Id: I5374fb39b9b10bebb5b7fe92ae9e787ac9db0deb
2018-09-10 10:25:08 -07:00
Fan Zhang
603d31f3dc
[automerger skipped] Merge "DO NOT MERGE Import clean up." am: 8a2c9e79b0
-s ours am: 86e0ae5b6a
-s ours
...
am: 6097b78d62
-s ours
Change-Id: Id948f277d407440d44c94445c8dff8f763e0c440
2018-09-10 09:34:57 -07:00
Fan Zhang
6097b78d62
[automerger skipped] Merge "DO NOT MERGE Import clean up." am: 8a2c9e79b0
-s ours
...
am: 86e0ae5b6a
-s ours
Change-Id: Ie02b99cc39273c02830be231bf407f2a3065a826
2018-09-10 09:31:09 -07:00