Android/packages_apps_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
52,595 Commits 1 Branch 0 Tags
69b35fe89664257d2fd4994e5d144d057326af70
Commit Graph

5565 Commits

Author SHA1 Message Date
Zhi An Ng
fd906c9bc2 Merge "Update strings used in SAW unsupported screen" into qt-dev am: ece299f902 
am: 9604713f49

Change-Id: Ic2ba3d2e49eedf6e21515a050fc88b007ede92df
 2019-05-09 20:34:58 -07:00
Zhi An Ng
9604713f49 Merge "Update strings used in SAW unsupported screen" into qt-dev 
am: ece299f902

Change-Id: Ib225bf12b6bbfdbe1c23d76a776df548082d0491
 2019-05-09 14:04:47 -07:00
Ng Zhi An
6940466b52 Update strings used in SAW unsupported screen 
Bug: 132183451
Test: adb shell am start-activity -a android.settings.action.MANAGE_OVERLAY_PERMISSION
Change-Id: Ia840b82838bed43234572c4a08bd56b97f391a5b
 2019-05-09 19:28:49 +00:00
Kevin Chyn
4908680470 Merge changes from topic "Face Intro Changes" into qt-dev am: 0f65b773be 
am: 82703baa9d

Change-Id: I3b2c9327aeadae1dba660e0bc9ed8d7470c2a50b
 2019-05-08 18:17:00 -07:00
Kevin Chyn
82703baa9d Merge changes from topic "Face Intro Changes" into qt-dev 
am: 0f65b773be

Change-Id: I3868316218a7c6cd22e495f8a497941ab7451fc1
 2019-05-08 17:08:01 -07:00
Kevin Chyn
0f65b773be Merge changes from topic "Face Intro Changes" into qt-dev 
* changes:
  Added Face Enroll Education Screen
  Updated Face Enroll Introduction
 2019-05-08 23:55:22 +00:00
Beth Thibodeau
dc3524d610 Merge "Increase char limit as requested by i18n team" into qt-dev am: 32e0172136 
am: 93ff7921d3

Change-Id: Iffdec5ab71f3326829454dcd122b964dbdce2d9b
 2019-05-08 15:17:02 -07:00
Beth Thibodeau
93ff7921d3 Merge "Increase char limit as requested by i18n team" into qt-dev 
am: 32e0172136

Change-Id: Iaefc001f39eaeddd1bbd698e7e36574bd03fc953
 2019-05-08 14:37:23 -07:00
joshmccloskey
0458262fb3 Added Face Enroll Education Screen 
Test: Builds
Bug: 131774352
Fixes: 131857742

Change-Id: Ib384b9efaf053b405ce3f55e449dd6abb9e75296
 2019-05-08 19:15:50 +00:00
Beth Thibodeau
4765faa9cf Increase char limit as requested by i18n team 
Fixes: 132257773
Test: mp settingsg

Change-Id: I4c5c21899bb9fa61f8f8b32cd56dc57288e282bd
 2019-05-08 15:05:55 -04:00
Aran Ink
6e858db304 Merge "Create Settings preference for Global Actions Panel." into qt-dev am: 70313a4600 
am: 6bf5b847f6

Change-Id: I9bcc36038553f37efe4925c901d5aeec3d9a84e9
 2019-05-08 07:40:11 -07:00
Aran Ink
6bf5b847f6 Merge "Create Settings preference for Global Actions Panel." into qt-dev 
am: 70313a4600

Change-Id: Ied8fd12055503411fcb8e33cb40e241668a8d567
 2019-05-08 07:35:13 -07:00
joshmccloskey
ac653b9838 Updated Face Enroll Introduction 
Test: Builds.
Bug: 131774204
Change-Id: Ibccd54185b9d8ffbfd2678be1c8680ffb1699425
 2019-05-07 15:28:14 -07:00
Aaron Heuckroth
2659c0f61b Create Settings preference for Global Actions Panel. 
Test: Automated tests pass.

Bug: 127295457
Change-Id: I6502d4c8541a3f279fb96d5f050f13890db8f376
 2019-05-07 16:27:59 -04:00
Kevin Chang
c5b6fda98c Merge "Change the string of Captions and reorder the feature in audio category" into qt-dev 
am: 4b7d48320c

