Evan Laird
3d89792f08
Merge "Turn off LAYER_TYPE_SOFTWARE on BatteryMeterView" into qt-dev am: 4f988c8b29
...
am: fec0ebdde8
Change-Id: I51fdb7d95082d1b90692b24a20f320abfe4bdf8d
2019-04-11 15:01:59 -07:00
Evan Laird
fec0ebdde8
Merge "Turn off LAYER_TYPE_SOFTWARE on BatteryMeterView" into qt-dev
...
am: 4f988c8b29
Change-Id: I0b4a8a2f3b691f6ec4ab484c008385fb0d4a8b3b
2019-04-11 13:32:50 -07:00
TreeHugger Robot
4f988c8b29
Merge "Turn off LAYER_TYPE_SOFTWARE on BatteryMeterView" into qt-dev
2019-04-11 19:54:32 +00:00
Robin Lee
5f2cbc5012
Merge "Add OWNERS file for settings/vpn2" into qt-dev am: fd3cf32ad8
...
am: e7cf4fce8b
Change-Id: Iabb311006691a4e03d865fc4ffcf939f775482a0
2019-04-11 08:19:07 -07:00
Robin Lee
e7cf4fce8b
Merge "Add OWNERS file for settings/vpn2" into qt-dev
...
am: fd3cf32ad8
Change-Id: I8c2bdb76d4cf587579bba0544ba417dbfacbae5c
2019-04-11 08:11:26 -07:00
Robin Lee
fd3cf32ad8
Merge "Add OWNERS file for settings/vpn2" into qt-dev
2019-04-11 14:53:10 +00:00
Robin Lee
7463700fb4
Add OWNERS file for settings/vpn2
...
Adds more people who can approve changes to the VPN Settings UI.
Test: repo upload .
Fix: 130346282
Change-Id: I8bb8a7559b5967189476406a00467c6b8bcdc52e
2019-04-11 14:52:37 +00:00
Evan Laird
3e98ff34d0
Turn off LAYER_TYPE_SOFTWARE on BatteryMeterView
...
ThemedBatteryDrawable will no longer need it due to drawing more
betterer
Test: battery should look the same
Bug: 129014647
Change-Id: I6706cec2b3c3bfbdc0e0456c58191bc7152783e7
2019-04-11 10:52:14 -04:00
Sunny Shao
305d52570d
Merge "Update some wordings under the Display page" into qt-dev am: 86b6be0784
...
am: 9bd453b5d4
Change-Id: I2421f14062deadcc6fedfc8c4673d67e81afde43
2019-04-11 04:27:54 -07:00
Naina Nalluri
e978a69ee8
Merge "Add background flag to CI system update intent" into qt-dev am: 3ef0e5fc4f
...
am: 3df7431c8e
Change-Id: I7e2165fb95ffbdd8291b0e5c82cd4d1715187269
2019-04-11 03:33:00 -07:00
Ugo Yu
be24194046
Merge "Align with Bluetooth metadata API changes" into qt-dev am: d13938b1f2
...
am: 6548b8ea96
Change-Id: I899301292b2ecc3c57a9a44e84dc604d4bbce726
2019-04-11 03:09:18 -07:00
lindatseng
4842af57e8
Merge "Have dialogCornerRadius same as theme for panel" into qt-dev am: d8f9412263
...
am: 2a22033092
Change-Id: I2a1c34ad4afbffcc2236293db61c37bedf5bcc35
2019-04-11 03:08:02 -07:00
Raj Mojumder
063f8c14da
Merge "Update OWNERS for nfc folder." into qt-dev am: af9ef0ef06
...
am: 84f10ae98b
Change-Id: I02990be50a09156a979e6e8354211ef8d2d4e01b
2019-04-11 00:59:38 -07:00
Cn Chen
931560debd
Merge "Enable/disable fingerprint for SUW suggestion activity" into qt-dev am: 7778904e2e
...
am: 2c1fef68a8
Change-Id: I6c14a40abefccc60f09f22032e99672447a3261a
2019-04-11 00:52:12 -07:00
Mill Chen
c04510c564
Merge "Set IA background not transparent" into qt-dev am: cab405d84d
...
am: d059b0ad2d
Change-Id: Ifbd9cb117c9a0982b0c9104ac694e5ed10e97001
2019-04-11 00:50:28 -07:00
Sunny Shao
9bd453b5d4
Merge "Update some wordings under the Display page" into qt-dev
...
am: 86b6be0784
Change-Id: I66c100084a6986935a0707c5a11ea80729ea3b0e
2019-04-11 00:33:50 -07:00
Jack Yu
103e5881d2
Merge "Fixed display name not saved after carrier changed" into qt-dev am: b346760045
...
am: 9765dc4422
Change-Id: I4000b8d90350f2916ba2d4c885be98ffc465ffd0
2019-04-11 00:26:27 -07:00
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
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
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
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