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
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
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
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
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
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
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
Roshan Pius
d511e174ef
Merge "Developer settings: Disable wifi scan throttling" into qt-dev am: 7b2897ff93
...
am: 05df09fe96
Change-Id: Ib5be27d8d7c9f8d081187dceef11a6b956c92323
2019-05-28 16:29:46 -07:00
Amin Shaikh
82b99415d3
Merge "Remove theming developer settings." into qt-r1-dev am: aa3ae7291a
...
am: 44d3605deb
Change-Id: I277873dd13eac2c2181399657527c625a81bf112
2019-05-28 16:29:09 -07:00
Roshan Pius
0fbbad92f9
Merge "Developer settings: Disable wifi scan throttling" into qt-dev
...
am: 7b2897ff93
Change-Id: Idae682080e9d4ca0151132fbbcf23f3280f72d3f
2019-05-28 16:25:30 -07:00
Roshan Pius
05df09fe96
Merge "Developer settings: Disable wifi scan throttling" into qt-dev
...
am: 7b2897ff93
Change-Id: Id2847a87434737fd56c24618dc4b432394e880f7
2019-05-28 16:24:31 -07:00
Amin Shaikh
44d3605deb
Merge "Remove theming developer settings." into qt-r1-dev
...
am: aa3ae7291a
Change-Id: I71a45b7789a064d52c46c93439dda6057e5affc1
2019-05-28 16:24:07 -07:00
TreeHugger Robot
aa3ae7291a
Merge "Remove theming developer settings." into qt-r1-dev
2019-05-28 23:20:22 +00:00
Roshan Pius
7b2897ff93
Merge "Developer settings: Disable wifi scan throttling" into qt-dev
2019-05-28 23:13:03 +00:00
Antony Sargent
0b88d6cbf2
Merge "Add signal strength icons to multi-SIM header" into qt-dev am: 42c451610e
am: 3f48938e03
...
am: e6680fc516
Change-Id: I7eaba3152e11a84ba34cc8e43307db2571df6bd2
2019-05-28 15:22:35 -07:00
Antony Sargent
0d20a31a1e
Merge "Add signal strength icons to multi-SIM header" into qt-dev am: 42c451610e
am: d7bcf57ed8
...
am: f736cbf64a
Change-Id: Ifb9d2db593736d2b6d528e5980dd293df878d997
2019-05-28 15:18:25 -07:00
Antony Sargent
e6680fc516
Merge "Add signal strength icons to multi-SIM header" into qt-dev am: 42c451610e
...
am: 3f48938e03
Change-Id: Id1ae3f45679602bbc328d58dfa1f07fd3435e6fe
2019-05-28 15:10:29 -07:00
Antony Sargent
f736cbf64a
Merge "Add signal strength icons to multi-SIM header" into qt-dev am: 42c451610e
...
am: d7bcf57ed8
Change-Id: I7d064463bb8bf64db82cac56a08740ad72e9b7ad
2019-05-28 15:04:02 -07:00
Antony Sargent
3f48938e03
Merge "Add signal strength icons to multi-SIM header" into qt-dev
...
am: 42c451610e
Change-Id: I99abda9f54a97f0103c926ded07f027fac1d5482
2019-05-28 14:58:13 -07:00
Antony Sargent
d7bcf57ed8
Merge "Add signal strength icons to multi-SIM header" into qt-dev
...
am: 42c451610e
Change-Id: Ice796e09d1821dedb0ad00ff8218afd1be205374
2019-05-28 14:58:09 -07:00
TreeHugger Robot
42c451610e
Merge "Add signal strength icons to multi-SIM header" into qt-dev
2019-05-28 21:54:12 +00:00
tmfang
befcd016b7
Merge "Tweak title for "App content"" into qt-dev am: e40b0f7b8a
am: f3327de8af
...
am: 0e9167c8c1
Change-Id: I7539d0c724362bdb0866f678a205cf02a7788c36
2019-05-28 14:00:57 -07:00
tmfang
75bf4c3661
Merge "Tweak title for "App content"" into qt-dev am: e40b0f7b8a
am: 21d1cab50d
...
am: b91b94bfb5
Change-Id: I326ff96634c1838d4919c7347a00e6147c8a530c
2019-05-28 13:58:49 -07:00
tmfang
0e9167c8c1
Merge "Tweak title for "App content"" into qt-dev am: e40b0f7b8a
...
am: f3327de8af
Change-Id: Ia563fb0fdf3e3fc954da5811f3f1658978e63720
2019-05-28 13:54:46 -07:00
tmfang
b91b94bfb5
Merge "Tweak title for "App content"" into qt-dev am: e40b0f7b8a
...
am: 21d1cab50d
Change-Id: I1a5a64b25cb7cc0bfe5e43dfc92602043308490b
2019-05-28 13:54:17 -07:00
tmfang
f3327de8af
Merge "Tweak title for "App content"" into qt-dev
...
am: e40b0f7b8a
Change-Id: Ic5b178957533091e409fbd1bf84807ab7cac3193
2019-05-28 13:48:29 -07:00
tmfang
21d1cab50d
Merge "Tweak title for "App content"" into qt-dev
...
am: e40b0f7b8a
Change-Id: Ifa324de0e653e978743433da44657a5b5e30fd1e
2019-05-28 13:48:28 -07:00
TreeHugger Robot
e40b0f7b8a
Merge "Tweak title for "App content"" into qt-dev
2019-05-28 20:31:51 +00:00
Fan Zhang
251c09e2f0
Merge "Fix transparent view issue in page "Erase all data"" into qt-dev am: 317597ae6a
am: 7c96c6549a
...
am: 002656725c
Change-Id: I2c78124e28912ff8794a2161d07e09da79096185
2019-05-28 13:10:43 -07:00
Fan Zhang
4c526fa37f
Merge "Fix transparent view issue in page "Erase all data"" into qt-dev am: 317597ae6a
am: 7b3314ac17
...
am: 7ca799088f
Change-Id: Ie89224ca441da17e71469bd403498bf553c47542
2019-05-28 13:09:16 -07:00
Fan Zhang
002656725c
Merge "Fix transparent view issue in page "Erase all data"" into qt-dev am: 317597ae6a
...
am: 7c96c6549a
Change-Id: I500562df61719f04efb0552f6fa339b8f9d31c11
2019-05-28 12:52:01 -07:00
Fan Zhang
7ca799088f
Merge "Fix transparent view issue in page "Erase all data"" into qt-dev am: 317597ae6a
...
am: 7b3314ac17
Change-Id: I55ec94b3f6af6eb8da77e60c04b4861a05c97a9c
2019-05-28 12:51:00 -07:00
Antony Sargent
223c179cd3
Add signal strength icons to multi-SIM header
...
When a device is in DSDS mode with multiple SIMs, we show a header on
the Network & internet page with a "connectivity overview", with an
entry for Wi-Fi (if connected) and each active SIM. The icon for Wi-Fi
shows signal strength, but the icons for the active SIMs were just
static; this CL fixes that. It introduces a class for listening to
signal strength changes on a set of subscriptions, and moves some
existing code we had for displaying signal strength (when manually
picking networks for GSM) in NetworkOperatorPreference into a utility
method that can be shared.
Bug: 128855095
Test: make RunSettingsRoboTests
Change-Id: I668cafe1e9f9c3651b1f33783c8538ad9c2732b5
2019-05-28 12:49:08 -07:00
Fan Zhang
7b3314ac17
Merge "Fix transparent view issue in page "Erase all data"" into qt-dev
...
am: 317597ae6a
Change-Id: I1ba4258bc545df55dee5066f3c6e5c72b10b0735
2019-05-28 12:39:29 -07:00
Fan Zhang
7c96c6549a
Merge "Fix transparent view issue in page "Erase all data"" into qt-dev
...
am: 317597ae6a
Change-Id: I916dbbaf83c153e66686db2a8a83e2fb0edd16cc
2019-05-28 12:39:11 -07:00
TreeHugger Robot
d037ff6513
Merge "Disable flaky test launchDashboard_shouldSeeFooter"
2019-05-28 19:28:51 +00:00
Fan Zhang
317597ae6a
Merge "Fix transparent view issue in page "Erase all data"" into qt-dev
2019-05-28 19:23:54 +00:00