Change-Id: I03e100ccfc9373e61d933ce948a49237f0e2fadc
 2019-05-06 21:11:22 -07:00
Kevin Chang
4b7d48320c Merge "Change the string of Captions and reorder the feature in audio category" into qt-dev 2019-05-07 03:47:51 +00:00
Julia Reynolds
448852d943 Merge "Gentle notifications screen" into qt-dev am: 21dbfce634 
am: dab05c6169

Change-Id: I2f2dde1e2d87b899cf5dd44411ae17c861b5ccf6
 2019-05-04 13:39:53 -07:00
Julia Reynolds
dab05c6169 Merge "Gentle notifications screen" into qt-dev 
am: 21dbfce634

Change-Id: Ia9544235000388615571f5c9f44263b0cd539b88
 2019-05-04 13:30:54 -07:00
Julia Reynolds
643eb7572f Gentle notifications screen 
With lockscreen and status bar settings

Test: robo tests
Bug: 128445911
Change-Id: I46c5943d4d8dc1ee74b5b920239f259f5880a2d3
 2019-05-04 14:59:53 +00:00
Kevin Chyn
b033e4ca52 Merge "Update face settings to match mocks" into qt-dev am: 27e0c844ae 
am: aa39e6a778

Change-Id: I93f166adb6f9a50bc968255ffb3e541424e4b256
 2019-05-03 19:22:09 -07:00
Lei Yu
991c51cb6b Merge "Update title for metered preference" into qt-dev am: 6e55084e19 
am: 18952e522d

Change-Id: Ie2d85c66e781aa6a07532cc8cc3aab2e39540daf
 2019-05-03 19:20:35 -07:00
cosmohsieh
27a26ed44b Merge "[PasspointV2] Fix lint error" into qt-dev am: 7cddfa8075 
am: d58b9b10b7

Change-Id: Ibb2d194132fe7019a67ae3046c09848376f2ccef
 2019-05-03 19:18:51 -07:00
Felipe Leme
2f5033a05d Merge "Changed Content Capture title." into qt-dev am: 78b74f434b 
am: 5ef6ee7301

Change-Id: Icffc3199a91b61261ab16520c8a518ee3c934d01
 2019-05-03 16:49:42 -07:00
Kevin Chyn
aa39e6a778 Merge "Update face settings to match mocks" into qt-dev 
am: 27e0c844ae

Change-Id: I46e533c8e0195ee0a9dcf4b308ea42f75b4ea2cf
 2019-05-03 11:55:20 -07:00
Lei Yu
18952e522d Merge "Update title for metered preference" into qt-dev 
am: 6e55084e19

Change-Id: Iccb7cd5b3de6c6c4702d9236446d556eafc0fb5c
 2019-05-03 11:52:40 -07:00
cosmohsieh
d58b9b10b7 Merge "[PasspointV2] Fix lint error" into qt-dev 
am: 7cddfa8075

Change-Id: If71b323bbc5e6be08df7a42b049bf2ea6b8f9a0c
 2019-05-03 11:49:47 -07:00
Felipe Leme
5ef6ee7301 Merge "Changed Content Capture title." into qt-dev 
am: 78b74f434b

Change-Id: Ic0e90e4cab6385299a0445cb4dfa993e1e076dbc
 2019-05-03 11:44:58 -07:00
Jason Chiu
31401ac044 Merge "Update strings for Vibration" into qt-dev am: 56b88886a0 
am: f742e5e0df

Change-Id: I7285141c445379ca38823b90eda672c3e28f3dc4
 2019-05-03 08:41:36 -07:00
Jason Chiu
f742e5e0df Merge "Update strings for Vibration" into qt-dev 
am: 56b88886a0

Change-Id: I82263ff13a7d73b962953e9629e6c014bc6b00d1
 2019-05-03 08:33:04 -07:00
Lei Yu
5efc949f49 Merge "Update dialog text for untethered BT device" into qt-dev am: 76a3e5bfac 
am: 1b995f2a4c

Change-Id: Id99385b551bfd96bfea4d92ce6b66d3af2f0c416
 2019-05-03 08:11:20 -07:00
Lei Yu
1b995f2a4c Merge "Update dialog text for untethered BT device" into qt-dev 
am: 76a3e5bfac

Change-Id: I2684fe796d8da2ef4148de495a136815d8059032
 2019-05-03 08:03:50 -07:00
