Fan Zhang
e458174728
Merge "Rename resource variable names: homepage_* -> contextual_*" into qt-dev
...
am: 8d9dadb1a2
2019-04-10 16:52:49 -07:00
Matthew Fritze
7b5b8e620b
Merge "Fix up Network and Internet Slice" into qt-dev
...
am: d79e9c498a
2019-04-10 14:27:50 -07:00
TreeHugger Robot
8d9dadb1a2
Merge "Rename resource variable names: homepage_* -> contextual_*" into qt-dev
2019-04-10 20:57:23 +00:00
Fan Zhang
1e5d1ba5ff
Merge "Batch rename: homepage_* to contextual_* or condtion_*" into qt-dev
...
am: aa599e737a
2019-04-10 12:49:12 -07:00
TreeHugger Robot
d79e9c498a
Merge "Fix up Network and Internet Slice" into qt-dev
2019-04-10 19:44:42 +00:00
Fan Zhang
b64d16dcad
Rename resource variable names: homepage_* -> contextual_*
...
Fixes: 130250419
Test: rebuild
Change-Id: I497f2d8e48fb6b5cd54b40e5f5b0691de0e19b1c
2019-04-10 12:25:10 -07:00
Lei Yu
01626fd7d5
Merge "Override height of SliceView in Settings" into qt-dev
...
am: 7c7dbe20c7
2019-04-10 11:55:41 -07:00
Andrew Sapperstein
028b2fec43
Merge "Updates to data usage prefs" into qt-dev
...
am: 8bd90f58bf
2019-04-10 11:54:08 -07:00
TreeHugger Robot
aa599e737a
Merge "Batch rename: homepage_* to contextual_* or condtion_*" into qt-dev
2019-04-10 18:25:45 +00:00
Jonathan Koo
42c1dc6da1
Merge "Address UI change request for injected services" into qt-dev
...
am: 82af1830d7
2019-04-10 11:10:16 -07:00
Lei Yu
7c7dbe20c7
Merge "Override height of SliceView in Settings" into qt-dev
2019-04-10 16:56:28 +00:00
Andrew Sapperstein
8bd90f58bf
Merge "Updates to data usage prefs" into qt-dev
2019-04-10 16:49:49 +00:00
Jonathan Koo
82af1830d7
Merge "Address UI change request for injected services" into qt-dev
2019-04-10 16:46:16 +00:00
Pasty Chang
58015d00bf
Merge "Enable heavy theme for setupwizard pages" into qt-dev
...
am: 0f74602864
2019-04-10 07:42:06 -07:00
Pasty Chang
0f74602864
Merge "Enable heavy theme for setupwizard pages" into qt-dev
2019-04-10 14:23:00 +00:00
Clown SHEN
a788391042
Merge "Add icon for sign in" into qt-dev
...
am: fa1c69ee44
2019-04-09 22:11:44 -07:00
Lifu Tang
e531bd01fd
Address UI change request for injected services
...
- Remove icons from injected items
- Create a separate section for work profile
Bug: 129948280
Test: build, flash, and test manually
Change-Id: Ia64af349c8dd1575d629debd574cdb3ae6eb650d
2019-04-09 21:10:44 -07:00
Clown SHEN
fa1c69ee44
Merge "Add icon for sign in" into qt-dev
2019-04-10 02:48:20 +00:00
Antony Sargent
77df63d371
Updates to data usage prefs
...
-Remove 'Data Usage' pref from Network & internet homepage
-Add 'Data warning & limit' to mobile network details page
Fixes: 127535879
Fixes: 130241963
Test: robotests
Change-Id: I28b3de34dcf11140762b4e3ee5b465f842ac48d4
2019-04-10 01:53:24 +00:00
Amin Shaikh
7924c897e6
Merge "Show Styles & Wallpaper in Settings" into qt-dev
...
am: c35af0eae2
2019-04-09 18:39:59 -07:00
Fan Zhang
4cb25ed087
Batch rename: homepage_* to contextual_* or condtion_*
...
Contextual cards are not bound to homepage. Remove prefix homepage from
layout and theme names.
Next step: update names for some resource values (dimen/color etc)
Bug: 130250419
Test: rebuild
Change-Id: I5e901268462aaa37e00493080ae09af001784823
2019-04-10 00:08:18 +00:00
TreeHugger Robot
c35af0eae2
Merge "Show Styles & Wallpaper in Settings" into qt-dev
2019-04-09 22:48:04 +00:00
Matthew Fritze
441a439431
Fix up Network and Internet Slice
...
- Fix pref key for Airplane mode
- Return null when no mobile data is available
Test: robotests
Fixes: 130244854
Change-Id: I88806cb9215af159114ac150c20cdb8fb413befe
2019-04-09 15:39:39 -07:00
Lei Yu
de3e40089d
Override height of SliceView in Settings
...
Fixes: 129012281
Test: Manual
Change-Id: I99ad80ea03a52f4a9edc0a7532ad4a0f2d33779e
2019-04-09 13:38:45 -07:00
Yi-Ling Chuang
4b6479bcf7
Merge "Remove viewFlipper used in contextual card dismissal." into qt-dev
...
am: 8b3cde0fb1
2019-04-09 10:45:10 -07:00
Yi-Ling Chuang
2bb41176cf
Merge "Inflate dismissal background instead of drawing while swiping" into qt-dev
...
am: a31acac404
2019-04-09 10:44:08 -07:00
Amin Shaikh
2a9911e3a0
Show Styles & Wallpaper in Settings
...
Show "Styles & Wallpaper" in Settings based on whether the ThemePicker
component is availalable. Also update dashboard summary for display.
Bug: 129874298
Test: m RunSettingsRoboTests
Change-Id: Id7e0bb9cbc689bb9e637919a10a7d1006397afab
2019-04-09 13:25:57 -04:00
TreeHugger Robot
8b3cde0fb1
Merge "Remove viewFlipper used in contextual card dismissal." into qt-dev
2019-04-09 17:11:40 +00:00
TreeHugger Robot
a31acac404
Merge "Inflate dismissal background instead of drawing while swiping" into qt-dev
2019-04-09 17:11:11 +00:00
Pasty Chang
608a634d2e
Enable heavy theme for setupwizard pages
...
Stencil heavy theme is ready. Enable by setting the attribute to true.
light & heavy theme screenshot: https://screenshot.googleplex.com/15SXBK66NZX
Bug: 130208067
Test: atest
Change-Id: Ic3843b5f6724ed2f4fcdadf1ad634d918596c2ae
2019-04-09 13:38:12 +00:00
Julia Reynolds
b8fa1028ac
Merge "Move NAS selection to 'special app access'" into qt-dev
...
am: 8bf3ab9d5c
2019-04-09 06:12:51 -07:00
Julia Reynolds
8bf3ab9d5c
Merge "Move NAS selection to 'special app access'" into qt-dev
2019-04-09 12:56:40 +00:00
Pasty Chang
614d0cce2b
Merge "Add strings used for setupwizard lockscreen skip dialog" into qt-dev
...
am: 6ffdbb6096
2019-04-09 05:32:03 -07:00
Pasty Chang
6ffdbb6096
Merge "Add strings used for setupwizard lockscreen skip dialog" into qt-dev
2019-04-09 11:53:00 +00:00
Yi-Ling Chuang
734d826117
Remove viewFlipper used in contextual card dismissal.
...
- Use view's visibility to control which view we should show.
- Slice view can be built with normal height after removing viewFlipper.
Bug: 129438972
Bug: 128689305
Test: robotests
Change-Id: If7e9bd30d5cb5bcd3b9ff9f09cc2eae36543b9e9
2019-04-09 10:24:10 +00:00
Yi-Ling Chuang
dc2b2c7929
Inflate dismissal background instead of drawing while swiping
...
- Only swipe the foreground out to have the background revealed.
- Inflate dismissal_swipe_background.xml while swiping.
- Fix the fly-in transition.
- Fix the overlapping problem.
Bug: 129742618
Test: robotests
Change-Id: I5311e50332d0ea0437d1693d075d5c3a2176a443
2019-04-09 10:21:14 +00:00
Hai Zhang
b3299e654e
Merge changes from topic "role-replace" into qt-dev
...
am: 0aa0d665c0
2019-04-09 00:26:01 -07:00
clownshen
9762652115
Add icon for sign in
...
Bug: 130188624
Test: manual test
Test: make RunSettingsRoboTests -j32 ROBOTEST_FILTER=com.android.settings.wifi.details.WifiDetailPreferenceControllerTest
Change-Id: I58a6c411a31e5cb0fe05eba486ba38774c078070
2019-04-09 06:56:16 +00:00
TreeHugger Robot
0aa0d665c0
Merge changes from topic "role-replace" into qt-dev
...
* changes:
Remove old default apps code and use roles instead.
Move default payment app to special app access.
2019-04-09 05:33:21 +00:00
Hai Zhang
22f8d48df0
Remove old default apps code and use roles instead.
...
Default apps are moved into PermissionController.
Bug: 124452117
Bug: 124457823
Test: presubmit & manual
Change-Id: I5f68e5b77cd6163d093590185314270706d75391
2019-04-09 13:30:31 +08:00
Hai Zhang
470ec69461
Move default payment app to special app access.
...
Bug: 124452117
Bug: 124522992
Test: build
Change-Id: I58e7127920d939dc3635bcc2e608cee6baa21998
2019-04-09 13:30:14 +08:00
Arc Wang
ee55582d8b
Merge "Remove the PreferenceGroup without title in WifiNetworkDetailsFragment" into qt-dev
...
am: 73f539d296
2019-04-08 21:19:30 -07:00
pastychang
e82540f174
Add strings used for setupwizard lockscreen skip dialog
...
Test: atest
Bug: 124028212
Change-Id: I9f65022f6bbc70606a40b5b20e9484731376d203
2019-04-09 01:56:58 +00:00
Arc Wang
73f539d296
Merge "Remove the PreferenceGroup without title in WifiNetworkDetailsFragment" into qt-dev
2019-04-09 01:39:35 +00:00
TreeHugger Robot
00846385a5
Merge "Import translations. DO NOT MERGE" into qt-dev
2019-04-08 23:37:53 +00:00
Andrew Sapperstein
4bbd1e867b
Merge "Delete carrier entry from mobile network details page." into qt-dev
...
am: b93761d252
2019-04-08 14:04:11 -07:00
Bill Yi
ef1e217daf
Import translations. DO NOT MERGE
...
Auto-generated-cl: translation import
Bug: 64712476
Change-Id: If0ee949c0948860c8a6834fc3b63fa0d9175cfb0
2019-04-08 13:57:43 -07:00
TreeHugger Robot
b93761d252
Merge "Delete carrier entry from mobile network details page." into qt-dev
2019-04-08 20:00:29 +00:00
Julia Reynolds
8a9e6cc9fa
Move NAS selection to 'special app access'
...
Test: manual
Fixes: 130169253
Change-Id: I0e69b11c557bc153cee0073bb2e982e3ee36e721
2019-04-08 15:46:57 -04:00
Antony Sargent
da62a42ef8
Merge "Fix 'Advanced' collapse point on Network & internet page" into qt-dev
...
am: 5c28e42538
2019-04-08 11:43:38 -07:00
