Android/packages_apps_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
59,190 Commits 1 Branch 0 Tags
2a7c07c66a47c8438c0c15ed5647e62afd7e218e
Commit Graph

59190 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Automerger Merge Worker
2a7c07c66a [automerger skipped] Merge "Merge "Guard NPE in getAvailabilityStatus of InstantAppDomainsPreferenceController" into rvc-dev am: bdf85c224b am: 43032a4a28" into rvc-d1-dev-plus-aosp am: 2ec6c2616b -s ours am: 47641103b4 -s ours 
am skip reason: Change-Id I7501ef393e226bb38c72a1ee465bf9c72586716b with SHA-1 c56ce8d647 is in history

Change-Id: Iacc1a2c8865aec0c49010712d120307a1e913098
 2020-02-24 10:55:07 +00:00
Automerger Merge Worker
dd8ec491d1 [automerger skipped] Merge "Merge "Guard NPE in getAvailabilityStatus of InstantAppDomainsPreferenceController" into rvc-dev am: bdf85c224b am: 0f8726124d am: 04f0c00637" into rvc-qpr-dev-plus-aosp am: 1d47969b82 -s ours 
am skip reason: Change-Id I7501ef393e226bb38c72a1ee465bf9c72586716b with SHA-1 c56ce8d647 is in history

Change-Id: Iea984eb8295f62cada88ac418b3d582f95038b07
 2020-02-24 10:55:00 +00:00
Automerger Merge Worker
83b8a13443 [automerger skipped] Merge "Merge "Guard NPE in getAvailabilityStatus of InstantAppDomainsPreferenceController" into rvc-dev am: bdf85c224b am: 0f8726124d am: 8590506c57" into rvc-qpr-dev-plus-aosp am: e1436695ef -s ours 
am skip reason: Change-Id I7501ef393e226bb38c72a1ee465bf9c72586716b with SHA-1 c0543e833f is in history

Change-Id: Ie38369ce039cb043e4d3028c34ed39e0020fa5a5
 2020-02-24 10:54:54 +00:00
Automerger Merge Worker
32b9dfcc44 [automerger skipped] Bluetooth device slice improvement am: 05f5b8e7c4 am: a1dad7246d -s ours am: 3e09f3eecb -s ours am: 35c33f02c1 -s ours 
am skip reason: Change-Id I47e9c47b2ab0adacdbdbde34522d7c0172adda75 with SHA-1 05f5b8e7c4 is in history

Change-Id: I74fddf893481d5c7a816c99c1cf0b1e33b554cc9
 2020-02-24 10:54:46 +00:00
Automerger Merge Worker
07c88bcc71 [automerger skipped] Bluetooth device slice improvement am: 05f5b8e7c4 am: 545c9009b0 am: 555d2019d0 am: e4dabac705 -s ours 
am skip reason: Change-Id I47e9c47b2ab0adacdbdbde34522d7c0172adda75 with SHA-1 05f5b8e7c4 is in history

Change-Id: I2236b1b3c01f74a5dbf274e75319220476ee71cd
 2020-02-24 10:54:35 +00:00
Automerger Merge Worker
309273a638 [automerger skipped] Bluetooth device slice improvement am: 05f5b8e7c4 am: 545c9009b0 am: 5ad696881f am: c76464421e -s ours 
am skip reason: Change-Id I47e9c47b2ab0adacdbdbde34522d7c0172adda75 with SHA-1 5e462a852b is in history

Change-Id: Ife90ce6e306cedb149251ff832440b41b10188db
 2020-02-24 10:54:18 +00:00
Automerger Merge Worker
47641103b4 [automerger skipped] Merge "Merge "Guard NPE in getAvailabilityStatus of InstantAppDomainsPreferenceController" into rvc-dev am: bdf85c224b am: 43032a4a28" into rvc-d1-dev-plus-aosp am: 2ec6c2616b -s ours 
am skip reason: Change-Id I7501ef393e226bb38c72a1ee465bf9c72586716b with SHA-1 c56ce8d647 is in history

Change-Id: I55bfd417b4ec71bfa038b9d290b41c1542ec9964
 2020-02-24 10:34:01 +00:00
