Antony Sargent
694de4f5aa
Merge "Switch to using an intent for eSIM erasing" into qt-dev am: f010cb4034
...
am: 55ac2d75fc
Change-Id: Ia619de1f58e46ca0e36ed1fa5c7039fbe45d1324
2019-05-29 13:22:34 -07:00
Antony Sargent
e4ede480d7
Merge "Switch to using an intent for eSIM erasing" into qt-dev
...
am: f010cb4034
Change-Id: Ic7ab832ec9997bf50d7b9277dfbd9e50adda9517
2019-05-29 13:16:31 -07:00
Antony Sargent
55ac2d75fc
Merge "Switch to using an intent for eSIM erasing" into qt-dev
...
am: f010cb4034
Change-Id: Ia08496db92bd4a432db729d7734bc3bb3b9d6f0a
2019-05-29 13:14:42 -07:00
Lei Yu
798b80e5ad
Update SliceView when slice is null
...
When it is null, we should also update SliceView, so SliceView can
update to be "invisible"
Fixes: 133790296
Test: RunSettingsRoboTests
Change-Id: I239405cce8bcadacbd374ccbb24d0fcbadc04880
2019-05-29 13:11:57 -07:00
TreeHugger Robot
f010cb4034
Merge "Switch to using an intent for eSIM erasing" into qt-dev
2019-05-29 20:02:48 +00:00
Evan Laird
feaec04896
Merge "Merge "Change title to "Alerting"" into qt-dev am: c64d41fd98
am: 03acd2962e" into qt-r1-dev-plus-aosp
...
am: b2a7a2c7bf
Change-Id: I70fca9b53fb95bfb18e37c805d1ec975642d02ba
2019-05-29 12:51:10 -07:00
Evan Laird
c8dc95bbaa
Merge "Change title to "Alerting"" into qt-dev am: c64d41fd98
am: f7ad71aab2
...
am: 6dd09d09ea
Change-Id: If0a219e7045e49c4f59e5bc712fd30ca0758c6fb
2019-05-29 12:50:19 -07:00
Android Build Merger (Role)
b2a7a2c7bf
Merge "Merge "Change title to "Alerting"" into qt-dev am: c64d41fd98
am: 03acd2962e" into qt-r1-dev-plus-aosp
2019-05-29 19:44:29 +00:00
Evan Laird
6dd09d09ea
Merge "Change title to "Alerting"" into qt-dev am: c64d41fd98
...
am: f7ad71aab2
Change-Id: I7f70d5cc3b1d824671cb6e1263363a1af0b7222b
2019-05-29 12:44:16 -07:00
Evan Laird
0a06e6ca9b
Merge "Change title to "Alerting"" into qt-dev am: c64d41fd98
...
am: 03acd2962e
Change-Id: Ie5af78c77a3a40c9a47053d02714f3ad346f3cad
2019-05-29 12:44:15 -07:00
Evan Laird
03acd2962e
Merge "Change title to "Alerting"" into qt-dev
...
am: c64d41fd98
Change-Id: I2305841504e8146481bfd6128d1194d1741e1ba2
2019-05-29 12:40:16 -07:00
Evan Laird
f7ad71aab2
Merge "Change title to "Alerting"" into qt-dev
...
am: c64d41fd98
Change-Id: I9b45e08a54097a5e04f58439a87443902f1c28bf
2019-05-29 12:39:14 -07:00
TreeHugger Robot
c64d41fd98
Merge "Change title to "Alerting"" into qt-dev
2019-05-29 19:19:59 +00:00
Amit Mahajan
502472beaa
Merge "Allow renaming inactive subscriptions." into qt-dev am: d133a026cd
am: 355340fd7e
...
am: e7c821a58d
Change-Id: Ie481d9650940cc2914f3e15b13bc53d697709ecc
2019-05-29 11:43:34 -07:00
Amit Mahajan
5ec6aca8c3
Merge "Allow renaming inactive subscriptions." into qt-dev am: d133a026cd
am: 38b3a56364
...
am: 7670329876
Change-Id: Ia4809231eba0c62392b1736e77b43289bcf382b6
2019-05-29 11:41:12 -07:00
Amit Mahajan
e7c821a58d
Merge "Allow renaming inactive subscriptions." into qt-dev am: d133a026cd
...
am: 355340fd7e
Change-Id: If2fe3bfa6f4a4b78f818feb5dcf14b00415541ce
2019-05-29 11:38:00 -07:00
Amit Mahajan
7670329876
Merge "Allow renaming inactive subscriptions." into qt-dev am: d133a026cd
...
am: 38b3a56364
Change-Id: I565cca6519096a3b757a1c990d2cd6fb6e1f6ab9
2019-05-29 11:32:05 -07:00
Amit Mahajan
355340fd7e
Merge "Allow renaming inactive subscriptions." into qt-dev
...
am: d133a026cd
Change-Id: Ic4d5cc450923ed422ef97761c8a16303a81268dc
2019-05-29 11:28:42 -07:00
Amit Mahajan
38b3a56364
Merge "Allow renaming inactive subscriptions." into qt-dev
...
am: d133a026cd
Change-Id: Ifb4aafad705860d12c02ad3d26a3a36019ad9847
2019-05-29 11:28:13 -07:00
TreeHugger Robot
d133a026cd
Merge "Allow renaming inactive subscriptions." into qt-dev
2019-05-29 18:16:40 +00:00
Julia Reynolds
3d06efb9bc
Merge "Add snooze notification setting" into qt-dev am: b8f7db90ce
am: 75d207c364
...
am: 3077d8418c
Change-Id: Ibdf2502e2b793ba0017a79996cef299a5c3c5fd9
2019-05-29 11:01:49 -07:00
Mill Chen
8ef8c78e11
Merge "Add EID as a synonym to SIM status" into qt-dev am: 994d7d63d3
am: 7d5050f252
...
am: 3ae11224a9
Change-Id: Ic5177afdacf509286f871e004076a0fb93d7a61b
2019-05-29 10:59:43 -07:00
Julia Reynolds
1fd8f23229
Merge "Add snooze notification setting" into qt-dev am: b8f7db90ce
am: 75034e5c20
...
am: 77d0d162a2
Change-Id: Icc3ba989ee166713cb9c1bf872f96c2c139fd4e1
2019-05-29 10:48:37 -07:00
Yi Jiang
7605494cc5
Adds contextual cards for screen attention in Settings Homepage
...
Bug: 128527964
Test: atest ContextualAdaptiveSleepSliceTest, maually verified.
Change-Id: Ifaea7d8d4391e91cf6cbde38a2506728f55913d8
2019-05-29 10:37:11 -07:00
Julia Reynolds
3077d8418c
Merge "Add snooze notification setting" into qt-dev am: b8f7db90ce
...
am: 75d207c364
Change-Id: I56ce68336af7ba504dc86734f8e370a2adb21e5f
2019-05-29 10:33:19 -07:00
Mill Chen
3ae11224a9
Merge "Add EID as a synonym to SIM status" into qt-dev am: 994d7d63d3
...
am: 7d5050f252
Change-Id: I5e026caee2fa852a4c5e4c9ddeab252b6364a9e7
2019-05-29 10:30:31 -07:00
Mill Chen
0dad405c57
Merge "Add EID as a synonym to SIM status" into qt-dev am: 994d7d63d3
am: 9ebf7e8ece
...
am: c301af9e32
Change-Id: Ica04f580690f5de87e31970f39d11468d1c975e8
2019-05-29 10:27:38 -07:00
Julia Reynolds
75d207c364
Merge "Add snooze notification setting" into qt-dev
...
am: b8f7db90ce
Change-Id: If4f5777f87dda64edd2b947fe08be88fdae0c4db
2019-05-29 10:24:19 -07:00
Julia Reynolds
77d0d162a2
Merge "Add snooze notification setting" into qt-dev am: b8f7db90ce
...
am: 75034e5c20
Change-Id: I3a6d2e7618d152d94d996e43e28dfbe2d55b6e79
2019-05-29 10:23:59 -07:00
Tsung-Mao Fang
dddbe4c1b9
Revert "Tweak title for "App content"" am: 685d247730
am: 6705e45ca6
...
am: 7a794c3720
Change-Id: Ib486d922cdf3ccd7870dda86d825235c6eebb44c
2019-05-29 10:23:58 -07:00
Tsung-Mao Fang
1c125ab5d5
Revert "Tweak title for "App content"" am: 685d247730
am: 8456765698
...
am: 103ac2d568
Change-Id: I2a726a22a1598c32ad3220f31ff66eac6d62ea96
2019-05-29 10:20:18 -07:00
Evan Laird
b18ec1958a
Change title to "Alerting"
...
Test: visual
Fixes: 133825282
Change-Id: I08c58328eafdc37ba993d5189c8830e2c00115e6
2019-05-29 13:19:37 -04:00
Julia Reynolds
75034e5c20
Merge "Add snooze notification setting" into qt-dev
...
am: b8f7db90ce
Change-Id: I2059c7ac5ae2922bba2c3d22413b21ed0ee60979
2019-05-29 10:15:46 -07:00
Mill Chen
c301af9e32
Merge "Add EID as a synonym to SIM status" into qt-dev am: 994d7d63d3
...
am: 9ebf7e8ece
Change-Id: I216cdc46be00d554c30a203588ccba505ffceb70
2019-05-29 10:09:20 -07:00
Mill Chen
9ebf7e8ece
Merge "Add EID as a synonym to SIM status" into qt-dev
...
am: 994d7d63d3
Change-Id: I7df67710b59ff6d6d0ae25c8665c8b44a6b1860b
2019-05-29 10:04:32 -07:00
Mill Chen
7d5050f252
Merge "Add EID as a synonym to SIM status" into qt-dev
...
am: 994d7d63d3
Change-Id: If6eefc766dd97858b424ffcd2387106dbd270de9
2019-05-29 10:04:24 -07:00
TreeHugger Robot
b8f7db90ce
Merge "Add snooze notification setting" into qt-dev
2019-05-29 17:03:32 +00:00
Tsung-Mao Fang
7a794c3720
Revert "Tweak title for "App content"" am: 685d247730
...
am: 6705e45ca6
Change-Id: I92db1e82bd8df3db0bcb1717e9c8632a615c6d4e
2019-05-29 09:59:36 -07:00
Tsung-Mao Fang
103ac2d568
Revert "Tweak title for "App content"" am: 685d247730
...
am: 8456765698
Change-Id: Ieda932a1ac2ef8ea8f03a3c3a293f5d9380150a4
2019-05-29 09:57:04 -07:00
Tsung-Mao Fang
6705e45ca6
Revert "Tweak title for "App content""
...
am: 685d247730
Change-Id: I32054bc26328ae66e2f3baa42ef8794476337e86
2019-05-29 09:48:52 -07:00
TreeHugger Robot
994d7d63d3
Merge "Add EID as a synonym to SIM status" into qt-dev
2019-05-29 16:48:23 +00:00
Tsung-Mao Fang
8456765698
Revert "Tweak title for "App content""
...
am: 685d247730
Change-Id: I17befd995e227e53ecf7870dcc5af2e261039454
2019-05-29 09:45:30 -07:00
Pavel Grafov
b49eb4348a
Make work challenge pattern resizeable.
...
Currently in split-screen mode if work challenge window is made too narrow,
the dots of the pattern will go beyond window/screen boundaries. This change
makes pattern behave in the same way as primary profile pattern does, see
confirm_lock_pattern_normal.xml
Fixes: 133135598
Test: manual, resizing work challenge in portrait and landscape.
Change-Id: I40649911c2b7c587bf0b7e4a5c0449a5c2b7abb0
2019-05-29 14:41:33 +01:00
Tsung-Mao Fang
685d247730
Revert "Tweak title for "App content""
...
This reverts commit a00e725b0a
.
Reason for revert: The string change only for Google Settings instead of
AOSP.
Test: visual
Bug: 133370964
Change-Id: Ib21bff1abc2fd169f957f10154914f85c71d22d1
2019-05-29 17:19:36 +08:00
Mill Chen
a5bbb26dfe
Add EID as a synonym to SIM status
...
We can't use EID as keyword to search for it because EID info is located
in the SIM status dialog in which it's not searchable. EID is added as a
synonym of SIM status to support its search result.
Fixes: 133801685
Test: Settings > Search settings > type "eid"
then will show "SIM status" search result
Change-Id: I03b49bf6f2951c468440f635d7b211266bb00d83
2019-05-29 07:36:38 +00:00
Yi-Ling Chuang
bef25b52fb
Load wallpaper colors in a background thread.
...
In WallpaperManagerService, it takes some time to load wallpaper colors
from image wallpapers since bitmap decoding will be involved. This will
block the UI thread and lead to app launch latency. So here we are
making it in another thread to avoid this.
Bug: 133396959
Test: robotest, reboot phone and look at boot trace
Change-Id: Ibd1952a4bf10431ba4be4dd69634d64354670daa
2019-05-29 12:02:12 +08:00
Roshan Pius
6bc46eb6ff
Merge "Merge "Developer settings: Disable wifi scan throttling" into qt-dev am: 7b2897ff93
am: 0fbbad92f9" into qt-r1-dev-plus-aosp
...
am: d2cff50fad
Change-Id: Iae27e79bcc76bb10891e11fd6ec3b6b04e6370bd
2019-05-28 16:37:25 -07:00
Roshan Pius
a505c7ffb0
Merge "Developer settings: Disable wifi scan throttling" into qt-dev am: 7b2897ff93
am: 05df09fe96
...
am: d511e174ef
Change-Id: Icc5cada6f2f807f9a5f4960b7930119d2986655b
2019-05-28 16:35:35 -07:00
Android Build Merger (Role)
d2cff50fad
Merge "Merge "Developer settings: Disable wifi scan throttling" into qt-dev am: 7b2897ff93
am: 0fbbad92f9" into qt-r1-dev-plus-aosp
2019-05-28 23:31:49 +00:00
Roshan Pius
6b093213b9
Merge "Developer settings: Disable wifi scan throttling" into qt-dev am: 7b2897ff93
...
am: 0fbbad92f9
Change-Id: I574353b301a8841e35a2c05434ba9329aa5af0c2
2019-05-28 16:30:33 -07:00