Commit Graph

18402 Commits

Author SHA1 Message Date
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
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
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
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
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
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
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
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
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
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
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
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
Fan Zhang
317597ae6a Merge "Fix transparent view issue in page "Erase all data"" into qt-dev 2019-05-28 19:23:54 +00:00
Mehdi Alizadeh
923ab1eacd Merge "Adds string resources for gesture not supported dialog" into qt-dev am: 7009b21d74 am: 5409188e03
am: b907a39a36

Change-Id: Ic090c4360f5b43cee34ebabe45f402bc42f39a12
2019-05-28 11:54:33 -07:00
Mehdi Alizadeh
b907a39a36 Merge "Adds string resources for gesture not supported dialog" into qt-dev am: 7009b21d74
am: 5409188e03

Change-Id: I4ae4dc61c8f9972da74729b82b866857610a8b63
2019-05-28 11:44:27 -07:00
Mehdi Alizadeh
facec6bc87 Merge "Adds string resources for gesture not supported dialog" into qt-dev
am: 7009b21d74

Change-Id: If52a8ca219c7dcdfb89405910b86f7b1c8ee2e54
2019-05-28 11:33:58 -07:00
Mehdi Alizadeh
5409188e03 Merge "Adds string resources for gesture not supported dialog" into qt-dev
am: 7009b21d74

Change-Id: I4737dfb0132d52780c327b0c8b9fd48f6009b392
2019-05-28 11:33:52 -07:00
Mehdi Alizadeh
7009b21d74 Merge "Adds string resources for gesture not supported dialog" into qt-dev 2019-05-28 18:16:27 +00:00
Julia Reynolds
18154c5922 Merge "Move priorization setting to dev options" into qt-dev am: 64f229d32b am: 67471c290a
am: af9e7c5e46

Change-Id: Ibe9a5e7367046d630d82790f6484122914fc3c2e
2019-05-28 10:29:46 -07:00
Julia Reynolds
af9e7c5e46 Merge "Move priorization setting to dev options" into qt-dev am: 64f229d32b
am: 67471c290a

Change-Id: Ie052457ab0ec1245b03c1283a7cd68ab18d18349
2019-05-28 10:14:43 -07:00
Fan Zhang
4cd69235fe Merge "Fix overlapping problem in AlertDialog" into qt-dev am: 574679ace4 am: 326f60b6bc
am: 6265d663df

Change-Id: Iaec9f6f688dd1f4a328e1b99b9854f0f08346e20
2019-05-28 10:14:14 -07:00
Julia Reynolds
2e8c971a93 Merge "Move priorization setting to dev options" into qt-dev
am: 64f229d32b

Change-Id: Ic03000ed13a7c9c02b8660684929689b5b61df49
2019-05-28 10:10:42 -07:00
Julia Reynolds
67471c290a Merge "Move priorization setting to dev options" into qt-dev
am: 64f229d32b

Change-Id: I17f48bbdea860e1b8e4b333f2370d446e906eaa9
2019-05-28 10:08:48 -07:00
Fan Zhang
6265d663df Merge "Fix overlapping problem in AlertDialog" into qt-dev am: 574679ace4
am: 326f60b6bc

Change-Id: I8658244e2e8806fa7b86e9d222ecf805f5b541aa
2019-05-28 10:00:22 -07:00