Android/packages_apps_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
78,733 Commits 1 Branch 0 Tags
cf178bd57b05acb6bde607c00f42c70766b528d5
Commit Graph

78733 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
TreeHugger Robot
cf178bd57b [automerger skipped] Merge "RESTRICT AUTOMERGE Fix phishing attacks over Bluetooth due to unclear warning message" into pi-dev am: 1a6a1b12ef -s ours am: c5f7e582b4 am: 5bd40911f5 -s ours am: 6bae86bec6 am: 7ff97d7703 am: 17fd90a341 am: 0dd34e2c31 -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13276367

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ia406b5fc64256c6657f996bbe9e176d1b1065771
 2021-01-07 18:55:30 +00:00
Hugh Chen
daeb680c44 [automerger skipped] RESTRICT AUTOMERGE Update String am: 085f70d48d am: 4b22b601f7 am: 26623c9572 am: cb79c659b5 -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13275411

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ia93bc51daa8881b24b9deb4c66ae5bc2a5c024c0
 2021-01-07 18:55:22 +00:00
Hugh Chen
b6e7632fc5 [automerger skipped] DO NOT MERGE: resolve merge conflicts of c17ec818af to rvc-qpr-dev am: dc2b694a54 -s ours am: 9d153e6331 -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13278059

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I509b0b17ff15db95e2a89b7578df24521008d14e
 2021-01-07 18:55:14 +00:00
TreeHugger Robot
0dd34e2c31 [automerger skipped] Merge "RESTRICT AUTOMERGE Fix phishing attacks over Bluetooth due to unclear warning message" into pi-dev am: 1a6a1b12ef -s ours am: c5f7e582b4 am: 5bd40911f5 -s ours am: 6bae86bec6 am: 7ff97d7703 am: 17fd90a341 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13276367

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I82d2b0993fcd5c12491f43453cbb94479caf911f
 2021-01-07 18:31:23 +00:00
Hugh Chen
cb79c659b5 RESTRICT AUTOMERGE Update String am: 085f70d48d am: 4b22b601f7 am: 26623c9572 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13275411

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I84520568c24220945c1ce226bafb82f7a40367af
 2021-01-07 18:31:16 +00:00
Hugh Chen
9d153e6331 [automerger skipped] DO NOT MERGE: resolve merge conflicts of c17ec818af to rvc-qpr-dev am: dc2b694a54 -s ours 
am skip reason: Change-Id Iec4d1963e626829b696c2047c5979a684119acf7 with SHA-1 18c06480b0 is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13278059

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I7b45cbf704ffd1558b681a4835bc628dcc132894
 2021-01-07 18:31:10 +00:00
TreeHugger Robot
17fd90a341 [automerger skipped] Merge "RESTRICT AUTOMERGE Fix phishing attacks over Bluetooth due to unclear warning message" into pi-dev am: 1a6a1b12ef -s ours am: c5f7e582b4 am: 5bd40911f5 -s ours am: 6bae86bec6 am: 7ff97d7703 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13276367

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I5217c3e1ba592879564a6934c69fa951f91d6544
 2021-01-07 17:59:16 +00:00
Hugh Chen
26623c9572 RESTRICT AUTOMERGE Update String am: 085f70d48d am: 4b22b601f7 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13275411

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I1d34d26cddbca6559164cbaef2aab5dfc6fd035d
 2021-01-07 17:59:08 +00:00
TreeHugger Robot
0fd2a2008a Merge "Move Settings preferenceCategory style into SettingsTheme" 2021-01-07 11:20:37 +00:00
TreeHugger Robot
12a5868126 Merge "Only show the schedule text for the night display and dark theme" 2021-01-07 10:30:46 +00:00
TreeHugger Robot
6cf77c6f88 Merge "Add the mutability flag for SettingsSliceProvider" 2021-01-07 10:28:23 +00:00
TreeHugger Robot
617d581f9b Merge changes Ib9a3c4fa,Idc6ef558 into qt-dev am: c0cd669bef am: af29a157db am: 0b9260031d am: a294dac526 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13275409

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I8cf49da12694d8aa84ee72b6712539a0142610a8
 2021-01-07 09:32:13 +00:00
Hugh Chen
6ac784dcfd [automerger skipped] RESTRICT AUTOMERGE Update String am: 19aeca103d am: 5108e1bd83 -s ours am: 13a927cb9c am: 5a01cc4489 -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13275409

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ida50335a531f3597749292e621338fe44e284b9b
 2021-01-07 09:32:11 +00:00
