Commit Graph

48421 Commits

Author SHA1 Message Date
TreeHugger Robot
0d9e4a4b0e Merge "Rank cards in descending score when loading from db." 2018-11-09 01:13:53 +00:00
TreeHugger Robot
4b83f9099b Merge "Do not tint app-icon of admin" 2018-11-09 00:11:27 +00:00
Fan Zhang
6735a3f07e Rank cards in descending score when loading from db.
Test: robotest
Change-Id: Ic40f6ed9e702a60f51d4ec6700e663f1689f0009
2018-11-08 15:31:37 -08:00
Hai Shalom
fd2a781b39 Merge "packages/apps/Settings: Add logic and strings to support WPA3 and OWE" 2018-11-08 22:30:10 +00:00
Pengquan Meng
92e8a5d8da Merge "Replace some configs with CarrierConfig" 2018-11-08 21:31:57 +00:00
Fan Zhang
08d8ed80b6 Merge "Loading suggestions via legacy SuggestionService sometimes" 2018-11-08 20:35:06 +00:00
Fan Zhang
7db039f56e Merge "Clean up bluetooth while driving code." 2018-11-08 20:16:43 +00:00
TreeHugger Robot
4f0355aab2 Merge "Move "About Phone" to bottom of Settings main IA, above "Tips & Support"" 2018-11-08 18:33:41 +00:00
Philip P. Moltmann
6bd48be1dd Do not tint app-icon of admin
Only if no app-icon is used a tint should be applied to the ic_info
icon.

Change-Id: I92332110f99d14e86dc01700fa00b189c1d7d8ad
Fixes: 118879012
Test: Looked at dialog with default icon and with app-icon
2018-11-08 10:23:41 -08:00
Cosmo Hsieh
793a6eac3b Merge "Implemen WiFi MAC randomization api for WiFi MAC randomization preference." 2018-11-08 06:45:47 +00:00
TreeHugger Robot
0f82fe6ed5 Merge "Delete Directory access Settings." 2018-11-08 02:14:23 +00:00
Fan Zhang
018fe5adf5 Clean up bluetooth while driving code.
Test: robotests
Change-Id: I50aedc61a9a7836672e934e188837dbe49c64be2
2018-11-07 15:52:18 -08:00
Fan Zhang
16340ce52d [automerger skipped] Merge "DO NOT MERGE Fix summary text for advanced button." into pi-dev am: 0eea3b6c9e
am: 16d5d7872c  -s ours

Change-Id: I6e69ee49fd7581ee3b1d5398260ac0bb3c8980e3
2018-11-07 13:11:42 -08:00
Fan Zhang
16d5d7872c Merge "DO NOT MERGE Fix summary text for advanced button." into pi-dev
am: 0eea3b6c9e

Change-Id: I25c2e6859a5a62997e6e23ffdf7dbd95f0486313
2018-11-07 12:59:32 -08:00
Fan Zhang
0eea3b6c9e Merge "DO NOT MERGE Fix summary text for advanced button." into pi-dev 2018-11-07 20:44:59 +00:00
Fan Zhang
2a98c843e8 Loading suggestions via legacy SuggestionService sometimes
When legacy_suggestion flag is turned on, load Suggestions from
SuggestionService instead of contextual homepage, because contextual
homepage infrastructure might not be availble on all devices.

Bug: 118842099
Test: robo
Change-Id: I91710c005e11be5a9b3dd39ceff670106e7f80c3
2018-11-07 11:55:09 -08:00
Fan Zhang
e61076956c [automerger skipped] Fix crash when starting daydream setting with wrong context am: d9c6692f25
am: 75fbb4511c  -s ours

Change-Id: I302bb9c60b9f0b0b32965f00db0222a68be17690
2018-11-07 11:14:46 -08:00
Fan Zhang
75fbb4511c Fix crash when starting daydream setting with wrong context
am: d9c6692f25

Change-Id: I723b66eced5ace06f5821463c3dd783a18496327
2018-11-07 10:51:48 -08:00
Fan Zhang
16c2d70881 Merge "Update proto for contextual_card_list." 2018-11-07 18:15:39 +00:00
TreeHugger Robot
b68d244807 Merge "Update new UI of conditional cards" 2018-11-07 17:40:08 +00:00
Edgar Wang
992b5038a1 Move "About Phone" to bottom of Settings main IA, above "Tips & Support"
Bug: 118168552
Test: robotests
Change-Id: I0a0f03bdb27d9eea48eb758496eefeebcbc57b6c
2018-11-08 00:56:21 +08:00
Mill Chen
0ca7130403 Update new UI of conditional cards
- Add half-width and full-width layouts for conditional cards
- Keep origin strings of conditional cards, that could make conditional
cards truncate its title and summary in half-width card.
- Add default value of isHalfWidth to each condition controller.

