Lei Yu
4f207934a4
Merge "Hide number label if info is opportunistic" into qt-dev am: 1a66d9b22f
...
am: f6ff7a02fb
2019-04-30 00:23:16 -07:00
Andy Chou
114fa266ef
Merge "Avoid IMEI overrided by getSummary() for dual SIM condition" into qt-dev am: 8c16ef2906
...
am: 5f82b6e72e
2019-04-30 00:22:23 -07:00
Chandan Nath
1a96c61193
Merge "Always show backup settings (even if backup is deactivated)." into qt-dev am: 2f2a3c4055
...
am: 2ab7fab9a8
2019-04-30 00:21:33 -07:00
hughchen
b7fb90ab6c
Merge "Fix media output slice is empty even BT device is paired" into qt-dev am: 668edcfb95
...
am: a35353d687
2019-04-30 00:17:55 -07:00
Lifu Tang
8968de16d4
Merge "Add timestamp to recent used apps" into qt-dev am: 80be930357
...
am: 68310109ef
2019-04-30 00:17:02 -07:00
Lei Yu
a7578022f0
Merge "Update color filter for battery saver mode" into qt-dev am: 30991963e4
...
am: c86d7fb326
2019-04-30 00:15:16 -07:00
Salvador Martinez
cf61ab8596
Merge "Fix broken dark ui test" into qt-dev am: 1eb92917c9
...
am: 0677441d03
2019-04-30 00:12:28 -07:00
Yanting Yang
f1934ac7f7
Merge "Improve the latency of NotificationChannelSlice" into qt-dev am: c7564be562
...
am: 4bcd5b2cfd
2019-04-30 00:11:32 -07:00
Lei Yu
f6ff7a02fb
Merge "Hide number label if info is opportunistic" into qt-dev
...
am: 1a66d9b22f
2019-04-30 00:10:07 -07:00
Andy Chou
5f82b6e72e
Merge "Avoid IMEI overrided by getSummary() for dual SIM condition" into qt-dev
...
am: 8c16ef2906
2019-04-30 00:09:23 -07:00
Chandan Nath
2ab7fab9a8
Merge "Always show backup settings (even if backup is deactivated)." into qt-dev
...
am: 2f2a3c4055
2019-04-30 00:08:26 -07:00
hughchen
a35353d687
Merge "Fix media output slice is empty even BT device is paired" into qt-dev
...
am: 668edcfb95
2019-04-30 00:07:39 -07:00
Lifu Tang
68310109ef
Merge "Add timestamp to recent used apps" into qt-dev
...
am: 80be930357
2019-04-30 00:06:49 -07:00
Lei Yu
c86d7fb326
Merge "Update color filter for battery saver mode" into qt-dev
...
am: 30991963e4
2019-04-30 00:05:05 -07:00
Salvador Martinez
0677441d03
Merge "Fix broken dark ui test" into qt-dev
...
am: 1eb92917c9
2019-04-30 00:02:41 -07:00
Yanting Yang
4bcd5b2cfd
Merge "Improve the latency of NotificationChannelSlice" into qt-dev
...
am: c7564be562
2019-04-30 00:01:51 -07:00
Lei Yu
1a66d9b22f
Merge "Hide number label if info is opportunistic" into qt-dev
2019-04-26 16:54:02 +00:00
Andy Chou
8c16ef2906
Merge "Avoid IMEI overrided by getSummary() for dual SIM condition" into qt-dev
2019-04-26 15:04:25 +00:00
Chandan Nath
2f2a3c4055
Merge "Always show backup settings (even if backup is deactivated)." into qt-dev
2019-04-26 08:14:53 +00:00
andychou
7c89a929c4
Avoid IMEI overrided by getSummary() for dual SIM condition
...
IMEI information will be overrided by getSummary() and cause second slot IMEI is
oerrided by first slot.
Avoid IMEI is override by first slot information.
Bug: 131124169
Test: Test with dual SIM device and atest
ImeiInfoPreferenceControllerTest, ImeiInfoDialogControllerTest pass
Change-Id: Ia0a028aa0103867f42fff610129cf7ce2d3910b7
2019-04-26 09:31:43 +08:00
TreeHugger Robot
668edcfb95
Merge "Fix media output slice is empty even BT device is paired" into qt-dev
2019-04-26 00:46:48 +00:00
TreeHugger Robot
80be930357
Merge "Add timestamp to recent used apps" into qt-dev
2019-04-25 22:54:20 +00:00
Lei Yu
7e9ef34112
Hide number label if info is opportunistic
...
Fixes: 125855323
Test: RunSettingsRoboTests
Change-Id: I6f77d65691319097c9bf56232710ba12fa7360f3
2019-04-25 14:56:59 -07:00
Lei Yu
30991963e4
Merge "Update color filter for battery saver mode" into qt-dev
2019-04-25 21:42:56 +00:00
TreeHugger Robot
7e4cd25d9d
Merge "ANR observed under settings when trying to reset network settings"
2019-04-25 20:03:34 +00:00
Lifu Tang
c359536d0b
Add timestamp to recent used apps
...
Bug: 129354132
Test: build, flash, and test manually
Change-Id: If8e657460da45db019633e95e77dffb1493997c0
2019-04-25 12:47:42 -07:00
TreeHugger Robot
1eb92917c9
Merge "Fix broken dark ui test" into qt-dev
2019-04-25 19:25:30 +00:00
TreeHugger Robot
c7564be562
Merge "Improve the latency of NotificationChannelSlice" into qt-dev
2019-04-25 17:31:16 +00:00
Salvador Martinez
b0737ee174
Fix broken dark ui test
...
It was checking something in shared preferences which seems
to have stopped working (a bunch of the stuff used in the
test is deprecated). This CL just has it verify that
updateDarkTheme() is called when appropriate since that
is all we really care about.
Test: is a test
Bug: 130897882
Change-Id: If3286dd91b5a95cb0f41cac619a11a9089e0aecf
2019-04-25 10:25:15 -07:00
Pasty Chang
7dfb0f3df9
Merge "Update the fingerprint skip dialog" into qt-dev am: d6f9ec122d
...
am: 6c43c5a924
2019-04-25 02:27:21 -07:00
Pasty Chang
6c43c5a924
Merge "Update the fingerprint skip dialog" into qt-dev
...
am: d6f9ec122d
2019-04-25 02:17:09 -07:00
Clown SHEN
5ea8dd1386
Merge "Fix NPE when connect timeout" into qt-dev am: 05e680d3c8
...
am: 2cd35901f6
2019-04-25 00:35:24 -07:00
Fan Zhang
4df4d40e1a
Merge "Remove disable mobile data confirm dialog for single sim." into qt-dev am: c78e4d1e0f
...
am: 3a5dd82969
2019-04-25 00:32:55 -07:00
Antony Sargent
4b20393348
Merge "Implement off state for SIM details page" into qt-dev am: 62d580d5b4
...
am: d6209877b1
2019-04-25 00:30:36 -07:00
Julia Reynolds
a35e3d9d88
Merge "Fix notification preferences" into qt-dev am: 42eefd0d7e
...
am: 953bb4514c
2019-04-25 00:18:15 -07:00
Clown SHEN
2cd35901f6
Merge "Fix NPE when connect timeout" into qt-dev
...
am: 05e680d3c8
2019-04-25 00:17:19 -07:00
Fan Zhang
3a5dd82969
Merge "Remove disable mobile data confirm dialog for single sim." into qt-dev
...
am: c78e4d1e0f
2019-04-25 00:14:59 -07:00
Antony Sargent
d6209877b1
Merge "Implement off state for SIM details page" into qt-dev
...
am: 62d580d5b4
2019-04-25 00:12:19 -07:00
Julia Reynolds
953bb4514c
Merge "Fix notification preferences" into qt-dev
...
am: 42eefd0d7e
2019-04-25 00:08:26 -07:00
Pasty Chang
d6f9ec122d
Merge "Update the fingerprint skip dialog" into qt-dev
2019-04-25 06:12:19 +00:00
hughchen
53eb9eb24d
Fix media output slice is empty even BT device is paired
...
Return the empty ListBuilder instead of return null in
getSlice().
Bug: 131140677
Test: make -j42 RunSettingsRobotests
Change-Id: I2b1a4bc0c6d2017ec85b2e9f8a5bfc08a0eba1b5
2019-04-25 11:05:27 +08:00
Raff Tsai
3aeb915355
ANR observed under settings when trying to reset network settings
...
- Move reset network settings code to async task.
Test: manual, Robolectric
Fixes: 130772994
Change-Id: I59345f48ed840ecfd64c29c2c20ab8caf2679f63
2019-04-25 02:55:25 +00:00
Clown SHEN
05e680d3c8
Merge "Fix NPE when connect timeout" into qt-dev
2019-04-25 02:46:47 +00:00
pastychang
5145dc1529
Update the fingerprint skip dialog
...
Test: atest
Bug: 124028212
Change-Id: I1a1151c231862ef21b302317f0f105de1a79eac7
2019-04-25 02:16:23 +00:00
TreeHugger Robot
c78e4d1e0f
Merge "Remove disable mobile data confirm dialog for single sim." into qt-dev
2019-04-24 22:50:24 +00:00
TreeHugger Robot
62d580d5b4
Merge "Implement off state for SIM details page" into qt-dev
2019-04-24 21:00:38 +00:00
Fan Zhang
56c6f89a22
Remove disable mobile data confirm dialog for single sim.
...
Fixes: 124005813
Test: robotest
Change-Id: I2da563f26d6dbb1ec3c6c205f21a96c896b51334
2019-04-24 13:50:09 -07:00
Lei Yu
eba850e8d9
Update color filter for battery saver mode
...
Fixes: 129498556
Test: Manual
Change-Id: I57809c77e488b9828bea50d4c4f410d49912cd4b
2019-04-24 13:47:39 -07:00
Chandan Nath
f94033dafc
Always show backup settings (even if backup is deactivated).
...
Previously,
1) we showed backup settings for main users (including secondary non-profile users) only
when backup was activated
2) for profile users, we always showed backup settings.
However, this results in a nullpointer when opening Settings when backup is deactivated
for both main and profile user.
This CL fixes that nullpointer(and also changes existing functionality since keeping
existing functionality and fixing the nullpointer would be too large a code change)
For more details, see https://b.corp.google.com/issues/129843872#comment9 and
https://b.corp.google.com/issues/129843872#comment12
Bug: 129843872
Test: 1. atest -v UserBackupSettingsActivityTest
2. atest -v BackupInactivePreferenceControllerTest
3a) backup not active for main and profile user. shows "isn't active" for both
3b) backup active for main only. shows backup settings for main user and "isn't active" for profile.
3c) backup active for both. shows backup settings for both.
3d) backup active for profile only is not possible (as profile backup is only active when main
user backup is active). if we try to force set it, we get "isn't active" for both
3e) backup not active for secondary user. shows "isn't active"
3f) backup active for secondary user. shows backup settings.
Change-Id: Icb87a047068d29eda560c45dfa4ae02bc991b1af
2019-04-24 18:26:27 +00:00
Antony Sargent
74d8d9c31f
Implement off state for SIM details page
...
When a subscription is disabled, we need to hide most things on the
details page. The UX mocks called for leaving in a few things such as
the data usage header and some carrier information, but in tests I've
done it looks like the telephony APIs don't have any of that available
when the subscription is disabled. So for now the only thing left on the
page in the disabled case is the on/off toggle at the very top.
Fixes: 129665956
Test: make RunSettingsRoboTests
Change-Id: I98f4590fca38d03b1e5ff2cf0d2b4876d2adf936
2019-04-24 10:54:47 -07:00
