Raff Tsai
c52f3117f3
Merge "Remove old format contextual card log" into qt-dev am: cc0cec4636
...
am: c82c5ebfe6
2019-04-11 00:25:30 -07:00
Salvador Martinez
48a7fddf0e
Merge "Update BS warning to follow through on action" into qt-dev am: a42fe30fc7
...
am: 1405d44643
2019-04-10 23:32:13 -07:00
Julia Reynolds
51afd8c9a5
Merge "Changes for renamed API" into qt-dev am: b027acfc6b
...
am: ed234f41e1
2019-04-10 23:19:43 -07:00
Sean Stout
3b78aaabb3
Merge "Add android.settings.VIEW_ADVANCED_POWER_USAGE_DETAIL" into qt-dev am: 560b8b8a44
...
am: 40f70ac3af
2019-04-10 23:06:51 -07:00
Brad Ebinger
f618733c83
Merge "Fix issue that user can't edit WFC mode for SIM2" am: d2727d5d9f am: c91d33798b
...
am: ac4a495fc2
2019-04-10 23:05:53 -07:00
Raff Tsai
c82c5ebfe6
Merge "Remove old format contextual card log" into qt-dev
...
am: cc0cec4636
2019-04-10 20:20:20 -07:00
Salvador Martinez
1405d44643
Merge "Update BS warning to follow through on action" into qt-dev
...
am: a42fe30fc7
2019-04-10 19:26:01 -07:00
Julia Reynolds
ed234f41e1
Merge "Changes for renamed API" into qt-dev
...
am: b027acfc6b
2019-04-10 18:54:03 -07:00
Sean Stout
40f70ac3af
Merge "Add android.settings.VIEW_ADVANCED_POWER_USAGE_DETAIL" into qt-dev
...
am: 560b8b8a44
2019-04-10 18:40:19 -07:00
Fan Zhang
2cf21dde29
Merge "Rename resource variable names: homepage_* -> contextual_*" into qt-dev am: 8d9dadb1a2
...
am: e458174728
2019-04-10 17:51:40 -07:00
Fabian Kozynski
b27f578f03
Merge "Creates user_switcher_enabled setting to match setting" into qt-dev am: 9eef4964a4
...
am: be2c2128ee
2019-04-10 17:50:45 -07:00
Pavel Grafov
8e02cacab9
Merge "Allow user without a password to clear credentials" into qt-dev am: 0c6ead9e61
...
am: dcf6cb6fe6
2019-04-10 17:47:48 -07:00
Brad Ebinger
ac4a495fc2
Merge "Fix issue that user can't edit WFC mode for SIM2" am: d2727d5d9f
...
am: c91d33798b
2019-04-10 17:33:20 -07:00
Antony Sargent
5cd5845752
Merge "Go to the correct subscription in WifiCallingSettings" into qt-dev am: 3b7cdfb708
...
am: a6b87a24f2
2019-04-10 17:29:32 -07:00
Fan Zhang
e458174728
Merge "Rename resource variable names: homepage_* -> contextual_*" into qt-dev
...
am: 8d9dadb1a2
2019-04-10 16:52:49 -07:00
Fabian Kozynski
be2c2128ee
Merge "Creates user_switcher_enabled setting to match setting" into qt-dev
...
am: 9eef4964a4
2019-04-10 16:51:25 -07:00
Pavel Grafov
dcf6cb6fe6
Merge "Allow user without a password to clear credentials" into qt-dev
...
am: 0c6ead9e61
2019-04-10 16:49:03 -07:00
Raff Tsai
cc0cec4636
Merge "Remove old format contextual card log" into qt-dev
2019-04-10 23:42:48 +00:00
Antony Sargent
a6b87a24f2
Merge "Go to the correct subscription in WifiCallingSettings" into qt-dev
...
am: 3b7cdfb708
2019-04-10 16:19:15 -07:00
Brad Ebinger
c91d33798b
Merge "Fix issue that user can't edit WFC mode for SIM2"
...
am: d2727d5d9f
2019-04-10 16:17:17 -07:00
Salvador Martinez
a42fe30fc7
Merge "Update BS warning to follow through on action" into qt-dev
2019-04-10 22:46:10 +00:00
Julia Reynolds
5cc78fc802
Merge "Use correct key value" into qt-dev am: b2bf285911
...
am: af2195bd98
2019-04-10 15:28:35 -07:00
TreeHugger Robot
b027acfc6b
Merge "Changes for renamed API" into qt-dev
2019-04-10 22:22:25 +00:00
Matthew Fritze
ec9bf86718
Merge "Fix up Network and Internet Slice" into qt-dev am: d79e9c498a
...
am: 7b5b8e620b
2019-04-10 15:20:19 -07:00
Fan Zhang
0942837083
Merge "Gracefully handle the case where private volume may be unmountable" into qt-dev am: 6dd38b462f
...
am: 9be307720b
2019-04-10 15:03:23 -07:00
Sean Stout
560b8b8a44
Merge "Add android.settings.VIEW_ADVANCED_POWER_USAGE_DETAIL" into qt-dev
2019-04-10 22:02:41 +00:00
Brad Ebinger
d2727d5d9f
Merge "Fix issue that user can't edit WFC mode for SIM2"
2019-04-10 21:57:56 +00:00
Julia Reynolds
af2195bd98
Merge "Use correct key value" into qt-dev
...
am: b2bf285911
2019-04-10 14:32:42 -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
Fan Zhang
885036d1ef
Merge "Batch rename: homepage_* to contextual_* or condtion_*" into qt-dev am: aa599e737a
...
am: 1e5d1ba5ff
2019-04-10 14:03:09 -07:00
TreeHugger Robot
8d9dadb1a2
Merge "Rename resource variable names: homepage_* -> contextual_*" into qt-dev
2019-04-10 20:57:23 +00:00
Jack Yu
826ad9451c
Merge "Correct SecureNfc behavior in setting page" into qt-dev am: 0333b07a1e
...
am: f7422c7e68
2019-04-10 13:57:13 -07:00
TreeHugger Robot
9eef4964a4
Merge "Creates user_switcher_enabled setting to match setting" into qt-dev
2019-04-10 20:46:22 +00:00
TreeHugger Robot
0c6ead9e61
Merge "Allow user without a password to clear credentials" into qt-dev
2019-04-10 20:36:22 +00:00
Lei Yu
8a09cb1c67
Merge "Override height of SliceView in Settings" into qt-dev am: 7c7dbe20c7
...
am: 01626fd7d5
2019-04-10 13:32:40 -07:00
Fan Zhang
9be307720b
Merge "Gracefully handle the case where private volume may be unmountable" into qt-dev
...
am: 6dd38b462f
2019-04-10 13:19:12 -07:00
TreeHugger Robot
3b7cdfb708
Merge "Go to the correct subscription in WifiCallingSettings" into qt-dev
2019-04-10 20:01:32 +00:00
Andrew Sapperstein
b61e1566ef
Merge "Updates to data usage prefs" into qt-dev am: 8bd90f58bf
...
am: 028b2fec43
2019-04-10 12:56:07 -07:00
Julia Reynolds
002f8a09d3
Changes for renamed API
...
Test: atest
Bug: 130224929
Change-Id: Ia5003a31153da74347a3251a71dfcd423e65a462
2019-04-10 15:50:51 -04: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
Julia Reynolds
b2bf285911
Merge "Use correct key value" into qt-dev
2019-04-10 19:46:58 +00:00
TreeHugger Robot
d79e9c498a
Merge "Fix up Network and Internet Slice" into qt-dev
2019-04-10 19:44:42 +00:00
Fan Zhang
6dd38b462f
Merge "Gracefully handle the case where private volume may be unmountable" into qt-dev
2019-04-10 19:29:58 +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
Fabian Kozynski
a52961d803
Creates user_switcher_enabled setting to match setting
...
When the user enters UserSettings, the switch displays the setting as
on, but the setting is not created until the user modifies this for the
first time. This change makes sure that the setting is created when the
user enters UserSettings for the first time.
Fixes: 130270878
Test: manual, switch to second user and observe switcher icons.
Change-Id: I30bc5025c178da3668a76c828c34545c1d98b085
2019-04-10 15:22:20 -04:00
Jonathan Koo
af0f6960df
Merge "Address UI change request for injected services" into qt-dev am: 82af1830d7
...
am: 42c1dc6da1
2019-04-10 12:07:44 -07:00
Raff Tsai
4bbb0542a2
Merge "Settings: fix the NullPointerException when initiating media player" into qt-dev am: cd576f15a3
...
am: a75795840e
2019-04-10 12:06:46 -07:00
Jack Yu
f7422c7e68
Merge "Correct SecureNfc behavior in setting page" into qt-dev
...
am: 0333b07a1e
2019-04-10 11:56:38 -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
