Kevin Chyn
3d3219eb02
Merge "Update Security & location preference summary depending on biometrics"
2018-07-24 17:42:36 +00:00
TreeHugger Robot
da5b246e8d
Merge "Modified the char limit"
2018-07-24 16:20:25 +00:00
Dario Freni
d5247039c2
[automerger skipped] Merge "Include NOTICE file in /product partition." am: aa2ec5f239
-s ours am: 1e56e69a46
-s ours am: 1237373743
-s ours
...
am: 64e4c89ef6
-s ours
Change-Id: I8b4a41fa2ef2fb023ba4f5ac96494be8172cb6ec
2018-07-24 04:11:18 -07:00
Dario Freni
64e4c89ef6
[automerger skipped] Merge "Include NOTICE file in /product partition." am: aa2ec5f239
-s ours am: 1e56e69a46
-s ours
...
am: 1237373743
-s ours
Change-Id: I00878455de5f09b6ab95d03ae5def411c8c0cb9e
2018-07-24 04:06:25 -07:00
Dario Freni
1237373743
[automerger skipped] Merge "Include NOTICE file in /product partition." am: aa2ec5f239
-s ours
...
am: 1e56e69a46
-s ours
Change-Id: I0282749b861a6571326c725b5c62a0ebda99dff9
2018-07-24 04:02:45 -07:00
Dario Freni
1e56e69a46
[automerger skipped] Merge "Include NOTICE file in /product partition."
...
am: aa2ec5f239
-s ours
Change-Id: I5341a7ab21758d1a47b0618cd8b1779f063b1406
2018-07-24 03:58:08 -07:00
Treehugger Robot
aa2ec5f239
Merge "Include NOTICE file in /product partition."
2018-07-24 10:35:44 +00:00
TreeHugger Robot
add367f0d0
Merge "Delegate PrintServicesLoader to the framework's one"
2018-07-24 10:17:53 +00:00
Kevin Chyn
eb0de79ffc
Update Security & location preference summary depending on biometrics
...
Fixes: 110960063
Test: manual
Test: make -j56 SettingsRoboTests ROBOTEST_FILTER=SecuritySettingsTest
Change-Id: Ia9186af37c84f4ff0391d1b72043948934ed997b
2018-07-23 21:21:53 -07:00
Sunny Shao
ea846c6482
Modified the char limit
...
- Modified the comment in strings.xml and extended the length of the CHAR LIMIT
Change-Id: I39d065aad7473bb1111db690c7b7a1ff81de459c
Fixes: 111697704
Test: visual
2018-07-24 11:56:49 +08:00
Doris Ling
ce5f9c07da
Fix new account not shown for work profile.
...
When refreshing the Accounts settings UI, we uses the cached user info
for checking user status. However, when the work profile is being
updated, the UserInfo obejct for the user might be updated even the
user id is the same. Using the cached data causes stale info to be
returned for the user and results in the latest account data not
being shown properly for the user. Update the cache to the latest user
info retrieved from user manager.
Change-Id: Ic0127842203f0288f2fdea6c6346cd11e42a8bf0
Fix: 38302246
Test: make RunSettingsRoboTests
2018-07-23 16:13:39 -07:00
Fan Zhang
75bafefa49
Move CategoryManager to Settings.
...
Bug: 77600770
Test: robo
Change-Id: Id4a0c89938d43d21147944b820a191486c589238
2018-07-23 15:09:41 -07:00
Irina Dumitrescu
4fb1e1a633
Update notification_settings_work_profile comment.
...
Test: n/a
Fixes: 111699435
Change-Id: I1a33204f5305db28e7d423b4b2523ed64c675e46
2018-07-23 13:58:20 +00:00
Kevin Chyn
c01cb892b1
Merge "Fix settings crash after androidx refactoring"
2018-07-21 01:24:58 +00:00
Kevin Chyn
074fe1e473
Fix settings crash after androidx refactoring
...
Fixes: 111701576
Change-Id: I095d4837e7a34fb9f240f2a302b5c6f7d1142db9
Fixes: 111701576
2018-07-20 17:19:52 -07:00
Ian Pedowitz
836b777fa5
Remove the character limit
...
This could cause existing messages to get clipped
Effectively reverting part of e7c3ca0e2e
Bug: 111577594
Test: None, is a revert of this config
Change-Id: Ifaa8c9674db3c6865b3b59fcd254bb3e2b20a5f5
2018-07-20 16:40:39 -07:00
TreeHugger Robot
448c61ffb9
Merge "Request lock screen message focus and limit character limit"
2018-07-20 23:32:35 +00:00
TreeHugger Robot
167b232242
Merge "Hide lock screen display in search if it's not in Settings"
2018-07-20 23:10:28 +00:00
Fan Zhang
e7c3ca0e2e
Request lock screen message focus and limit character limit
...
Change-Id: I78594d03ae5430f63e46cb97e2413c1c4bf60d8a
Fixes: 111577594
Test: manual
2018-07-20 15:34:13 -07:00
Doris Ling
c24865e242
Merge "Fix battery animation not being played."
2018-07-20 22:28:53 +00:00
Fan Zhang
c00b042678
Merge changes from topic "migrate-alerdialog-androidx"
...
* changes:
Migrate all AlertDialogs to AndroidX version
Migrate all AlertDialogs to AndroidX version
2018-07-20 21:52:06 +00:00
Fan Zhang
44acde5ee1
Hide lock screen display in search if it's not in Settings
...
Change-Id: Iacf16eb947a679e08a6c55e0764416cd53cac2e7
Fixes: 111641373
Test: robotests
2018-07-20 14:50:02 -07:00
TreeHugger Robot
70e1ca3599
Merge "Remove ref to tile.remoteView, which is no longer used"
2018-07-20 21:32:07 +00:00
Doris Ling
09f527d053
Fix battery animation not being played.
...
- VideoPreference now checks the view visible flag to see if it
should start playing the video when the surface texture is being
updated. Added a default controller for the VideoPreference to
update the view visible flag of the VideoPrefernece when the
setting page is paused/resumed accordingly.
- add the default controller to the adaptive battery video and the
adaptive brightness video.
Change-Id: I1aae2148c27c7157c97541346790542c74377e5a
Fixes: 111103815
Test: make RunSettingsRoboTests
2018-07-20 14:10:25 -07:00
Fan Zhang
171e14eec9
Remove ref to tile.remoteView, which is no longer used
...
Bug: 77600770
Test: rebuild
Change-Id: If0fdd67dd3098d063584acaf2b262a04c209a569
2018-07-20 13:07:46 -07:00
Chalard Jean
b9dce70c97
Merge "Use the SSID of the network in the no internet dialog" am: 692f989b98
am: 9971303508
am: 28a2b521cf
...
am: 92295f0953
Change-Id: I1ef9422507de2aa9ee29ec3c52b17f3bf7363a06
2018-07-20 12:42:07 -07:00
Chalard Jean
92295f0953
Merge "Use the SSID of the network in the no internet dialog" am: 692f989b98
am: 9971303508
...
am: 28a2b521cf
Change-Id: Iae1632372659849d2f61377d0b31d171c50491ab
2018-07-20 12:33:56 -07:00
Chalard Jean
28a2b521cf
Merge "Use the SSID of the network in the no internet dialog" am: 692f989b98
...
am: 9971303508
Change-Id: Ie1eecd52e31477bf7cac2fbe542f34be308ec5b6
2018-07-20 12:29:46 -07:00
Chalard Jean
9971303508
Merge "Use the SSID of the network in the no internet dialog"
...
am: 692f989b98
Change-Id: I6921cab3a99a3b4e2ad5919acb1e01f814d26289
2018-07-20 12:25:39 -07:00
Treehugger Robot
692f989b98
Merge "Use the SSID of the network in the no internet dialog"
2018-07-20 18:57:09 +00:00
Bill Yi
9bb49e434f
[automerger skipped] Import translations. DO NOT MERGE am: 0a8de9d763
-s ours
...
am: 9551717c69
-s ours
Change-Id: Ib0facfffd92a2a3ea1115b6da5eb65a8ad1d44e2
2018-07-20 11:41:40 -07:00
Bill Yi
9551717c69
[automerger skipped] Import translations. DO NOT MERGE
...
am: 0a8de9d763
-s ours
Change-Id: Ic192d76bf26a37373d18944f459bcacae754c174
2018-07-20 11:33:55 -07:00
TreeHugger Robot
d34b7c9a0b
Merge "Fix color of status bar"
2018-07-20 17:02:15 +00:00
Xin Li
7d2ce1c6f2
Merge pi-dev-plus-aosp-without-vendor into stage-dr1-aosp-master am: e8858cc954
...
am: 9652d9ec5b
Change-Id: I251279ea01e26d62a66535a2b675b7e9418db6a5
2018-07-20 01:36:53 -07:00
Mill Chen
dff64a02cf
Fix color of status bar
...
- Set true value to windowLightStatusBar
Bug: 111665984
Test: rebuild
Change-Id: I9808256be052e383656976555cfca5baf60634c6
2018-07-20 15:16:35 +08:00
Xin Li
9652d9ec5b
Merge pi-dev-plus-aosp-without-vendor into stage-dr1-aosp-master
...
am: e8858cc954
Change-Id: Ide9e745efe8952ac27fb9fb79053557aa6a1caef
2018-07-19 23:45:48 -07:00
Jason Chiu
104e04dab4
Delegate PrintServicesLoader to the framework's one
...
1. Remove the duplicated PrintServicesLoader in Settings
2. Make a androidx.loader in Settings and internally just delegate all calls to the real PrintServicesLoader
3. Get the result from the real loader
Test: manual
Fixes: 111581651
Change-Id: I2a9b3653f5c68f8383a468cd16ef5f7c3fd4bc3a
2018-07-20 14:25:00 +08:00
tmfang
5bd7151413
Migrate all AlertDialogs to AndroidX version
...
- Let test cases can be compatible with AndroidX AlertDialog.
- Theme of Transparent needs to support AndroidX AlertDialog.
Change-Id: I0789b66f52feef30ebab7fb824d0e39d5ae9cc96
Fixes: 111413092
Test: make RunSettingsRoboTests -j56
2018-07-20 13:38:58 +08:00
tmfang
41ab6b4bf8
Migrate all AlertDialogs to AndroidX version
...
This CL only changed AlertDialog imports.
So, reviewer can review it easily.
Change-Id: I097bc44394195b14287f4f920c570ac8653f356a
Fixes: 111413092
Test: This CL can't pass Robo test.
2018-07-20 11:32:13 +08:00
Bill Yi
0a8de9d763
Import translations. DO NOT MERGE
...
Auto-generated-cl: translation import
Bug: 64712476
Change-Id: I26fa1f1f72571d0541556649bf104446c9522830
2018-07-19 19:35:10 -07:00
TreeHugger Robot
6cf7a6e564
Merge "Move logic from SavedAccessPoint fragment to controller"
2018-07-19 23:07:09 +00:00
Fan Zhang
2ff710a911
Move logic from SavedAccessPoint fragment to controller
...
Change-Id: Ic54e536f97490cec1746fa58c42ec55b60d17f0e
Fixes: 64806699
Test: robotests
2018-07-19 14:49:14 -07:00
TreeHugger Robot
f8d595db54
Merge "Fix cached app icon being used in app list."
2018-07-19 21:16:34 +00:00
Xin Li
e8858cc954
Merge pi-dev-plus-aosp-without-vendor into stage-dr1-aosp-master
...
Bug: 111615259
Change-Id: I0bbc44c97afd0ed6ff7799e866d4b36beee6c3be
2018-07-19 13:50:34 -07:00
Doris Ling
8a5472f516
Fix cached app icon being used in app list.
...
- change to use the icon from IconDrawableFactory instead of from app
info when building the application list.
Fixes: 63978676
Test: manual, reinstall an app with updated icon and launch
settings->Apps & notifications->See all apps and check the app icon.
Change-Id: I99028ef97fb4fec8c90708b26caaddb7325c1ddb
2018-07-19 12:50:36 -07:00
TreeHugger Robot
295980fbb5
Merge "Use SettingsRobolectricTestRunner in settings app"
2018-07-19 19:25:49 +00:00
TreeHugger Robot
39bb6cec3e
Merge "Make app predicates singleton"
2018-07-19 18:50:36 +00:00
jackqdyulei
63a5c6f9ab
Use SettingsRobolectricTestRunner in settings app
...
Change-Id: I3682ea52c53ff4fcce7e9aa52a4a6827bb31b2cb
Fixes: 111646366
Test: robotest
2018-07-19 11:21:20 -07:00
jackqdyulei
341ad63da7
Make app predicates singleton
...
1. AppLabelPredicate
2. AppRestrictionPredicate
Change-Id: I1fd8611c5dd7ffa6318bcb23de7a973c111910b6
Fixes: 111323520
Test: RunSettingsRoboTests
2018-07-19 10:51:42 -07:00
TreeHugger Robot
e64020540c
Merge "Fix a test broken by fragment migration."
2018-07-19 17:44:48 +00:00