Sunny Shao
1908cb6bd2
Use FooterPreference in AccountSyncSettings page
...
.Use the new FooterPreference and removed the old FooterPreferenceMixin
from the AccountSyncSettings page.
.Add the ShadowAuthenticationHelper for commnon shadow util.
Fixes: 138978130
Test: manual test
Test: make RunSettingsRoboTests ROBOTEST_FILTER=com.android.settings.accounts
Change-Id: I93ae46b3b66e7e504320a9ed120ab7948dd06423
2019-08-06 20:33:44 +08:00
Stanley Wang
7b489d57a8
Fix fail to search by input "4G Calling"
...
Fixed step:
1.Update resource xml file in SearchIndexProvider.
2.Add keywords for preference title array.
3.Initizlize data member.
When getAvailabilityStatus called by updateNonIndexableKeys,
the data member should be initialized,
otherwise it always returns CONDITIONALLY_UNAVAILABLE
Fixes: 137155154
Test: manual
Change-Id: Id06d78bffdeba247741dcfe81e9ed7e179141397
2019-08-06 19:49:34 +08:00
Yi-Ling Chuang
7e2978ab58
Make EuiccService un-disable-able.
...
Disabling the eSIM Manager could leave the device in a bad state, unable
to address the eSIM, and possibly crash due to EuiccConnector failing to
find an LPA to implement EuiccService. So here we do not allow users to
disable this component.
Fixes: 135644632
Test: robotest
Change-Id: Ia4ea48b449f121edaff10531b7c975b09432a8f8
2019-08-06 17:58:08 +08:00
Stanley Wang
2862e79478
Merge "Revert "Fix app uninstalling/stopping possible in screen pinning mode""
2019-08-06 06:17:11 +00:00
Stanley Wang
064b21e0b6
Revert "Fix app uninstalling/stopping possible in screen pinning mode"
...
This reverts commit 161c359508
2019-08-06 03:44:02 +00:00
Yi Jiang
811908f568
Don't show suggestion slice if 'Screen attention' is already on
...
Bug: 137259771
Fix: 137259771
Test: Manually
Change-Id: I5568b569ecd4db943f1a239c7ddcd2923bec4028
(cherry picked from commit 06f0bd6d4e
2019-08-05 17:06:24 +00:00
TreeHugger Robot
b843707ef5
Merge "Use FooterPreference in xml explicitly"
2019-08-05 13:57:30 +00:00
Sunny Shao
c83bb787c5
Use FooterPreference in xml explicitly
...
Removed the FooterPreferenceMixin from the AutoBrightness page.
Fixes: 138916403
Test: manual test
Change-Id: I131d5cede156e2dae890342d5b456f347b025e27
2019-08-05 18:29:01 +08:00
Christine Franks
ec8232bbcb
[automerger skipped] Merge "[DO NOT MERGE] Update title for null uri when setting changes" into qt-r1-dev am: 37b38f872f am: 31cc369a4d
...
am: 4f05fc52bf
2019-08-04 02:19:46 -07:00
Christine Franks
1c10be0920
[automerger skipped] [DO NOT MERGE] Update title for null uri when setting changes am: ea14373666 am: c48918dac0
...
am: c18d0d3090
2019-08-04 02:17:24 -07:00
Christine Franks
095f746b85
[automerger skipped] Merge "[DO NOT MERGE] Update title for null uri when setting changes" into qt-r1-dev am: 37b38f872f am: c586c923aa
...
am: e4ffff1ce5
2019-08-04 02:09:08 -07:00
Christine Franks
58f8945a42
[automerger skipped] [DO NOT MERGE] Update title for null uri when setting changes am: ea14373666 am: caebfbe9c9
...
am: 3cb194c627
2019-08-04 01:59:23 -07:00
Christine Franks
4f05fc52bf
Merge "[DO NOT MERGE] Update title for null uri when setting changes" into qt-r1-dev am: 37b38f872f
...
am: 31cc369a4d
2019-08-04 01:38:30 -07:00
Christine Franks
c18d0d3090
[DO NOT MERGE] Update title for null uri when setting changes am: ea14373666
...
am: c48918dac0
2019-08-04 01:37:51 -07:00
Christine Franks
8e7f23910f
Merge "[DO NOT MERGE] Update title for null uri when setting changes" into qt-r1-dev am: 37b38f872f
...
am: 31cc369a4d
2019-08-04 01:37:50 -07:00
Christine Franks
e4ffff1ce5
Merge "[DO NOT MERGE] Update title for null uri when setting changes" into qt-r1-dev am: 37b38f872f
...
am: c586c923aa
2019-08-04 01:36:00 -07:00
Christine Franks
3cb194c627
[DO NOT MERGE] Update title for null uri when setting changes am: ea14373666
...
am: caebfbe9c9
2019-08-04 01:34:46 -07:00
Christine Franks
e003f38b53
[DO NOT MERGE] Update title for null uri when setting changes am: ea14373666
...
am: c48918dac0
2019-08-04 01:32:21 -07:00
Christine Franks
5bf177fa50
Merge "[DO NOT MERGE] Update title for null uri when setting changes" into qt-r1-dev
...
am: 37b38f872f
2019-08-04 00:55:55 -07:00
Christine Franks
c586c923aa
Merge "[DO NOT MERGE] Update title for null uri when setting changes" into qt-r1-dev
...
am: 37b38f872f
2019-08-04 00:55:55 -07:00
Christine Franks
2b07a7e818
[DO NOT MERGE] Update title for null uri when setting changes
...
am: ea14373666
2019-08-04 00:55:36 -07:00
Christine Franks
caebfbe9c9
[DO NOT MERGE] Update title for null uri when setting changes
...
am: ea14373666
2019-08-04 00:55:33 -07:00
Christine Franks
31cc369a4d
Merge "[DO NOT MERGE] Update title for null uri when setting changes" into qt-r1-dev
...
am: 37b38f872f
2019-08-04 00:53:35 -07:00
Christine Franks
c48918dac0
[DO NOT MERGE] Update title for null uri when setting changes
...
am: ea14373666
2019-08-04 00:53:29 -07:00
android-build-team Robot
d767898bf1
Snap for 5778854 from 37b38f872f to qt-c2f2-release
...
Change-Id: I65f2c3f99c9767109fb4aa653b2e4afcfeedfa51
2019-08-03 23:02:29 +00:00
Christine Franks
37b38f872f
Merge "[DO NOT MERGE] Update title for null uri when setting changes" into qt-r1-dev
2019-08-03 14:47:40 +00:00
TreeHugger Robot
87ecb5deed
Merge "Import RadioButtonPreference from SettingsLib"
2019-08-03 02:52:36 +00:00
Christine Franks
ea14373666
[DO NOT MERGE] Update title for null uri when setting changes
...
Currently, the title will not update at all if set to silent.
Bug: 130445562
Test: make RunSettingsRoboTests -j48
Change-Id: Id8fc0182adb37c05436f5924b7dcdffb9d994e0d
2019-08-03 01:00:31 +00:00
Raff Tsai
d68802cf6d
Fix robolectric test error
...
jobService is moved to mainline module. It is not registered in
the system at the beginning, therefore getSystemService returns
null. Instead of getSystemService, directly create a JobSchedulerImpl
and mock getSystemService method to return the JobSchedulerImpl
instance.
Fixes: 138714772
Test: make RunSettingsRoboTests
Change-Id: If91b6a63c0de92530d69f7b80515669352aab760
2019-08-02 10:22:20 +00:00
TreeHugger Robot
c078ee3b5d
Merge "Add Tapjacking Protection for SettingsHomepageActivity"
2019-08-02 06:32:01 +00:00
Edgar Wang
32b0ab179c
Merge "Merge "Add skip lock screen in Notification & security lock screen settings" into qt-r1-dev am: 8e3b202070 am: 063cc34713" into qt-qpr1-dev-plus-aosp
...
am: 1c98867b18
2019-08-01 23:14:34 -07:00
Edgar Wang
677b943ae1
Merge "Add skip lock screen in Notification & security lock screen settings" into qt-r1-dev am: 8e3b202070 am: 3448917d8e
...
am: fc0aec7f1a
2019-08-01 23:13:14 -07:00
Android Build Merger (Role)
1c98867b18
Merge "Merge "Add skip lock screen in Notification & security lock screen settings" into qt-r1-dev am: 8e3b202070 am: 063cc34713" into qt-qpr1-dev-plus-aosp
2019-08-02 06:01:14 +00:00
Edgar Wang
73ae3701fc
Merge "Add skip lock screen in Notification & security lock screen settings" into qt-r1-dev am: 8e3b202070
...
am: 063cc34713
2019-08-01 23:00:28 -07:00
Edgar Wang
fc0aec7f1a
Merge "Add skip lock screen in Notification & security lock screen settings" into qt-r1-dev am: 8e3b202070
...
am: 3448917d8e
2019-08-01 23:00:21 -07:00
Edgar Wang
09f2469440
Merge "Add skip lock screen in Notification & security lock screen settings" into qt-r1-dev am: 8e3b202070
...
am: 063cc34713
2019-08-01 23:00:15 -07:00
Edgar Wang
3448917d8e
Merge "Add skip lock screen in Notification & security lock screen settings" into qt-r1-dev
...
am: 8e3b202070
2019-08-01 22:49:22 -07:00
Edgar Wang
063cc34713
Merge "Add skip lock screen in Notification & security lock screen settings" into qt-r1-dev
...
am: 8e3b202070
2019-08-01 22:49:22 -07:00
Edgar Wang
345315c440
Merge "Add skip lock screen in Notification & security lock screen settings" into qt-r1-dev
...
am: 8e3b202070
2019-08-01 22:49:04 -07:00
Edgar Wang
8e3b202070
Merge "Add skip lock screen in Notification & security lock screen settings" into qt-r1-dev
2019-08-02 05:38:23 +00:00
android-build-team Robot
3c6f2108a8
Merge cherrypicks of [9131405, 9130772, 9131110, 9131093, 9131019, 9131394, 9131395, 9131396, 9131406, 9131480, 9131397] into qt-c2f2-release
...
Change-Id: Ib91991cbbbda41bae347ca9f17e1405e9d960f89
2019-08-02 04:02:33 +00:00
Daniel Solomon
eb15083e1b
Settings: change the color mode preview image
...
Change the color mode preview image to better illustrate the difference
between Natural and Boosted color modes.
Bug: 138126243
Test: manual testing on Pixel
Change-Id: I367b383f9f2da9b2e2d5960e51c3ec7821d4915b
(cherry picked from commit 56574d5924
2019-08-02 04:00:51 +00:00
Daniel Solomon
638e83263b
Merge "Settings: change the color mode preview image" into qt-r1-dev am: c5fbd7b669 am: 4c1fa1a5d1
...
am: 2b40b40a95
2019-08-01 14:25:07 -07:00
Daniel Solomon
8884ceecd0
Merge "Settings: change the color mode preview image" into qt-r1-dev am: c5fbd7b669 am: 8e699b6ec8
...
am: 442a2b26b4
2019-08-01 14:19:20 -07:00
Daniel Solomon
2b40b40a95
Merge "Settings: change the color mode preview image" into qt-r1-dev am: c5fbd7b669
...
am: 4c1fa1a5d1
2019-08-01 13:54:52 -07:00
Daniel Solomon
442a2b26b4
Merge "Settings: change the color mode preview image" into qt-r1-dev am: c5fbd7b669
...
am: 8e699b6ec8
2019-08-01 13:53:32 -07:00
Daniel Solomon
6f2c664186
Merge "Settings: change the color mode preview image" into qt-r1-dev am: c5fbd7b669
...
am: 8e699b6ec8
2019-08-01 13:51:28 -07:00
Daniel Solomon
8e699b6ec8
Merge "Settings: change the color mode preview image" into qt-r1-dev
...
am: c5fbd7b669
2019-08-01 13:38:20 -07:00
Daniel Solomon
4c1fa1a5d1
Merge "Settings: change the color mode preview image" into qt-r1-dev
...
am: c5fbd7b669
2019-08-01 13:37:33 -07:00
Daniel Solomon
c249d21eb4
Merge "Settings: change the color mode preview image" into qt-r1-dev
...
am: c5fbd7b669
2019-08-01 13:27:42 -07:00
