Android/packages_apps_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
52,971 Commits 1 Branch 0 Tags
1825608cdec3521324ef97d50736dbcdd3c08605
Commit Graph

5670 Commits

Author SHA1 Message Date
Joshua Mccloskey
9b79a4c902 Merge "String update." into qt-r1-dev 
am: b471e2439c

Change-Id: I63a30632336f2df104440ed4e51c3d76d4f2aa9f
 2019-05-30 16:32:47 -07:00
Joshua Mccloskey
b471e2439c Merge "String update." into qt-r1-dev 2019-05-30 23:12:53 +00:00
Alex Salo
ac7851e1ce Merge "Adds contextual cards for screen attention in Settings Homepage" into qt-r1-dev 
am: fa127bd6f7

Change-Id: Ie61452dd21b1d3d6183edab66c01b51d39c008da
 2019-05-30 16:12:36 -07:00
Alex Salo
fa127bd6f7 Merge "Adds contextual cards for screen attention in Settings Homepage" into qt-r1-dev 2019-05-30 22:59:12 +00:00
Mehdi Alizadeh
97f5ab6fac Merge "Increase char limit to 60 for string translation" into qt-dev am: 178d4a7f8f 
am: 4937d4ca1f

Change-Id: Ib4f85a72db8e8d36e5016c90857c532195632904
 2019-05-30 15:19:22 -07:00
Mehdi Alizadeh
4937d4ca1f Merge "Increase char limit to 60 for string translation" into qt-dev 
am: 178d4a7f8f

Change-Id: I8369dc9dc525652253f4d5a8945725b09268470c
 2019-05-30 15:16:16 -07:00
TreeHugger Robot
178d4a7f8f Merge "Increase char limit to 60 for string translation" into qt-dev 2019-05-30 22:04:47 +00:00
Christine Franks
3ccc01ca18 Merge "Add SIM color picker" into qt-dev am: b747c5c270 
am: c1c4a0858d

Change-Id: I0c4ac5abe7be3eeb2df324b41f13284ed25dea95
 2019-05-30 13:35:49 -07:00
Christine Franks
c1c4a0858d Merge "Add SIM color picker" into qt-dev 
am: b747c5c270

Change-Id: Ia234bd596017cf98dd5a76202c6fe7af486562f4
 2019-05-30 13:20:46 -07:00
Christine Franks
b747c5c270 Merge "Add SIM color picker" into qt-dev 2019-05-30 20:01:48 +00:00
joshmccloskey
5ef0a1d11d String update. 
Test: Manual.
Bug: 133783098
Change-Id: If8ea2b6c9372a3da02b93b815f76e3143cc54dea
 2019-05-30 10:51:34 -07:00
Lucas Dupin
a44a66f52a Merge "Add setting to bypass lock screen" into qt-r1-dev 
am: 0783505433

Change-Id: I533383a4e7c9ecc068c24cd55647c55487dfd5a6
 2019-05-30 00:00:13 -07:00
Lucas Dupin
0783505433 Merge "Add setting to bypass lock screen" into qt-r1-dev 2019-05-30 06:50:17 +00:00
Mehdi Alizadeh
be98ea25ca Increase char limit to 60 for string translation 
Bug: 133862422
Test: None
Change-Id: I3fa6705a6657c5aa65e496cba2ce470fb558a45f
 2019-05-29 20:22:09 -07:00
Christine Franks
8869db9555 Add SIM color picker 
Bug: 133193155
Test: make ROBOTEST_FILTER="(RenameMobileNetwork*)" RunSettingsRoboTests -j48

Change-Id: Ifae8b77bc5b4ba1039ede70889468a018f57d78f
 2019-05-29 17:03:31 -07:00
Lucas Dupin
b2aaa26f38 Add setting to bypass lock screen 
Test: manual
Test: make RunSettingsRoboTests ROBOTEST_FILTER=LockscreenBypassPreferenceControllerTest
Bug: 130327302
Change-Id: I324c6e384480fa8576ba58d0bf73c1ef20484ee0
 2019-05-29 15:57:32 -07: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
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
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
77d0d162a2 Merge "Add snooze notification setting" into qt-dev am: b8f7db90ce 
am: 75034e5c20

Change-Id: I3a6d2e7618d152d94d996e43e28dfbe2d55b6e79
 2019-05-29 10:23:59 -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
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
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
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
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
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
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
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
Julia Reynolds
ada3676b2d Move priorization setting to dev options 
Under the other notif channel setting

Test: atest
Fixes: 133747537
Change-Id: I22fcf348b2070758a752babe64fe2af60fbe95a4
 2019-05-28 15:33:22 +00:00
Julia Reynolds
3562c97441 Add snooze notification setting 
Test: atest
Bug: 133494458
Change-Id: I3c0534860aaeb374384c4e30764313b1cb83c82a
 2019-05-28 10:40:53 -04:00
Mehdi Alizadeh
195b5903db Adds string resources for gesture not supported dialog 
Bug: 129532605
Test: Manual test to verity the strings are shown correctly
Change-Id: Ibc451170e936e7b8e1bf1c0be07be33e2ddca6a4
 2019-05-24 18:38:01 -07:00
Evan Laird
22a6050035 Merge "Simplify channel importance settings screen" into qt-dev am: 4321e038ff 
am: a433064df4

Change-Id: I547d4346aea58b8a2fa1e9a3470ac4877f73ed68
 2019-05-24 11:23:24 -07:00
Evan Laird
a433064df4 Merge "Simplify channel importance settings screen" into qt-dev 
am: 4321e038ff

Change-Id: I9346139116adef62b83e1e85030c8371fa936375
 2019-05-24 10:13:47 -07:00