Automerger Merge Worker
1d47969b82 Merge "Merge "Guard NPE in getAvailabilityStatus of InstantAppDomainsPreferenceController" into rvc-dev am: bdf85c224b am: 0f8726124d am: 04f0c00637" into rvc-qpr-dev-plus-aosp 2020-02-24 10:33:58 +00:00
Automerger Merge Worker
e1436695ef Merge "Merge "Guard NPE in getAvailabilityStatus of InstantAppDomainsPreferenceController" into rvc-dev am: bdf85c224b am: 0f8726124d am: 8590506c57" into rvc-qpr-dev-plus-aosp 2020-02-24 10:33:55 +00:00
Automerger Merge Worker
821bc58706 Merge "Guard NPE in getAvailabilityStatus of InstantAppDomainsPreferenceController" into rvc-dev am: bdf85c224b am: 0f8726124d am: 04f0c00637 
Change-Id: I44974e8c1a394b285fab10b7e31159de00ce2b02
 2020-02-24 10:33:54 +00:00
Automerger Merge Worker
221fce2443 Merge "Guard NPE in getAvailabilityStatus of InstantAppDomainsPreferenceController" into rvc-dev am: bdf85c224b am: 0f8726124d am: 8590506c57 
Change-Id: I447ac5ec7d637d27cf9c1fae34e985fd872c8a74
 2020-02-24 10:33:51 +00:00
Automerger Merge Worker
35c33f02c1 [automerger skipped] Bluetooth device slice improvement am: 05f5b8e7c4 am: a1dad7246d -s ours am: 3e09f3eecb -s ours 
am skip reason: Change-Id I47e9c47b2ab0adacdbdbde34522d7c0172adda75 with SHA-1 05f5b8e7c4 is in history

Change-Id: I578811b1bff19754f63de9bb1b8fe202b914168a
 2020-02-24 10:33:48 +00:00
Automerger Merge Worker
e4dabac705 Bluetooth device slice improvement am: 05f5b8e7c4 am: 545c9009b0 am: 555d2019d0 
Change-Id: I3a0780a3dd8ad1f1ba6121117e870639842cb1bd
 2020-02-24 10:33:37 +00:00
Automerger Merge Worker
c76464421e Bluetooth device slice improvement am: 05f5b8e7c4 am: 545c9009b0 am: 5ad696881f 
Change-Id: I0fc6b94fe9a1af938ab178fb36fa9d18273ebd71
 2020-02-24 10:33:31 +00:00
Automerger Merge Worker
2ec6c2616b Merge "Merge "Guard NPE in getAvailabilityStatus of InstantAppDomainsPreferenceController" into rvc-dev am: bdf85c224b am: 43032a4a28" into rvc-d1-dev-plus-aosp 2020-02-24 10:21:47 +00:00
Automerger Merge Worker
8590506c57 Merge "Guard NPE in getAvailabilityStatus of InstantAppDomainsPreferenceController" into rvc-dev am: bdf85c224b am: 0f8726124d 
Change-Id: I9248812c45717a9391e2a886b74af5c651234cd7
 2020-02-24 10:21:47 +00:00
Automerger Merge Worker
3aaa1ed859 Merge "Guard NPE in getAvailabilityStatus of InstantAppDomainsPreferenceController" into rvc-dev am: bdf85c224b am: 43032a4a28 
Change-Id: I37d0c5f7a89b898fe918bb54fea243802eb48dc1
 2020-02-24 10:21:44 +00:00
Automerger Merge Worker
04f0c00637 Merge "Guard NPE in getAvailabilityStatus of InstantAppDomainsPreferenceController" into rvc-dev am: bdf85c224b am: 0f8726124d 
Change-Id: I33fcd9e6e363c56318aff9f400dffeec6a0576c8
 2020-02-24 10:21:41 +00:00
Automerger Merge Worker
555d2019d0 Bluetooth device slice improvement am: 05f5b8e7c4 am: 545c9009b0 
Change-Id: I98b84a4c485dfda5fb92ffee7ff666be7f843803
 2020-02-24 10:21:41 +00:00