Bug: 113451905
Test: robotests, visual
Change-Id: Ib0055f32c4ab9e73c0e0a57c6b0ef586d52942e0
2018-11-07 16:06:31 +08:00
cosmohsieh
be92eb0fa7 Implemen WiFi MAC randomization api for WiFi MAC randomization
preference.

Use WifiConfiguration.macRandomizationSetting to get/set config.

Bug: 117957974
Test: RunSettingsRoboTests
Change-Id: I33f3f0003159b86e44e25e041ed5e41c58add6bd
2018-11-07 16:02:57 +08:00
TreeHugger Robot
70609fad7d Merge "Fix Settings crash after disabling Settings Suggestion" 2018-11-07 07:46:35 +00:00
Clown SHEN
98ce7a1a7d Merge "Launch WfcActivation with subscription ID" am: bd57f94a4c am: 74fe4a9177
am: 4f2055500a

Change-Id: I326052d639276b89859770fbe110a73f80c4a9fc
2018-11-06 23:39:50 -08:00
Clown SHEN
4f2055500a Merge "Launch WfcActivation with subscription ID" am: bd57f94a4c
am: 74fe4a9177

Change-Id: Ib61988a9f84ed10d4ac0d6b1a0d8b7d4f8897224
2018-11-06 23:35:41 -08:00
Clown SHEN
74fe4a9177 Merge "Launch WfcActivation with subscription ID"
am: bd57f94a4c

Change-Id: Id76cb09a81158ce069f5200b99c19b1c9840f9f8
2018-11-06 23:30:23 -08:00
Clown SHEN
bd57f94a4c Merge "Launch WfcActivation with subscription ID" 2018-11-07 07:09:27 +00:00
Raff Tsai
2928cd4c72 Fix Settings crash after disabling Settings Suggestion
- Settings Suggestion App is responsible for searching, we can not
prevent user disable it. Hide search feature if user disable it.

Fixes: 118805907
Fixes: 117921464
Test: manual
Change-Id: I61c47c52265a6efd79ef2fa60272bf6513e678b1
2018-11-07 14:11:23 +08:00
TreeHugger Robot
7d704c8798 Merge "Adjust lookup table mechanism to support new UI of conditional card" 2018-11-07 03:00:49 +00:00
TreeHugger Robot
ebe6774a2c Merge "Use inline radio buttons for Prevent Ringing" 2018-11-07 01:52:47 +00:00
Lei Yu
32cbfe9cf2 Merge "Increase battery app list maximum size to 20" 2018-11-07 00:54:22 +00:00
Mill Chen
d20641059f Adjust lookup table mechanism to support new UI of conditional card
Use layout resource id as the return value of getItemViewType
in the ContextualCardsAdapter to make sure the RecyclerView could
work normally, and adjust the lookup table mechanism to meet the
current design as well.

Bug: 113451905, 112578070
Test: visual, robotest
Change-Id: I8fa299e44025a0b71b6990d020e7f0683c153337
2018-11-06 16:09:17 -08:00
Fan Zhang
9a28c433f2 Update proto for contextual_card_list.
Bug: 118842350
Test: rebuild
Change-Id: I838738f56c8793a8e4d6adf43bc812777edbcd88
2018-11-06 15:48:03 -08:00
Fan Zhang
d9c6692f25 Fix crash when starting daydream setting with wrong context
The context must be a UI context. This is a new requirement in P.

Change-Id: I3e2de5068f44010da7d57af030e9f029dd97a7f8
Merged-In: I28874f296da617f4cedf6706b0663b76671f1780
Fixes: 111375261
Fixes: 113312592
Test: robotests
2018-11-06 23:47:24 +00:00
Pengquan Meng
b8d59fc9f8 Replace some configs with CarrierConfig
Replace the following config with CarrierConfig
- config_enabled_lte
- config_support_tdscdma
- config_support_tdscdma_on_roaming_networks
- carrier settings activity package/class name