TreeHugger Robot
a294dac526 Merge changes Ib9a3c4fa,Idc6ef558 into qt-dev am: c0cd669bef am: af29a157db am: 0b9260031d 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13275409

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I0bee116fd12d811e2e3f9ecb181530199605f8b0
 2021-01-07 08:35:39 +00:00
Hugh Chen
5a01cc4489 [automerger skipped] RESTRICT AUTOMERGE Update String am: 19aeca103d am: 5108e1bd83 -s ours am: 13a927cb9c 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13275409

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I81992f44a83997ab81cc52749f61ed64b5dca98a
 2021-01-07 08:35:38 +00:00
TreeHugger Robot
5f5c7539bb Merge "Add toggle for auto brightness feature" 2021-01-07 08:35:02 +00:00
TreeHugger Robot
0b9260031d Merge changes Ib9a3c4fa,Idc6ef558 into qt-dev am: c0cd669bef am: af29a157db 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13275409

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I5baf77f1f44a4bcc5c6f6632c3658a1777f5af17
 2021-01-07 08:19:36 +00:00
Hugh Chen
13a927cb9c [automerger skipped] RESTRICT AUTOMERGE Update String am: 19aeca103d am: 5108e1bd83 -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13275409

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: If6926664e21281b3f9567e430b62837ae09c02cd
 2021-01-07 08:19:34 +00:00
Tsung-Mao Fang
acab1a0364 Only show the schedule text for the night display and dark theme 
In Android S design, night display and dark theme only show
schedule text for summary.

- Rmove redundant string resource.
- Remove redundant method in night display formatter.
- Refactor the code in dark mode preference and night display
controller.

Test: See the correct behavior in screen.
Fix: 174964139
Change-Id: I658b3073a0a6ed83f589103999c711e5430eaeb7
 2021-01-07 16:17:20 +08:00
TreeHugger Robot
af29a157db Merge changes Ib9a3c4fa,Idc6ef558 into qt-dev am: c0cd669bef 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13275409

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Iaf935ec22f8f61936be068b4771af406ae56599b
 2021-01-07 08:05:54 +00:00
Hugh Chen
5108e1bd83 RESTRICT AUTOMERGE Update String am: 19aeca103d 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13275409

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I0e4b9032a22e5306c5e10ff54f75dd4739199605
 2021-01-07 08:05:52 +00:00
Yi-Ling Chuang
843616eb69 Add the mutability flag for SettingsSliceProvider 
Starting Android S, all PendingIntent should have the mutability flag
assigned to prevent from vulnerability.

Fixes: 172811605
Fixes: 172206649
Test: 1. Play on the slices in Settings search.
2. Make a permission request intent of Settings wifi slice in the
slice-viewer app, clicking on it and make sure it gets redirect to
Settings without crashes.

Change-Id: I86f915bc062a6e632b5ca9c74e232db1036f08de
 2021-01-07 16:00:08 +08:00
TreeHugger Robot
c0cd669bef Merge changes Ib9a3c4fa,Idc6ef558 into qt-dev 
* changes:
  RESTRICT AUTOMERGE Update String
  RESTRICT AUTOMERGE Fix phishing attacks over Bluetooth due to unclear warning message
 2021-01-07 07:22:54 +00:00
Tsung-Mao Fang
d159567fc4 Add toggle for auto brightness feature 
- Use the primary toggle preference.
- Remove the empty subtext.

Test: See toggle preference on auto brightness feature
Bug: 174964139
Change-Id: Ic5105730c7a2075d61cdde42395e41712bb468a7
 2021-01-07 15:09:31 +08:00
Hugh Chen
dc2b694a54 DO NOT MERGE: resolve merge conflicts of c17ec818af to rvc-qpr-dev 
Bug: 167403112
Test: send intent to test right prompts message is pop up. make -j42 RunSettingsRoboTests
Change-Id: Iec4d1963e626829b696c2047c5979a684119acf7
Merged-In: Iec4d1963e626829b696c2047c5979a684119acf7
 2021-01-07 06:03:10 +00:00
Hugh Chen
aaf2ad7738 [automerger skipped] DO NOT MERGE: resolve merge conflicts of c17ec818af to rvc-qpr-dev am: 18c06480b0 -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13294249

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ic6e7de3bd526b0419f6fc1513bbc040e44982b0d
 2021-01-07 05:18:27 +00:00
