OSDN Git Service
Maurice Lam [Fri, 5 Oct 2018 02:49:08 +0000 (19:49 -0700)]
Ignore lock type in ChooseLockGeneric in non-FBE
We need to show the encryption opt-in in non-FBE cases.
Test: atest RunSettingsRoboTests
Bug:
115847373
Change-Id: I3a92b265c9c8ecf5d4af009943b5b9483e25a738
TreeHugger Robot [Tue, 25 Sep 2018 23:19:13 +0000 (23:19 +0000)]
Merge "Remove check to limit suggestions to 2"
TreeHugger Robot [Tue, 25 Sep 2018 23:10:02 +0000 (23:10 +0000)]
Merge "Redo the empty states in print settings"
TreeHugger Robot [Tue, 25 Sep 2018 22:34:37 +0000 (22:34 +0000)]
Merge "Add 'notificaton blocked' filter to notifications"
TreeHugger Robot [Tue, 25 Sep 2018 22:01:53 +0000 (22:01 +0000)]
Merge "Clean up: remove unused SuggestionFeature api."
Fan Zhang [Tue, 25 Sep 2018 20:56:30 +0000 (20:56 +0000)]
Merge "Fix add icon"
Fan Zhang [Tue, 25 Sep 2018 20:44:30 +0000 (13:44 -0700)]
Remove check to limit suggestions to 2
This is already enforced from SuggestionService side.
Test: rebuild/robotests
Change-Id: Icd5faa3b7114b369d96459b00b43d4e7eaeae5c5
Fan Zhang [Tue, 25 Sep 2018 20:16:59 +0000 (13:16 -0700)]
Clean up: remove unused SuggestionFeature api.
Test: robotests
Change-Id: I91d06d93834674ca6019a86f8b3891198d424d7a
Fan Zhang [Tue, 25 Sep 2018 19:15:19 +0000 (19:15 +0000)]
Merge "Move AppPreference to settingslib, and change imports."
Youming Ye [Tue, 25 Sep 2018 17:31:48 +0000 (10:31 -0700)]
Merge "Wrong Carrier Config values are used in ApnSettings for Multi SIM device" am:
b7e3552b83 am:
31576aae7c
am:
d976002dea
Change-Id: Iec53ef5f156b986a61a085a0a7c758574a78cee2
Youming Ye [Tue, 25 Sep 2018 17:27:22 +0000 (10:27 -0700)]
Merge "Wrong Carrier Config values are used in ApnSettings for Multi SIM device" am:
b7e3552b83
am:
31576aae7c
Change-Id: Ib37954bccacb44b670ee6c1af6e7188fdd91a46a
Youming Ye [Tue, 25 Sep 2018 17:20:06 +0000 (10:20 -0700)]
Merge "Wrong Carrier Config values are used in ApnSettings for Multi SIM device"
am:
b7e3552b83
Change-Id: I14a7f51ace0637a6248fe13f9a4dc46ee4b9c0a1
Fan Zhang [Tue, 25 Sep 2018 17:02:55 +0000 (10:02 -0700)]
Fix add icon
Change-Id: I3ffe5a71081aa03885fa8fada9ae6dff70db6171
Fixes:
116542229
Test: visual
Youming Ye [Tue, 25 Sep 2018 17:04:10 +0000 (17:04 +0000)]
Merge "Wrong Carrier Config values are used in ApnSettings for Multi SIM device"
Fan Zhang [Mon, 24 Sep 2018 19:29:57 +0000 (12:29 -0700)]
Move AppPreference to settingslib, and change imports.
Bug:
116364655
Test: robotests
Change-Id: I313272737dc7c068c47abf8ea021de7d2bea0a25
Julia Reynolds [Mon, 24 Sep 2018 13:19:46 +0000 (09:19 -0400)]
Add 'notificaton blocked' filter to notifications
Test: robotests
Change-Id: I5c0cd9a2f73b6a22d66df7669e944bbe1473539c
Fixes:
112576746
timhypeng [Wed, 19 Sep 2018 07:54:13 +0000 (15:54 +0800)]
Fix the logic error on PBAP permission assignment
-add test case
Bug:
114808220
Test: make -j42 RunSettingsRoboTests
Change-Id: Id77ade12c28e31a21c1c7a5dcb28906112d3465b
TreeHugger Robot [Tue, 25 Sep 2018 00:29:23 +0000 (00:29 +0000)]
Merge "Settings icon pack refresh"
Fan Zhang [Mon, 24 Sep 2018 21:01:17 +0000 (14:01 -0700)]
Settings icon pack refresh
* ic_add_24dp
* ic_airplane
* ic_arrow_down_24dp
* ic_cellular_off
* ic_data_saver
* ic_device_others
* ic_info_outline_24dp
* ic_search
* ic_night_display
* ic_lock_open
* ic_wifi
* ic_sync
* ic_wallpaper
* ic_phone
Bug:
116360411
Test: visual
Change-Id: I626cbb88043c36d32ab34b90fc83170bca0be12a
Torbjorn Eklund [Mon, 24 Sep 2018 18:08:59 +0000 (11:08 -0700)]
Merge "ApnEditor: Consider subId when reading carrier config" am:
f6f7079709 am:
db353e2c4a
am:
bfe80e39f2
Change-Id: I848fd4084f43b2aeb69cb5175c1c10de3355c21f
Torbjorn Eklund [Mon, 24 Sep 2018 17:57:37 +0000 (10:57 -0700)]
Merge "ApnEditor: Consider subId when reading carrier config" am:
f6f7079709
am:
db353e2c4a
Change-Id: Ie2ad2655b5fc399610acdcfd8327e99c60b7e2a8
Torbjorn Eklund [Mon, 24 Sep 2018 17:48:00 +0000 (10:48 -0700)]
Merge "ApnEditor: Consider subId when reading carrier config"
am:
f6f7079709
Change-Id: I8d49e7f38528da4f5fc0cd18eecfd59854b7505f
Treehugger Robot [Mon, 24 Sep 2018 17:24:03 +0000 (17:24 +0000)]
Merge "ApnEditor: Consider subId when reading carrier config"
TreeHugger Robot [Mon, 24 Sep 2018 17:16:42 +0000 (17:16 +0000)]
Merge "Fix account deletion not updating account display"
TreeHugger Robot [Sun, 23 Sep 2018 00:53:28 +0000 (00:53 +0000)]
Merge "Import translations. DO NOT MERGE"
Bill Yi [Sat, 22 Sep 2018 23:08:33 +0000 (16:08 -0700)]
[automerger skipped] Import translations. DO NOT MERGE am:
5a4269d21e -s ours
am:
a553a09700 -s ours
Change-Id: I22b8a5fd5b6b1f4c9a1c03ae3161f6993721e74c
Bill Yi [Sat, 22 Sep 2018 23:02:30 +0000 (16:02 -0700)]
[automerger skipped] Import translations. DO NOT MERGE
am:
5a4269d21e -s ours
Change-Id: I311f91cf73c826e657061f3fdbafd6e6c9ac5fa9
TreeHugger Robot [Sat, 22 Sep 2018 22:50:13 +0000 (22:50 +0000)]
Merge "Format regression test files"
Bill Yi [Sat, 22 Sep 2018 18:38:37 +0000 (11:38 -0700)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug:
64712476
Change-Id: I4317549e4010bb2cf75b07ade3cb8d54ba6dc708
Bill Yi [Sat, 22 Sep 2018 18:28:52 +0000 (11:28 -0700)]
Import translations. DO NOT MERGE
Change-Id: Icd25d8420b9c9facf3ee5bc363f2b2804d319716
Auto-generated-cl: translation import
TreeHugger Robot [Sat, 22 Sep 2018 00:06:00 +0000 (00:06 +0000)]
Merge "Disable recently used apps in battery saver mode."
TreeHugger Robot [Fri, 21 Sep 2018 21:31:38 +0000 (21:31 +0000)]
Merge "Add intent filter to launch usage access for app."
Fan Zhang [Fri, 21 Sep 2018 21:14:16 +0000 (14:14 -0700)]
Disable recently used apps in battery saver mode.
UsageStats query is too slow.
Change-Id: I53fa13924514e71221d3a6407139ff00ae5eb378
Fixes:
114788699
Test: robotests
Lei Yu [Fri, 21 Sep 2018 20:24:27 +0000 (13:24 -0700)]
[automerger skipped] Merge "Fix incorrect API invoke for BT profiles" am:
625c1eeaa9 am:
dbc26b576c
am:
6ef05a6c23 -s ours
Change-Id: I89d838f7456503f987b6ac8ba706a3457694a16a
Lei Yu [Fri, 21 Sep 2018 20:20:16 +0000 (13:20 -0700)]
Merge "Fix incorrect API invoke for BT profiles" am:
625c1eeaa9
am:
dbc26b576c
Change-Id: Ic6b7a4b7541310b3a635b94a799e3476cf5cc684
Lei Yu [Fri, 21 Sep 2018 20:13:39 +0000 (13:13 -0700)]
Merge "Fix incorrect API invoke for BT profiles"
am:
625c1eeaa9
Change-Id: I1a7f98b25cae2695d8f5895c8f6e03072ef4600f
Antony Sargent [Thu, 20 Sep 2018 23:35:06 +0000 (16:35 -0700)]
Fix account deletion not updating account display
The visible symptom of this problem is that when deleting an account, if
a screen lock is set, after confirming the removal and entering the
credentials, you end up back on the account details for the page and it
looks like the deletion failed (even though it didn't).
There were two problems here:
-We were expecting the AccountDetailDashboardFragment to be in a resumed
state at the end of the confirmation dialog, but it wasn't if we had
launched the activity to have the user enter their screen lock
credentials. In the past trying to finish an activity that wasn't in
resumed state seemed to have generated a crash (b/
6494527), but that
isn't the case anymore from some tests I ran.
-The AccountDetailDashboardFragment doesn't check in onResume that the
account still exists.
This CL fixes the bug in 2 ways - we'll always try to finish the
AccountDetailDashboardFragment if the account removal succeeded, and
when AccountDetailDashboardFragment's onResume is called we'll always
check for the account existence. Either approach would be sufficient on
its own.
Change-Id: Iaa65e97fca5dfc8b1251968142e47315e3b590c2
Fixes:
112845988
Test: make RunSettingsRoboTests
Lei Yu [Fri, 21 Sep 2018 19:50:45 +0000 (19:50 +0000)]
Merge "Fix incorrect API invoke for BT profiles"
Lei Yu [Fri, 21 Sep 2018 02:25:34 +0000 (02:25 +0000)]
Merge "Fix null pointer crash in BT renaming dialog"
TreeHugger Robot [Fri, 21 Sep 2018 01:40:29 +0000 (01:40 +0000)]
Merge changes from topic "mobile_select_migration"
* changes:
Fix compile error in NetwotkSelectSettings
Copy NetworkSelectSettings to settings app
Philip P. Moltmann [Fri, 21 Sep 2018 00:03:23 +0000 (17:03 -0700)]
Redo the empty states in print settings
In the end the UI does not change but the new states:
- Are similar to the "empty" states we use in the print spooler
- Use the system print icon
- Use a translucent background icon which works correctly with dark mode
Test: Looked at all changed Settings pages
Fixes:
115830412
Change-Id: I1f5b005674e7072e989355f01ebd3fdaf56c9355
Fan Zhang [Thu, 20 Sep 2018 23:21:53 +0000 (16:21 -0700)]
Add intent filter to launch usage access for app.
Change-Id: Ide8aa590f9b4218d0f4affe65a7daec384480798
Fixes:
110200770
Test: adb shell am start -a android.settings.USAGE_ACCESS_SETTINGS -d package:com.android.settings
Fan Zhang [Thu, 20 Sep 2018 21:31:47 +0000 (14:31 -0700)]
Format regression test files
Test: retest
Change-Id: I7c44bd39bc80768f455b95b5f314fbe65bf94b96
jackqdyulei [Tue, 18 Sep 2018 22:07:49 +0000 (15:07 -0700)]
Fix incorrect API invoke for BT profiles
When hearing aid device has been set active, we shouldn't invoke
1. a2dpProfile.setActiveDevice()
2. hfpProfile.setActiveDevice()
Change-Id: Ie13dea041dd98d0cb9d913e1f28574b300095db9
Merged-In: Ie13dea041dd98d0cb9d913e1f28574b300095db9
Fixes:
113625278
Test: RunSettingsRoboTests
Julia Reynolds [Thu, 20 Sep 2018 19:11:45 +0000 (19:11 +0000)]
Merge "Make the volume slider height 48dp"
Fan Zhang [Thu, 20 Sep 2018 18:58:47 +0000 (18:58 +0000)]
Merge "Set MODE_LARGE to sliceView in the homepage."
jackqdyulei [Wed, 19 Sep 2018 01:22:22 +0000 (18:22 -0700)]
Fix compile error in NetwotkSelectSettings
1. Remove all the internal dependencies and add TODO
2. Use the API in SettingsFragment for progressbar
Bug:
114749736
Test: Build
Change-Id: If2f57dd24528ae1aac6a1fe84d4a40db237ae7da
jackqdyulei [Wed, 19 Sep 2018 00:50:55 +0000 (17:50 -0700)]
Copy NetworkSelectSettings to settings app
This is a clean copy except:
1. Fix issues in strings.xml to make it pass pre-upload check
a) add "CHAR_LIMIT"
b) Update special character
Future CL will remove compile error and make it compatible with
settings.
Bug:
114749736
Test: Build
Change-Id: I8fe28ff1358f94334ff9663a4404628ae0eff9af
TreeHugger Robot [Thu, 20 Sep 2018 16:50:13 +0000 (16:50 +0000)]
Merge "Don't persist device index job across reboot"
TreeHugger Robot [Thu, 20 Sep 2018 16:48:21 +0000 (16:48 +0000)]
Merge "Do not show restricted icon by default"
TreeHugger Robot [Thu, 20 Sep 2018 15:29:06 +0000 (15:29 +0000)]
Merge "Developer option to enable CBRS"
Torbjorn Eklund [Wed, 25 Jul 2018 20:14:30 +0000 (22:14 +0200)]
ApnEditor: Consider subId when reading carrier config
Considers subId when reading carrier config values
KEY_READ_ONLY_APN_TYPES_STRING_ARRAY and
KEY_READ_ONLY_APN_FIELDS_STRING_ARRAY.
This ensures that the APN will be editable or non-editable correctly
when using dual sim.
Bug:
112929355
Test: Manual
Change-Id: I2186dd5e1f71ca5361309a7314f84cf4fa2d3937
Emily Chuang [Thu, 20 Sep 2018 06:51:14 +0000 (14:51 +0800)]
Set MODE_LARGE to sliceView in the homepage.
The mode of sliceView is set to MODE_SHORTCUT accidentally
in the previous commit. Set it back to MODE_LARGE.
Change-Id: I1ae8e895fc0172d2d93fc19c54803d56040379da
Fixes:
115709730
Test: robotests
TreeHugger Robot [Thu, 20 Sep 2018 05:42:56 +0000 (05:42 +0000)]
Merge "Add a controller and renderer for Slices."
TreeHugger Robot [Thu, 20 Sep 2018 02:18:34 +0000 (02:18 +0000)]
Merge "Don't index icon for support setting."
Emily Chuang [Fri, 14 Sep 2018 10:26:37 +0000 (18:26 +0800)]
Add a controller and renderer for Slices.
Many contextual cards will be built as slices, so we need a controller
and a renderer for them.
Change-Id: I3816db09ba0181399810652fb18fbe11ce273267
Fixes:
115709730
Test: robotests
Naina Nalluri [Wed, 15 Aug 2018 03:06:49 +0000 (20:06 -0700)]
Developer option to enable CBRS
Add new developer option to enable
or disable CBRS Data
Bug:
113278158
Test: On device
Change-Id: I667a7c90b0bb7e9e0c70f41b28d376c9170e65d9
Lei Yu [Thu, 20 Sep 2018 00:13:55 +0000 (00:13 +0000)]
Merge "Fix incorrect API invoke for BT profiles"
TreeHugger Robot [Wed, 19 Sep 2018 23:41:43 +0000 (23:41 +0000)]
Merge "Add Settings Search Regression test"
Fan Zhang [Wed, 19 Sep 2018 23:08:56 +0000 (16:08 -0700)]
Don't persist device index job across reboot
Change-Id: I9bd25c7f266dded730918ec517e842c2b6ee9b1a
Fixes:
115930605
Test: manual
TreeHugger Robot [Wed, 19 Sep 2018 21:45:44 +0000 (21:45 +0000)]
Merge "Add checks before casting entry.extraInfo."
Philip P. Moltmann [Wed, 19 Sep 2018 20:43:40 +0000 (13:43 -0700)]
Do not show restricted icon by default
I made it visible by default by accident.
Test: Looked at Settings > Security & locations > Screen pinning
Change-Id: I8ff6dc72e292ba76550edaeeac4d53ef4bd39505
Fixes:
116109852
TreeHugger Robot [Wed, 19 Sep 2018 19:51:56 +0000 (19:51 +0000)]
Merge "Reset all notification settings on clear app prefs"
Julia Reynolds [Wed, 19 Sep 2018 16:55:45 +0000 (12:55 -0400)]
Make the volume slider height 48dp
Change-Id: Ia5852d61adc4bd582e7b0e75f61a05ae3a53ae04
Fixes:
114149194
Test: manual
Julia Reynolds [Wed, 19 Sep 2018 16:23:41 +0000 (12:23 -0400)]
Add checks before casting entry.extraInfo.
Test: make, flash
Change-Id: I1a9d6a51b1f236e711fdb49d9c2f795e7023cfce
Fixes:
113309404
Julia Reynolds [Wed, 19 Sep 2018 16:18:13 +0000 (12:18 -0400)]
Reset all notification settings on clear app prefs
Not just the app level 'are these notifications blocked?'
field.
Test: manual
Change-Id: Id77366d0d71e1f0d2507f1a30123d61aa11db252
Fixes:
65476259
Bill Yi [Wed, 19 Sep 2018 15:34:10 +0000 (15:34 +0000)]
Merge "Import translations. DO NOT MERGE"
TreeHugger Robot [Wed, 19 Sep 2018 09:44:24 +0000 (09:44 +0000)]
Merge "Add policy transparency to disallow remove user."
Jonathan Scott [Wed, 12 Sep 2018 13:40:15 +0000 (14:40 +0100)]
Add policy transparency to disallow remove user.
On the Settings > System -> Multiple users screen, ensures that the"Delete from this device" menu is always available, but is disabled and includes policy information when DISABLE_REMOVE_USER is set.
Change-Id: Ia6c6cfb360f35a6e447bf9d85d2472ac11dde1ac
Fix:
113807450
Test: m ROBOTEST_FILTER=UserSettingsTest -j40 RunSettingsRoboTests; CTS Verifier Device Owner Tests/Policy transparency test/Disallow remove user.
Matthew Fritze [Tue, 17 Jul 2018 20:47:39 +0000 (13:47 -0700)]
Add Settings Search Regression test
Take a snapshot of the currently available search results, and
verify that search results aren't accidentally removed.
We use 4 items to identify a search result:
- Title
- Data Key
- Slice Uri
We use Title & Key to identify the search result, since they should not change.
The Slice Uri is used to make sure we don't regress on Slice Availability.
Test: runtest --path packages/apps/Settings/tests/unit/src/com/android/settings/search/SettingsSearchResultRegressionTest.java
Change-Id: I22498229bbcd1e90c9e0a026af9df4367a98190a
jackqdyulei [Tue, 18 Sep 2018 22:07:49 +0000 (15:07 -0700)]
Fix incorrect API invoke for BT profiles
When hearing aid device has been set active, we shouldn't invoke
1. a2dpProfile.setActiveDevice()
2. hfpProfile.setActiveDevice()
Change-Id: Ie13dea041dd98d0cb9d913e1f28574b300095db9
Fixes:
113625278
Test: RunSettingsRoboTests
jackqdyulei [Mon, 17 Sep 2018 20:25:36 +0000 (13:25 -0700)]
Fix null pointer crash in BT renaming dialog
The dialog may become null after onDestroy has been invoked, so
we need to catch this case.
This CL also moves the listener outside to make it easy to test.
Change-Id: I4ce640c5bdaf1f201f9fecb14b3e5e38e10d4b79
Fixes:
115679393
Test: RunSettingsRoboTests
Bill Yi [Tue, 18 Sep 2018 19:56:34 +0000 (12:56 -0700)]
Import translations. DO NOT MERGE
Change-Id: Ib3aeafee3272f1adf99daac0b15f8dff71867ec3
Auto-generated-cl: translation import
TreeHugger Robot [Tue, 18 Sep 2018 19:41:41 +0000 (19:41 +0000)]
Merge "Move hasReadyMobileRadio() to DataUsageUtils."
TreeHugger Robot [Tue, 18 Sep 2018 18:26:47 +0000 (18:26 +0000)]
Merge "Fix Homepage wrong color in dark theme"
Doris Ling [Tue, 18 Sep 2018 18:21:59 +0000 (11:21 -0700)]
Move hasReadyMobileRadio() to DataUsageUtils.
- move the method from DataUsageList to DataUsageUtils where other
utility methods are.
Bug:
111751694
Test: make RunSettingsRoboTests
Change-Id: If7176cb4278d568f890a0c94437c4483bbd472f9
Philip P. Moltmann [Tue, 18 Sep 2018 15:27:36 +0000 (15:27 +0000)]
Merge "Make Settings use system-api restricted icon."
TreeHugger Robot [Tue, 18 Sep 2018 02:58:01 +0000 (02:58 +0000)]
Merge "Import translations. DO NOT MERGE"
Mill Chen [Tue, 18 Sep 2018 00:53:31 +0000 (00:53 +0000)]
Merge "Add a rule to keep classes that implements CustomSliceable"
TreeHugger Robot [Tue, 18 Sep 2018 00:42:16 +0000 (00:42 +0000)]
Merge "Fix inconsistent icon size in app list."
Doris Ling [Mon, 17 Sep 2018 23:55:03 +0000 (23:55 +0000)]
Merge "Use the new network stats loader to get usage data for all apps."
Bill Yi [Mon, 17 Sep 2018 23:42:42 +0000 (16:42 -0700)]
Import translations. DO NOT MERGE
Change-Id: Idacabf81cf4dae12f8a9f0174a13901088a3a5d1
Auto-generated-cl: translation import
Raff Tsai [Mon, 17 Sep 2018 06:40:08 +0000 (14:40 +0800)]
Fix Homepage wrong color in dark theme
Change-Id: Id22f8baff0b97c0e7081fb8c68241bc8d0d01a45
Fixes:
113964702
Fixes:
115789360
Test: manual
Fan Zhang [Mon, 17 Sep 2018 23:06:23 +0000 (16:06 -0700)]
Fix inconsistent icon size in app list.
Some app icons are really small. This is technically a bug in app, but
not handling it well makes settings UI look strange.
So in addition to setting a max size app icon can use, we just set that
as a only supported size (min == max == 36dp)
Change-Id: I4b3a1b83ab67be469ac74e7d4bb382ae855624d0
Fixes:
115788294
Test: visual
Philip P. Moltmann [Thu, 30 Aug 2018 18:07:33 +0000 (11:07 -0700)]
Make Settings use system-api restricted icon.
Test: Browsed around settings
Bug:
110953302
Change-Id: I1b19be721719ed8946cb558b93119b1b0e173794
Bill Yi [Mon, 17 Sep 2018 22:25:52 +0000 (15:25 -0700)]
[automerger skipped] Import translations. DO NOT MERGE am:
1a84e070b3 -s ours
am:
7c6679fac0 -s ours
Change-Id: Ib4dc327c3c76a7d59fbe9b892340d6b546a3ac2f
Lei Yu [Mon, 17 Sep 2018 22:16:00 +0000 (22:16 +0000)]
Merge "Revert "call getName() from CachedBluetoothDevice, not CachedBluetoothDeviceManager""
Lei Yu [Mon, 17 Sep 2018 18:22:57 +0000 (18:22 +0000)]
Revert "call getName() from CachedBluetoothDevice, not CachedBluetoothDeviceManager"
This reverts commit
3029efc5f7047596315119bdb1e7056ba26cd071.
Reason for revert:
To fix null pointer crash in Pairing dialog. Dialog maybe triggered by intent, in which LocalBluetoothManager couldn't have instance for BluetoothDevice and will return null. As a result, we need to depend on method in CachedBluetoothManager to handle it.
Bug:
115754654
Bug:
112735753
Change-Id: I1ebf1f1c2829cfb75e6c382df5acf785fe54a185
Doris Ling [Mon, 17 Sep 2018 19:46:49 +0000 (12:46 -0700)]
Use the new network stats loader to get usage data for all apps.
- change to use the new NetworkStats.Bucket instead of
NetworkStats.Entry when iterating through the detail data.
Bug:
111751694
Test: make RunSettingsRoboTests
Change-Id: I305cc384320e4a72531d80dd9a00a3034ab12837
Bill Yi [Mon, 17 Sep 2018 21:51:52 +0000 (14:51 -0700)]
[automerger skipped] Import translations. DO NOT MERGE
am:
1a84e070b3 -s ours
Change-Id: I7b757cb1cc4622b05a2b1b2e277f680eb7e19898
Bill Yi [Mon, 17 Sep 2018 19:35:35 +0000 (12:35 -0700)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug:
64712476
Change-Id: I0c4b9cded799380c969e2acf1aac3c5a785dc81f
TreeHugger Robot [Mon, 17 Sep 2018 19:20:16 +0000 (19:20 +0000)]
Merge "Add DataUsageListV2 for showing network stats detail."
Doris Ling [Fri, 14 Sep 2018 23:17:17 +0000 (16:17 -0700)]
Add DataUsageListV2 for showing network stats detail.
Initial step: simply duplicate the existing DataUsageList class.
Bug:
111751694
Test: make RunSettingsRoboTests
Change-Id: I4d48405cd127cccb041ba0457638337f6918ce2e
Mill Chen [Mon, 17 Sep 2018 14:06:05 +0000 (22:06 +0800)]
Add a rule to keep classes that implements CustomSliceable
Bug:
115862774
Test: visual, SliceViewer
Change-Id: Iff52a61423ef6822430a1f269a897b46d46f5253
Raff Tsai [Mon, 17 Sep 2018 01:31:21 +0000 (01:31 +0000)]
Merge "Fix popup dialog show wrong device name"
Ben Lin [Sat, 15 Sep 2018 01:25:02 +0000 (01:25 +0000)]
TreeHugger Robot [Sat, 15 Sep 2018 00:45:17 +0000 (00:45 +0000)]
Merge "Fix bug in Add network fragment"
Ben Lin [Thu, 13 Sep 2018 22:22:03 +0000 (15:22 -0700)]
Follow up comments to
0cdc103e8287d3bd01944cdd2afb5c11897998fe.
Bug:
74763823
Test: Manually check; sending an Intent with package:// scheme works, if
originated from app of same cert.
Change-Id: I8206197c2147cc91ef72ad89f330320781428bb9
TreeHugger Robot [Fri, 14 Sep 2018 21:57:24 +0000 (21:57 +0000)]
Merge "Fix a bug where custom cards are not refresh when removed"
Fan Zhang [Fri, 14 Sep 2018 17:42:14 +0000 (10:42 -0700)]
Fix a bug where custom cards are not refresh when removed
When the last custom card for a specific type is removed,
onContextualCardUpdated should receive the cardtype info so we can
remove it from main data set.
- Reverted onContextualCardUpdated method signature back to before
- Force ConditionContextualCardController to send an empty list if
everything is removed.
* Note: the update logic is pretty complicated to handle
add/update/remove all together. In the future we should consider
spliting the removal logic to simplify this area.
Change-Id: Ied688deb693ec33e0017be02cf5c743a754a6e61
Fixes:
115572494
Test: visual