Bug: 115429501
Test: make -j40 ROBOTEST_FILTER=telephony RunSettingsRoboTests
Change-Id: I3d973f926813c01fff6fcff50b3392c4eff69eb8
2018-11-06 15:34:25 -08:00
Antony Sargent
95f34b43f4 Check accounts in all profiles on account detail dashboard
In cl/5074783 I fixed a problem with account deletion where the account
didn't appear to be deleted even when it was. Part of that fix broke the
ability to make changes to work profile accounts - this CL fixes that by
making sure not to early exit the account detail dashboard unless we've
checked the accounts owned by all profiles for the user.

Bug: 117965642
Test: make -j40 RunSettingsRoboTests
Change-Id: Id034418beb4aec8bd4d10191b4924509d27e55d4
2018-11-06 21:21:04 +00:00
Fan Zhang
92792ee806 Merge "Added card_dismissed field into cards table" 2018-11-06 18:44:56 +00:00
Fan Zhang
6454bfdd2c Merge "Make ContextualCardLoader do entire loading upon fragment's onStart()" 2018-11-06 17:27:50 +00:00
Beverly
c1fd6dc5a3 Use inline radio buttons for Prevent Ringing
Test: atest PreventRingingGesturePreferenceControllerTest
Fixes: 79867902

Change-Id: I3c9f949e038bba98e5be972adc01f35f5513432a
2018-11-06 10:12:08 -05:00
Bill Yi
64c7317eef [automerger skipped] Import translations. DO NOT MERGE am: 222dca5b7c -s ours
am: b7d0d2cf2d  -s ours

Change-Id: I429ed1f39a1bdbd319971c0c79a6944d477f576e
2018-11-06 07:11:46 -08:00
Bill Yi
b7d0d2cf2d [automerger skipped] Import translations. DO NOT MERGE
am: 222dca5b7c  -s ours

Change-Id: I36cfe2ffff510c8e4d3d96bf4f463d21ef00b24a
2018-11-06 07:07:33 -08:00
Sunny Shao
647d3e3047 Added card_dismissed field into cards table
Added card_dismissed field to keep user dismissal behavior and filter it when cards loaded

Bug: 113783548
Test: manual test
Change-Id: I27549eca95c2e49fcc92fa59a5c02da73814a522
2018-11-06 20:59:46 +08:00
Bill Yi
222dca5b7c Import translations. DO NOT MERGE
Auto-generated-cl: translation import

Bug: 64712476
Change-Id: Ie15195c81e11f67f4bd72be18c6af0d273666ceb
2018-11-06 04:15:12 -08:00
Emily Chuang
f519e3ffe5 Make ContextualCardLoader do entire loading upon fragment's onStart()
For dismissal mechanism, we will have to get information about those
dismissed cards that are stored in Card DB with flag "dismiss" to filter
them out. Currently we only do the entire loading in fragment's
onCreate(), so only when the fragment is recreated users can get the new
data. Now we are changing it to onStart() and make the loader restart so
we are able to show the latest cards.

Change-Id: I4c0be297232f026b46feb8084084816e1acc8f11
Fixes: 119090460
Bug: 113783548
Test: visual
2018-11-06 19:56:42 +08:00
Stanley Wang
5d2a3d23e7 Merge "Architecture review of Copyable Slice" 2018-11-06 05:00:05 +00:00
Stanley Wang
51c9404182 Architecture review of Copyable Slice
Design doc: https://drive.google.com/open?id=1NJPd_282H4195HUGJH5cGJO_Jrcz1Vl6AAw_VQOtGq0

Fixes: 	118398321
Test: manual
Test: make RunSettingsRoboTests -j ROBOTEST_FILTER=com.android.settings.slice

Change-Id: Ic6762e58698a994d16a5de1778b4035ae430a256
2018-11-06 11:01:17 +08:00
TreeHugger Robot
1d436aade2 Merge changes from topic "refactor-security-location"
* changes:
  Rename title of Security page
  Move LocationSettings to top level page.
2018-11-06 02:01:17 +00:00
TreeHugger Robot
998eaa0585 Merge "Enforce all the SliceBackgroundWorkers being singletons at syntax level" 2018-11-06 00:55:54 +00:00
Hai Shalom
f2f00313bb packages/apps/Settings: Add logic and strings to support WPA3 and OWE
Add and update Wi-Fi security strings, and add logic to enable WPA3
and OWE. Modified WPA2-PSK to WPA2-Personal, and added WPA3-Personal,
Enhanced Open and WPA3-Enterprise.

Bug: 112195778
Test: Basic functional tests
Change-Id: Ia97761a7f0a9e2fee768dfaf3578a2f1090d29c6
2018-11-05 16:40:07 -08:00