Hugh Chen
50ab9ab26a [automerger skipped] RESTRICT AUTOMERGE Update String am: 48ec74592d -s ours am: 57358903b3 -s ours am: 77d2c798e5 am: 84f9417fa2 -s ours am: fc0292dc19 am: 8cdb990020 -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13275407

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ic24199051178b3fcc0e495b94227e3d60ab7b0c1
 2021-01-07 03:59:09 +00:00
Hugh Chen
8f463185c5 [automerger skipped] RESTRICT AUTOMERGE Fix phishing attacks over Bluetooth due to unclear warning message am: 9037e43fa8 -s ours am: d6bc0a328f -s ours am: 5036eee733 am: 535f5ba053 -s ours am: d62def70c7 am: 81ec3d158d -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13275406

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Iff9bf9ac88cb673abd5c8d723fca7dfd28a7f6c8
 2021-01-07 03:59:08 +00:00
TreeHugger Robot
17afd98228 [automerger skipped] Merge "RESTRICT AUTOMERGE Fix phishing attacks over Bluetooth due to unclear warning message" into pi-dev am: 1a6a1b12ef -s ours am: c5f7e582b4 am: 5bd40911f5 -s ours am: 6bae86bec6 am: f6277c3e3a -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13276367

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I958515c65c9340b72109997a13d0e47a96e7225c
 2021-01-07 03:58:55 +00:00
Hugh Chen
18c06480b0 DO NOT MERGE: resolve merge conflicts of c17ec818af to rvc-qpr-dev 
Bug: 167403112
Test: send intent to test right prompts message is pop up. make -j42 RunSettingsRoboTests
Change-Id: Iec4d1963e626829b696c2047c5979a684119acf7
Merged-In: Idc6ef558b692115bb82ea58cf223f5919b618633
 2021-01-07 11:54:30 +08:00
Hugh Chen
8cdb990020 [automerger skipped] RESTRICT AUTOMERGE Update String am: 48ec74592d -s ours am: 57358903b3 -s ours am: 77d2c798e5 am: 84f9417fa2 -s ours am: fc0292dc19 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13275407

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I494046bd04f391b0f5d3859bc40af69e73af330a
 2021-01-07 03:23:32 +00:00
Hugh Chen
81ec3d158d [automerger skipped] RESTRICT AUTOMERGE Fix phishing attacks over Bluetooth due to unclear warning message am: 9037e43fa8 -s ours am: d6bc0a328f -s ours am: 5036eee733 am: 535f5ba053 -s ours am: d62def70c7 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13275406

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I16fddbd3bf1edb8f99b0b688dbeb0b0b8c5b3923
 2021-01-07 03:23:31 +00:00
TreeHugger Robot
f6277c3e3a [automerger skipped] Merge "RESTRICT AUTOMERGE Fix phishing attacks over Bluetooth due to unclear warning message" into pi-dev am: 1a6a1b12ef -s ours am: c5f7e582b4 am: 5bd40911f5 -s ours am: 6bae86bec6 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13276367

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I628383fcd3cd23d8a0de79e7024ca8ee9fa68272
 2021-01-07 03:23:19 +00:00
TreeHugger Robot
7ff97d7703 [automerger skipped] Merge "RESTRICT AUTOMERGE Fix phishing attacks over Bluetooth due to unclear warning message" into pi-dev am: 1a6a1b12ef -s ours am: c5f7e582b4 am: 5bd40911f5 -s ours am: 6bae86bec6 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13276367

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ic95f4362c186a2aa00edfe54391b44cd37574fbf
 2021-01-07 03:22:46 +00:00
Hugh Chen
fc0292dc19 [automerger skipped] RESTRICT AUTOMERGE Update String am: 48ec74592d -s ours am: 57358903b3 -s ours am: 77d2c798e5 am: 84f9417fa2 -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13275407

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I3dafec35dab7457e6301017b49cd9b3b92491869
 2021-01-07 02:40:55 +00:00
Hugh Chen
d62def70c7 [automerger skipped] RESTRICT AUTOMERGE Fix phishing attacks over Bluetooth due to unclear warning message am: 9037e43fa8 -s ours am: d6bc0a328f -s ours am: 5036eee733 am: 535f5ba053 -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13275406

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I5e04a58a35ea2c11731a8ec2e8661080e28ccd77
 2021-01-07 02:40:54 +00:00
