Android/packages_apps_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
60,956 Commits 1 Branch 0 Tags
423698285347da170a2f741562a332162d4f4fac
Commit Graph

6476 Commits

Author SHA1 Message Date
Kevin Chang
d2fa1e6baa Merge "Update the string of both magnification settings and gesture navigation tutorial dialog" into qt-dev 
am: 68aa4e4919

Change-Id: I183707f6b18a8755eefb2cbcceaa7627b0228a9c
 2019-06-03 18:41:08 -07:00
Kevin Chang
68aa4e4919 Merge "Update the string of both magnification settings and gesture navigation tutorial dialog" into qt-dev 2019-06-04 01:29:21 +00:00
Lucas Dupin
a1e19f1349 Merge "Longer character limit" into qt-r1-dev am: a448cb9d07 
am: 64dad09e02

Change-Id: I097a7cdffdbe10f2eea448a92da3b27e5205e522
 2019-06-03 16:12:24 -07:00
Lucas Dupin
64dad09e02 Merge "Longer character limit" into qt-r1-dev 
am: a448cb9d07

Change-Id: I18b0e68a7a0a7842e07f3c4cf067906ec1dc4763
 2019-06-03 16:04:59 -07:00
Lucas Dupin
4e7dd01d0e Longer character limit 
Fixes: 134370077
Fixes: 134162233
Test: make
Change-Id: I3f697a093752faca37c4dc165857c97a6b1e410c
 2019-06-03 11:33:50 -07:00
Kevin Chang
ba2bdbc93a Update the string of both magnification settings and gesture navigation tutorial dialog 
Referenced link for the details:
https://docs.google.com/document/d/1eB2wukextG5UFECTwde5zcmXXTQCvgnqJJjnd1Chu9Q
https://docs.google.com/document/d/14iwCag7FBD4e9bR03HjbC0D2s_u-Fpr3K8vl_XMjkD0

Bug: 133336814
Bug: 133650388
Test: Visual
Change-Id: I4893183b55f609bfee3d1dfe80aa02cce624e857
 2019-06-03 21:55:42 +08:00
Kevin Yao
4594c51be0 Fix typo for Accessibility permission dialog 
Bug: 133362697
Test: Visual
Change-Id: I9dfe9218c1b41cf02257bbfdbe3128f952a9a97c
 2019-05-31 21:08:37 +08:00
Joshua Mccloskey
be79914c4f Merge "String update." into qt-r1-dev am: b471e2439c 
am: 9b79a4c902

Change-Id: I310df214301362a841a37f8b8762a9bbae67d7d1
 2019-05-30 16:48:58 -07:00
Joshua Mccloskey
9b79a4c902 Merge "String update." into qt-r1-dev 
am: b471e2439c

Change-Id: I63a30632336f2df104440ed4e51c3d76d4f2aa9f
 2019-05-30 16:32:47 -07:00
Alex Salo
88e3adce68 Merge "Adds contextual cards for screen attention in Settings Homepage" into qt-r1-dev am: fa127bd6f7 
am: ac7851e1ce

Change-Id: Id621a398191568a76ed1e5bce00a63ad48a22f86
 2019-05-30 16:31:17 -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
e1ad225a51 Merge "Increase char limit to 60 for string translation" into qt-dev am: 178d4a7f8f am: 4937d4ca1f 
am: 97f5ab6fac

Change-Id: I634d14637d8d9be256b7efb85d63969cc1473eac
 2019-05-30 15:37:57 -07: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
Mehdi Alizadeh
5d77656d5d Merge "Increase char limit to 60 for string translation" into qt-dev 
am: 178d4a7f8f

Change-Id: Ia7882da10d3f323234267cbec3ea1136214fd974
 2019-05-30 15:14:15 -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
2adf1f213d Merge "Add SIM color picker" into qt-dev am: b747c5c270 am: c1c4a0858d 
am: 3ccc01ca18

Change-Id: I0e2c4d96df27e71d11b8a092f2cf86733d29727b
 2019-05-30 14:09:41 -07: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
02c4e123b7 Merge "Add SIM color picker" into qt-dev 
am: b747c5c270

Change-Id: Ib5f272280d1d23c70412c3112bfcfc432af181ed
 2019-05-30 13:26:55 -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
d5d76a95ec Merge "Add setting to bypass lock screen" into qt-r1-dev am: 0783505433 
am: a44a66f52a

Change-Id: I8164b1e3e6f32896710268d481b7fec593602fd3
 2019-05-30 00:06:11 -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
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
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
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
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