Automerger Merge Worker
3e09f3eecb [automerger skipped] Bluetooth device slice improvement am: 05f5b8e7c4 am: a1dad7246d -s ours 
am skip reason: Change-Id I47e9c47b2ab0adacdbdbde34522d7c0172adda75 with SHA-1 05f5b8e7c4 is in history

Change-Id: I501751f9a7c645da090086ebc94341fd0ea0a821
 2020-02-24 10:21:34 +00:00
Automerger Merge Worker
5ad696881f Bluetooth device slice improvement am: 05f5b8e7c4 am: 545c9009b0 
Change-Id: Ic0931466231b2068f5eb495204cf78ba88eb72bb
 2020-02-24 10:21:28 +00:00
Automerger Merge Worker
43032a4a28 Merge "Guard NPE in getAvailabilityStatus of InstantAppDomainsPreferenceController" into rvc-dev am: bdf85c224b 
Change-Id: Ie079b5f6cb03b0d9dad956def4f1c109bddecb10
 2020-02-24 10:08:02 +00:00
Automerger Merge Worker
0f8726124d Merge "Guard NPE in getAvailabilityStatus of InstantAppDomainsPreferenceController" into rvc-dev am: bdf85c224b 
Change-Id: I231979a8624ea9c06d896baeeb112a8add86e5cb
 2020-02-24 10:08:01 +00:00
Automerger Merge Worker
a1dad7246d Bluetooth device slice improvement am: 05f5b8e7c4 
Change-Id: Ie82b6e8aacbc92b3e664f488d960b64774898738
 2020-02-24 10:07:52 +00:00
Automerger Merge Worker
545c9009b0 Bluetooth device slice improvement am: 05f5b8e7c4 
Change-Id: I50406bfcc898110679d99931293553c82eebe5fb
 2020-02-24 10:07:35 +00:00
TreeHugger Robot
bdf85c224b Merge "Guard NPE in getAvailabilityStatus of InstantAppDomainsPreferenceController" into rvc-dev 2020-02-24 10:03:53 +00:00
Shafik Nassar
651e4b32fc Merge "Use AppOpsManager#setUidMode instead of #setMode" 2020-02-24 09:25:02 +00:00
Jean Chen
ad2dc2b361 Merge "Support caption second UI structure (5/n)" 2020-02-24 07:48:13 +00:00
Jason Chiu
c56ce8d647 Guard NPE in getAvailabilityStatus of InstantAppDomainsPreferenceController 
Fixes: 149373695
Test: build, manual
Change-Id: I7501ef393e226bb38c72a1ee465bf9c72586716b
Merged-In: I7501ef393e226bb38c72a1ee465bf9c72586716b
(cherry picked from commit c0543e833f)
 2020-02-24 06:19:11 +00:00
Jason Chiu
05f5b8e7c4 Bluetooth device slice improvement 
- remove "Pair new device" row
- change the on/off toggle to a plus button for pairing new device
- roll back the title "Bluetooth devices"

Bug: 149667096
Test: robotest
Change-Id: I47e9c47b2ab0adacdbdbde34522d7c0172adda75
Merged-In: I47e9c47b2ab0adacdbdbde34522d7c0172adda75
(cherry picked from commit 5e462a852b)
 2020-02-24 06:16:18 +00:00
TreeHugger Robot
84812f661b Merge "Bluetooth device slice improvement" 2020-02-24 06:14:59 +00:00
Bill Yi
df165c89cd Import translations. DO NOT MERGE 
Change-Id: I81552c6425986bf672fabd8a6c8218dcb53c0358
Auto-generated-cl: translation import
 2020-02-22 18:31:56 -08:00
