Raff Tsai
c52f3117f3
Merge "Remove old format contextual card log" into qt-dev am: cc0cec4636
...
am: c82c5ebfe6
Change-Id: Ic4f07000baaa07add48b4a673ebdb6430222ae8f
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
Change-Id: I582c4db2f7a6a576a18a04ea96c4d60c9fbec98a
2019-04-10 23:32:13 -07:00
Naina Nalluri
3df7431c8e
Merge "Add background flag to CI system update intent" into qt-dev
...
am: 3ef0e5fc4f
Change-Id: I124b394824aecf879f4a9a2c45276c97bffe7902
2019-04-10 23:25:35 -07:00
Julia Reynolds
51afd8c9a5
Merge "Changes for renamed API" into qt-dev am: b027acfc6b
...
am: ed234f41e1
Change-Id: I841887912957497f4c3bebda6e65880528902ff2
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
Change-Id: Icded110194eedf44b4ea5b1b2bcb4a4a942232a2
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
Change-Id: I37be576b43c13e67b03dca0e1ea7baa490e03614
2019-04-10 23:05:53 -07:00
Ugo Yu
6548b8ea96
Merge "Align with Bluetooth metadata API changes" into qt-dev
...
am: d13938b1f2
Change-Id: Ie1186542f19398d182dd4a83d927911b54a2511f
2019-04-10 22:58:28 -07:00
TreeHugger Robot
86b6be0784
Merge "Update some wordings under the Display page" into qt-dev
2019-04-11 05:26:52 +00:00
Naina Nalluri
3ef0e5fc4f
Merge "Add background flag to CI system update intent" into qt-dev
2019-04-11 04:42:28 +00:00
lindatseng
2a22033092
Merge "Have dialogCornerRadius same as theme for panel" into qt-dev
...
am: d8f9412263
Change-Id: I54109b6546303a3d8d8941949c3bace4e08a3864
2019-04-10 20:50:24 -07:00
Raj Mojumder
84f10ae98b
Merge "Update OWNERS for nfc folder." into qt-dev
...
am: af9ef0ef06
Change-Id: I1b29f2f4e12d79d1a2cf3ae2e6d5e31141d571cc
2019-04-10 20:49:32 -07:00
Cn Chen
2c1fef68a8
Merge "Enable/disable fingerprint for SUW suggestion activity" into qt-dev
...
am: 7778904e2e
Change-Id: If9e53ec503e2a0330d7c33e9774e4fbff4e6baab
2019-04-10 20:48:22 -07:00
Mill Chen
d059b0ad2d
Merge "Set IA background not transparent" into qt-dev
...
am: cab405d84d
Change-Id: Idc1778d2555b171ffe103f1ede2a28be27e21dfb
2019-04-10 20:47:04 -07:00
TreeHugger Robot
d13938b1f2
Merge "Align with Bluetooth metadata API changes" into qt-dev
2019-04-11 03:37:58 +00:00
Jack Yu
9765dc4422
Merge "Fixed display name not saved after carrier changed" into qt-dev
...
am: b346760045
Change-Id: I9dd3868c7eeed68e7361eb1512af867c2d55c635
2019-04-10 20:21:43 -07:00
Raff Tsai
c82c5ebfe6
Merge "Remove old format contextual card log" into qt-dev
...
am: cc0cec4636
Change-Id: I8772494e7ff6e064f8be30a3ac1a3e15936a8e75
2019-04-10 20:20:20 -07:00
android-build-team Robot
0f71f24ca9
Snap for 5457264 from 7778904e2e to qt-release
...
Change-Id: Ib9c69fdfc9fe5c1f19e04f4efd722d2e13b38c47
2019-04-11 03:17:25 +00:00
Sunny Shao
ff7e7ad30d
Update some wordings under the Display page
...
-Sleep to Screen timeout
-Styles & Wallpapers to Styles & wallpapers
-Styles & Wallpapers, sleep, font size to Styles, wallpapers, screen timeout, font size
Fixes: 130240143
Fixes: 129885706
Test: Manual View
Change-Id: Icc4f18917961773a6435a23f32d06c5061c179eb
2019-04-11 11:15:30 +08:00
Salvador Martinez
1405d44643
Merge "Update BS warning to follow through on action" into qt-dev
...
am: a42fe30fc7
Change-Id: I4f558b5f2b21b7862698809922ec9b21911be13f
2019-04-10 19:26:01 -07:00
TreeHugger Robot
d8f9412263
Merge "Have dialogCornerRadius same as theme for panel" into qt-dev
2019-04-11 02:01:53 +00:00
Julia Reynolds
ed234f41e1
Merge "Changes for renamed API" into qt-dev
...
am: b027acfc6b
Change-Id: I4bbb331c48f6a17605cdb19becca217df221e343
2019-04-10 18:54:03 -07:00
TreeHugger Robot
af9ef0ef06
Merge "Update OWNERS for nfc folder." into qt-dev
2019-04-11 01:48:30 +00:00
Sean Stout
40f70ac3af
Merge "Add android.settings.VIEW_ADVANCED_POWER_USAGE_DETAIL" into qt-dev
...
am: 560b8b8a44
Change-Id: I72eec1158bd339f39c756a41aa00179aae95efbf
2019-04-10 18:40:19 -07:00
Cn Chen
7778904e2e
Merge "Enable/disable fingerprint for SUW suggestion activity" into qt-dev
2019-04-11 01:32:43 +00:00
Mill Chen
7b1ec94fc9
Default to enable oem-unlocking preference
...
Whether the device supports carriorlock or not, oem-unlocking preference
will be enabled by default, except sdk_gphone_x86-eng target.
Fixes: 129982117
Test: emulator, robotest
Change-Id: I02af50e425fe5a93c244bbf8fe8bd2682275974f
2019-04-10 17:58:55 -07:00
Fan Zhang
2cf21dde29
Merge "Rename resource variable names: homepage_* -> contextual_*" into qt-dev am: 8d9dadb1a2
...
am: e458174728
Change-Id: I605957018575a9a539502a704aac7dcd59de42ae
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
Change-Id: I329b3f3687d21921074030ea326e3eae2da9ac1b
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
Change-Id: I41fbc11373d83a7a71057f443202e38b0a220d97
2019-04-10 17:47:48 -07:00
TreeHugger Robot
cab405d84d
Merge "Set IA background not transparent" into qt-dev
2019-04-11 00:41:33 +00:00
Brad Ebinger
6acceb3cd1
Merge "Fix issue that user can't edit WFC mode for SIM2" am: d2727d5d9f
...
am: c91d33798b
Bug: 117193148
Test: manual CP
Merged-In: Icb3bd924f9e8e3e2e82845ab85ef25c2e38e13dc
Change-Id: Icb3bd924f9e8e3e2e82845ab85ef25c2e38e13dc
(cherry picked from commit ac4a495fc2 )
2019-04-11 00:37:37 +00:00
Brad Ebinger
ac4a495fc2
Merge "Fix issue that user can't edit WFC mode for SIM2" am: d2727d5d9f
...
am: c91d33798b
Change-Id: Icb3bd924f9e8e3e2e82845ab85ef25c2e38e13dc
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
Change-Id: I204f41ee8c0bbf9159879e9b7014c240a19e6ce7
2019-04-10 17:29:32 -07:00
lindatseng
7361702ecc
Have dialogCornerRadius same as theme for panel
...
Should have DialogCornerRadius updated with theme
Test: Visual inspection
Fixes: 123833192
Change-Id: I2e9779122f01e8e36611ae95a69295aa81e931fe
2019-04-10 17:13:45 -07:00
TreeHugger Robot
b346760045
Merge "Fixed display name not saved after carrier changed" into qt-dev
2019-04-11 00:02:41 +00:00
Fan Zhang
e458174728
Merge "Rename resource variable names: homepage_* -> contextual_*" into qt-dev
...
am: 8d9dadb1a2
Change-Id: I2cbabe5312fb1e0c3ddd8f8c95a842b1acfdf51a
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
Change-Id: I313114405e3e00e99c48224e680db3b026b23104
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
Change-Id: Iae5bd1947f29de0f3cff3080b3a3f0fc8cf5c99c
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
Change-Id: I1405532c1c400a2c7d7af1397dea701bb424239a
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
Change-Id: I1bbbe7efe7f057dfcf55f9685f2b10ebd94e3f38
2019-04-10 16:17:17 -07:00
android-build-team Robot
d6a49c3967
Merge cherrypicks of [7003810, 7004390, 7003811] into qt-release
...
Change-Id: Ia645967299ccbe0b060f0c9303415137eb1492b2
2019-04-10 22:49:12 +00:00
Fabian Kozynski
aaa7aef984
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
(cherry picked from commit a52961d803 )
2019-04-10 22:49:03 +00:00
Salvador Martinez
a42fe30fc7
Merge "Update BS warning to follow through on action" into qt-dev
2019-04-10 22:46:10 +00:00
Raj Mojumder
70907f547f
Update OWNERS for nfc folder.
...
BUG: 65294119
Test: gerrit upload
Change-Id: I71e6e39c61862529198378228d793d3a6ba14139
Signed-off-by: Raj Mojumder <rmojumder@google.com >
Exempt-From-Owner-Approval: Invalid owners.
2019-04-10 22:30:00 +00:00
Julia Reynolds
5cc78fc802
Merge "Use correct key value" into qt-dev am: b2bf285911
...
am: af2195bd98
Change-Id: Ia163053b5566950fb1cb5fec9b38b737af59e323
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
Change-Id: I8a94ce194a640d96f15903e083319e012fc68bcc
2019-04-10 15:20:19 -07:00
Naina Nalluri
dfbe891e39
Add background flag to CI system update intent
...
Add flag to allow KEY_CI_ACTION_ON_SYS_UPDATE_INTENT_STRING
intent. This is needed
as the receiver service is modified to use
latest target version SDK which introduces Background
broadcast limitations.
Bug: 78634470
Test: On Device, verified that the intents are
received by the service
Change-Id: I140c1988b241885a737413bd5f0b9c3cc63c4ea8
2019-04-10 22:12:10 +00:00
Fan Zhang
0942837083
Merge "Gracefully handle the case where private volume may be unmountable" into qt-dev am: 6dd38b462f
...
am: 9be307720b
Change-Id: I0ef02e15d469144ba142d21c3e5a377c08dc4db7
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