Michael Wachenschwanz
a759f72127 Merge "Simplify user flow for setting default supervisor as PO" into qt-dev am: 563b56af75 
am: 57177733d4

Change-Id: Ic60f453acd6741f5af79ce3f0ceb1ddd68a04e51
 2019-05-03 03:57:57 -07:00
Michael Wachenschwanz
57177733d4 Merge "Simplify user flow for setting default supervisor as PO" into qt-dev 
am: 563b56af75

Change-Id: I33c49b2aa091d8f97ff0f209903d5a0cdbfda877
 2019-05-03 03:35:00 -07:00
Pasty Chang
621a40a9ff Merge "Update sub-text in skip lock screen dialog" into qt-dev am: 91acd50ef2 
am: f2d6143474

Change-Id: I6dae20b61a2152563eaa01bab41a2136bda08bbb
 2019-05-02 21:27:51 -07:00
Beth Thibodeau
89dfa94447 Merge "Adding strings for themepicker suggestion" into qt-dev am: 3562a41a42 
am: 2226ae4144

Change-Id: I74d2eed2c14d27db390971b71536bc65a3b57c1f
 2019-05-02 21:17:35 -07:00
Pasty Chang
f2d6143474 Merge "Update sub-text in skip lock screen dialog" into qt-dev 
am: 91acd50ef2

Change-Id: Ic5cb3f4c1d1fdab865e7ca3ec73c4018ace22f33
 2019-05-02 20:22:02 -07:00
Kevin Chyn
27e0c844ae Merge "Update face settings to match mocks" into qt-dev 2019-05-03 03:21:58 +00:00
Beth Thibodeau
2226ae4144 Merge "Adding strings for themepicker suggestion" into qt-dev 
am: 3562a41a42

Change-Id: Idd80aa31b9498f8458406e5aa854bd0a1135d17c
 2019-05-02 20:21:15 -07:00
TreeHugger Robot
6e55084e19 Merge "Update title for metered preference" into qt-dev 2019-05-03 01:52:56 +00:00
Kevin Chyn
0c4bf9b2bc Update face settings to match mocks 
Test: Builds

Fixes: 131660440
Change-Id: Ie75b67428be1e0504e3121bccb68f61e1fdbdb44
 2019-05-02 16:59:12 -07:00
TreeHugger Robot
7cddfa8075 Merge "[PasspointV2] Fix lint error" into qt-dev 2019-05-02 23:52:35 +00:00
Lei Yu
06a309cf1c Update title for metered preference 
Fixes: 111859056
Test: Manual
Change-Id: I7cecb6fee3963607e33a8fd24d53e98c209f1495
 2019-05-02 16:09:18 -07:00
Felipe Leme
78b74f434b Merge "Changed Content Capture title." into qt-dev 2019-05-02 21:51:02 +00:00
TreeHugger Robot
56b88886a0 Merge "Update strings for Vibration" into qt-dev 2019-05-02 19:18:36 +00:00
Lei Yu
76a3e5bfac Merge "Update dialog text for untethered BT device" into qt-dev 2019-05-02 17:18:04 +00:00
Felipe Leme
f580032ada Changed Content Capture title. 
Fixes: 131169650
Test: m SettingsGoogle && adb sync && adb shell kill `pid com.android.settings` && \
      adb shell am start-activity -a android.settings.REQUEST_ENABLE_CONTENT_CAPTURE

Change-Id: I63a032a27f40e9f413121ba6cd5fc4b2e10da637
 2019-05-02 09:07:54 -07:00
Michael Wachenschwanz
563b56af75 Merge "Simplify user flow for setting default supervisor as PO" into qt-dev 2019-05-02 14:35:20 +00:00
Pasty Chang
91acd50ef2 Merge "Update sub-text in skip lock screen dialog" into qt-dev 2019-05-02 14:15:36 +00:00
Beth Thibodeau
3562a41a42 Merge "Adding strings for themepicker suggestion" into qt-dev 2019-05-02 12:29:15 +00:00
Jason Chiu
1789d9ee6a Update strings for Vibration 
Fixes: 131345468
Test: visual
Change-Id: I7670ba96cf9b66e241a0003800a30c00f2585fc9
 2019-05-02 18:28:42 +08:00