TreeHugger Robot
7fcdb3e5b8 Merge "Set ClearDefaultsPreference as unselectable for talkback" 2020-02-22 13:33:51 +00:00
TreeHugger Robot
a43c90c64a Merge "Keep contextual card dismissal info upon deletion" 2020-02-22 12:49:40 +00:00
TreeHugger Robot
2f011c4246 Merge "Support autoclick secondary action (8/n)" 2020-02-22 10:28:40 +00:00
TreeHugger Robot
8e379934c5 Merge "Guard NPE in getAvailabilityStatus of InstantAppDomainsPreferenceController" 2020-02-22 10:24:51 +00:00
PETER LIANG
237491d6a3 Merge "Fine-tune the widget of "Allow rich content in Accessibility Settings" for security." 2020-02-22 03:00:43 +00:00
Winson Chung
34fdec2668 Merge "Updating call to set icon on task description" 2020-02-21 22:59:45 +00:00
Automerger Merge Worker
4e2ba8f7b3 [automerger skipped] Merge "Rename references to getLteOnCdmaMode" am: 7c849787ee am: 63da73532d am: 9a49dd2bc4 -s ours 
am skip reason: Change-Id Ie1b01a97cf163d68e4a5529f1718a9a782d44bb0 with SHA-1 de616afce0 is in history

Change-Id: If7c8de95366319c47d6c5d4840c5d6d93021e221
 2020-02-21 22:54:23 +00:00
Automerger Merge Worker
9a49dd2bc4 Merge "Rename references to getLteOnCdmaMode" am: 7c849787ee am: 63da73532d 
Change-Id: I7b32dea30b97fc1389054eb93b9dc160a1c88d3c
 2020-02-21 22:41:37 +00:00
Automerger Merge Worker
63da73532d Merge "Rename references to getLteOnCdmaMode" am: 7c849787ee 
Change-Id: I16b31595e00e501c6c097ef3e4ad78f3fb0f9b75
 2020-02-21 22:23:21 +00:00
Blake Kragten
8eb6c9ae9f Merge "Enhanced Connectivity Dev Toggle" 2020-02-21 22:14:25 +00:00
Sarah Chin
7c849787ee Merge "Rename references to getLteOnCdmaMode" 2020-02-21 22:09:16 +00:00
Peter_Liang
10bc375176 Fine-tune the widget of "Allow rich content in Accessibility Settings" for security. 
1. Remove tag checker in HtmlTextPreference.
2. Set the max height for AnimatedImagePreference.

Bug: 149516547
Test: manaul test
Change-Id: I98f49d055db9427d91a3f1ca816e94a11d29cd3d
 2020-02-21 21:35:29 +00:00
shafik
ac8aba0c4a Use AppOpsManager#setUidMode instead of #setMode 
Security related app-ops should be set with AppOpsManager#setUidMode
instead of AppOpsManager#setMode.

Test: manual - toggle All Files Access for a test app, reboot device and
observe in /data/system/appops.xml that the mode was for UID instead of
package
Test: ensure that the right state is reflected in the relevant Settings
activities

Change-Id: I261953ff88bc049cf0a2f04f8caac00b8cc6f704
 2020-02-21 19:33:17 +00:00
Automerger Merge Worker
ee1dacb338 [automerger skipped] Merge "[adb-wireless] Add Wireless Debugging Switch in Developer options." am: 317c9dc2ca am: fd2e26d4aa am: 44f654fe43 -s ours 
am skip reason: Change-Id I188badb43035172642cf235bb27e56d3a1dea169 with SHA-1 85a65e2dc6 is in history

Change-Id: I522ee7e1b07c0ab77f0cf230d1508e0bf9e479dc
 2020-02-21 17:27:59 +00:00
Automerger Merge Worker
44f654fe43 Merge "[adb-wireless] Add Wireless Debugging Switch in Developer options." am: 317c9dc2ca am: fd2e26d4aa 
Change-Id: I741968b993698cf459c670678957276fef68ebbc
 2020-02-21 17:02:44 +00:00
Automerger Merge Worker
fd2e26d4aa Merge "[adb-wireless] Add Wireless Debugging Switch in Developer options." am: 317c9dc2ca 
Change-Id: I8a1f4c22237436e5e2e262a3723c39ae346a87fa
 2020-02-21 16:44:30 +00:00
Joshua Duong
317c9dc2ca Merge "[adb-wireless] Add Wireless Debugging Switch in Developer options." 2020-02-21 16:27:10 +00:00
Joshua Duong
a66bcaae37 Merge "[adb-wireless] Add Wireless Debugging Switch in Developer options." 2020-02-21 16:03:29 +00:00