TreeHugger Robot
6bae86bec6 [automerger skipped] Merge "RESTRICT AUTOMERGE Fix phishing attacks over Bluetooth due to unclear warning message" into pi-dev am: 1a6a1b12ef -s ours am: c5f7e582b4 am: 5bd40911f5 -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13276367

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I1180cd764b23ee4687e353777c68be177c2b71aa
 2021-01-07 02:40:47 +00:00
Hugh Chen
84f9417fa2 [automerger skipped] RESTRICT AUTOMERGE Update String am: 48ec74592d -s ours am: 57358903b3 -s ours am: 77d2c798e5 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13275407

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I237872bf9d2d67b2da1087ebedd0c753b00bcfd2
 2021-01-07 02:16:44 +00:00
Hugh Chen
535f5ba053 [automerger skipped] RESTRICT AUTOMERGE Fix phishing attacks over Bluetooth due to unclear warning message am: 9037e43fa8 -s ours am: d6bc0a328f -s ours am: 5036eee733 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13275406

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I872358cea725ef692d6193a6d09eca966ecc3e8d
 2021-01-07 02:16:43 +00:00
TreeHugger Robot
5bd40911f5 [automerger skipped] Merge "RESTRICT AUTOMERGE Fix phishing attacks over Bluetooth due to unclear warning message" into pi-dev am: 1a6a1b12ef -s ours am: c5f7e582b4 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13276367

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ieb64d2ddbcf8659ff32029b93a266e89ed04cde5
 2021-01-07 02:16:37 +00:00
Hugh Chen
77d2c798e5 [automerger skipped] RESTRICT AUTOMERGE Update String am: 48ec74592d -s ours am: 57358903b3 -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13275407

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I8d018bfd516557b7a643842a1538e59053f1706e
 2021-01-07 01:56:51 +00:00
Hugh Chen
5036eee733 [automerger skipped] RESTRICT AUTOMERGE Fix phishing attacks over Bluetooth due to unclear warning message am: 9037e43fa8 -s ours am: d6bc0a328f -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13275406

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Iec4bc73ee0fd32c31d67f8bb5fef7b1c1e31e32c
 2021-01-07 01:56:50 +00:00
TreeHugger Robot
c5f7e582b4 [automerger skipped] Merge "RESTRICT AUTOMERGE Fix phishing attacks over Bluetooth due to unclear warning message" into pi-dev am: 1a6a1b12ef -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13276367

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: If4601e6a2be1265e01baea5e73f34d7989d6fcad
 2021-01-07 01:56:43 +00:00
Hugh Chen
57358903b3 [automerger skipped] RESTRICT AUTOMERGE Update String am: 48ec74592d -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13275407

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I94614a9cac3555ec44d6cfef6e7af4a6b24f6272
 2021-01-07 01:55:50 +00:00
Hugh Chen
d6bc0a328f [automerger skipped] RESTRICT AUTOMERGE Fix phishing attacks over Bluetooth due to unclear warning message am: 9037e43fa8 -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13275406

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I0e109407102ce058e806f3a239882dc8abaa36a7
 2021-01-07 01:55:49 +00:00
Ben Chung
cfedc19ab9 Merge "Accessibility settings display category restructure, add text and display fragment for related accessibility services." 2021-01-07 01:28:17 +00:00
TreeHugger Robot
1a6a1b12ef Merge "RESTRICT AUTOMERGE Fix phishing attacks over Bluetooth due to unclear warning message" into pi-dev 2021-01-07 01:27:50 +00:00
Steven Liu
7f05bd4dfc Merge "Introduce a WifiTrackerLibProvider." 2021-01-07 00:58:49 +00:00
Hugh Chen
52fc02b96c [automerger skipped] RESTRICT AUTOMERGE Update String am: 085f70d48d am: c148c76b20 -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13275411

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I2c9629244c8fdfa5e69932a78acb252ae9add4bb
 2021-01-07 00:19:09 +00:00
Hugh Chen
7632d248f8 [automerger skipped] RESTRICT AUTOMERGE Fix phishing attacks over Bluetooth due to unclear warning message am: 8ecca02ece am: bac6aab059 -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13275410

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ibb46ed89a1dc98e18cd735880d45654959a879c3
 2021-01-07 00:18:59 +00:00