PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
54,908 Commits 1 Branch 0 Tags
9d49e1b51ff357fc499d027ea993e5c7a66fca5c
Commit Graph

54908 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Raff Tsai
a046c5cc68 [automerger skipped] Merge "Do not allow draw on top for App notification settings" into oc-mr1-dev am: b95361ab60 -s ours am: 8837b15f78 -s ours am: 93aed56281 -s ours 
am: 6d531e67ac -s ours
am skip reason: change_id Ib7b878a23b4a99171c58b5de992fb87feca8a28a with SHA1 fe86a2a51f is in history

Change-Id: I7afa3704627a2c69424874940d655f44eb0fab6f
 2019-05-29 18:48:27 -07:00
Raff Tsai
dd7de36bbc [automerger skipped] Merge "Do not allow draw on top for App notification settings" into oc-dev am: 811229a2fd am: fd058ab872 -s ours am: 3fb5933880 -s ours 
am: 08672ec74e -s ours
am skip reason: change_id Ib7b878a23b4a99171c58b5de992fb87feca8a28a with SHA1 fe86a2a51f is in history

Change-Id: I1f06a8e5c931e789518ea1a751a93ecfc73a9090
 2019-05-29 18:44:27 -07:00
Raff Tsai
6d531e67ac [automerger skipped] Merge "Do not allow draw on top for App notification settings" into oc-mr1-dev am: b95361ab60 -s ours am: 8837b15f78 -s ours 
am: 93aed56281 -s ours
am skip reason: change_id Ib7b878a23b4a99171c58b5de992fb87feca8a28a with SHA1 fe86a2a51f is in history

Change-Id: I4f9a572f60d6233d55a3ef973c34c85b33700fdd
 2019-05-29 18:40:47 -07:00
Raff Tsai
08672ec74e [automerger skipped] Merge "Do not allow draw on top for App notification settings" into oc-dev am: 811229a2fd am: fd058ab872 -s ours 
am: 3fb5933880 -s ours
am skip reason: change_id Ib7b878a23b4a99171c58b5de992fb87feca8a28a with SHA1 9fa8329b02 is in history

Change-Id: I68b1c3e845c9f8cff305583b6cd19869e36cc027
 2019-05-29 18:40:29 -07:00
Raff Tsai
3e6af30847 [automerger skipped] Merge "Do not allow draw on top for App notification settings" into oc-mr1-dev am: b95361ab60 -s ours am: 8837b15f78 -s ours 
am: 93aed56281 -s ours
am skip reason: change_id Ib7b878a23b4a99171c58b5de992fb87feca8a28a with SHA1 fe86a2a51f is in history

Change-Id: Ic8675a751a6efde129338108c318d4f75ab75518
 2019-05-29 18:38:38 -07:00
Raff Tsai
3fb5933880 [automerger skipped] Merge "Do not allow draw on top for App notification settings" into oc-dev am: 811229a2fd 
am: fd058ab872 -s ours
am skip reason: change_id Ib7b878a23b4a99171c58b5de992fb87feca8a28a with SHA1 e4800786cf is in history

Change-Id: I7fbd29f4d72fda672e986f12d17e37bee1b89e4b
 2019-05-29 18:35:24 -07:00
Raff Tsai
93aed56281 [automerger skipped] Merge "Do not allow draw on top for App notification settings" into oc-mr1-dev am: b95361ab60 -s ours 
am: 8837b15f78 -s ours
am skip reason: change_id Ib7b878a23b4a99171c58b5de992fb87feca8a28a with SHA1 fe86a2a51f is in history

Change-Id: Iaee4509328c45e5405edc1bae475d2e1cf5f4ba7
 2019-05-29 18:33:23 -07:00
Raff Tsai
fd058ab872 Merge "Do not allow draw on top for App notification settings" into oc-dev 
am: 811229a2fd

Change-Id: Ie5ed40b8f573b974850234987bacc5ae7db925a4
 2019-05-29 18:30:24 -07:00
Raff Tsai
8837b15f78 [automerger skipped] Merge "Do not allow draw on top for App notification settings" into oc-mr1-dev 
am: b95361ab60 -s ours
am skip reason: change_id Ib7b878a23b4a99171c58b5de992fb87feca8a28a with SHA1 9fa8329b02 is in history

Change-Id: I66e6f4f24bd7349db363f28f0462d16825e544c8
 2019-05-29 18:28:27 -07:00
TreeHugger Robot
811229a2fd Merge "Do not allow draw on top for App notification settings" into oc-dev 2019-05-30 01:14:19 +00:00
TreeHugger Robot
b95361ab60 Merge "Do not allow draw on top for App notification settings" into oc-mr1-dev 2019-05-30 01:11:01 +00:00
Raff Tsai
30a308599b [automerger skipped] Merge "Do not allow draw on top for App notification settings" into pi-dev am: 4d01717c14 -s ours am: d08b633e28 -s ours 
am: 9da6ed05d9 -s ours
am skip reason: change_id Ib7b878a23b4a99171c58b5de992fb87feca8a28a with SHA1 fe86a2a51f is in history

Change-Id: I8cfafba599e2b035183a51c717e415e749230bf8
 2019-05-29 17:43:55 -07:00
Raff Tsai
23c6ead2c9 [automerger skipped] Merge "Do not allow draw on top for App notification settings" into pi-dev am: 4d01717c14 -s ours am: d08b633e28 -s ours 
am: a9d597f911 -s ours
am skip reason: change_id Ib7b878a23b4a99171c58b5de992fb87feca8a28a with SHA1 fe86a2a51f is in history

Change-Id: Ia9a84f135beb5f7e5cd4debe51920a100dcfb95b
 2019-05-29 17:40:26 -07:00
Raff Tsai
34862d102e [automerger skipped] Merge "Do not allow draw on top for App notification settings" into pi-dev am: 4d01717c14 -s ours am: d08b633e28 -s ours 
am: a9d597f911 -s ours
am skip reason: change_id Ib7b878a23b4a99171c58b5de992fb87feca8a28a with SHA1 fe86a2a51f is in history

Change-Id: I38ef7a4ec9670637a3bd16f484cc88862547d39b
 2019-05-29 17:39:47 -07:00
Raff Tsai
9da6ed05d9 [automerger skipped] Merge "Do not allow draw on top for App notification settings" into pi-dev am: 4d01717c14 -s ours 
am: d08b633e28 -s ours
am skip reason: change_id Ib7b878a23b4a99171c58b5de992fb87feca8a28a with SHA1 fe86a2a51f is in history

Change-Id: Id6c85e054c145ef831461a69ed19a85c01b96a7b
 2019-05-29 17:36:52 -07:00
Raff Tsai
a9d597f911 [automerger skipped] Merge "Do not allow draw on top for App notification settings" into pi-dev am: 4d01717c14 -s ours 
am: d08b633e28 -s ours
am skip reason: change_id Ib7b878a23b4a99171c58b5de992fb87feca8a28a with SHA1 fe86a2a51f is in history

Change-Id: Ic89de10d4c3e242a5b5cc442804d26ffbbe8ed72
 2019-05-29 17:31:57 -07:00
Raff Tsai
d08b633e28 [automerger skipped] Merge "Do not allow draw on top for App notification settings" into pi-dev 
am: 4d01717c14 -s ours
am skip reason: change_id Ib7b878a23b4a99171c58b5de992fb87feca8a28a with SHA1 fe86a2a51f is in history

Change-Id: Ifb49814e6f18d000aafb89652ce26e5469ef0fb5
 2019-05-29 17:28:49 -07:00
TreeHugger Robot
4d01717c14 Merge "Do not allow draw on top for App notification settings" into pi-dev 2019-05-30 00:15:17 +00: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
Sunny Shao
bddf5149e5 Fix the crash while tapping "app data usage" as second user 
Second user or guest is limited some mobile network access. We need to check current user
is admin or not to decide the preferece page will be found in search or not.

Bug: 133466016
Fixes: 133466016
Test: Manual test & make RunSettingsRoboTests -j56 ROBOTEST_FILTER=com.android.settings.network

Change-Id: I48d3064a8aa28ac1f2ac699b42a999b9682b1b52
 2019-05-30 06:15:11 +08:00
Colin Cross
e0e22cf2a4 Convert Settings to Android.bp 
See build/soong/README.md for more information.

Test: m checkbuild
Test: m RunSettingsRoboTests
Change-Id: I267534c095c30833f77273dbdb1893b7830ed45d
Merged-In: I267534c095c30833f77273dbdb1893b7830ed45d
 2019-05-29 14:45:30 -07:00
Adam He
83f0d24f67 Profile select only shows with multiple profiles present. 
Bug: 133328247
Change-Id: Id5d03a1aa74f1789c41af37562848603a90db84f
Test: manual verification
 2019-05-29 14:22:22 -07:00
Lei Yu
c89ba29e92 Fix issues in battery usage accounting 
1. In High usage dialog, show top apps based on battery usage, not app
time.
2. Refactor the check for hidden system modules into ShouldHideSipper,
however don't smear it, this is also the current logic before this CL.

Bug: 133445008
Test: RunSettingsRoboTests
Change-Id: I851a1c9ef9b79a934ba0501cd96001f2e450bda4
 2019-05-29 13:57:04 -07:00
Antony Sargent
127f1ebdc1 Merge "Switch to using an intent for eSIM erasing" into qt-dev am: f010cb4034 
am: e4ede480d7

Change-Id: I135d6b54a0c52a4dcc47dbec08bcf69740a0d7e9
 2019-05-29 13:23:14 -07:00
Antony Sargent
694de4f5aa Merge "Switch to using an intent for eSIM erasing" into qt-dev am: f010cb4034 
am: 55ac2d75fc

Change-Id: Ia619de1f58e46ca0e36ed1fa5c7039fbe45d1324
 2019-05-29 13:22:34 -07:00
Antony Sargent
72de2003e3 Merge "Switch to using an intent for eSIM erasing" into qt-dev am: f010cb4034 
am: e4ede480d7

Change-Id: I94d9082b67ccab4c2f34d5be23db151a7f203372
 2019-05-29 13:21:58 -07:00
Antony Sargent
e4ede480d7 Merge "Switch to using an intent for eSIM erasing" into qt-dev 
am: f010cb4034

Change-Id: Ic7ab832ec9997bf50d7b9277dfbd9e50adda9517
 2019-05-29 13:16:31 -07:00
Antony Sargent
55ac2d75fc Merge "Switch to using an intent for eSIM erasing" into qt-dev 
am: f010cb4034

Change-Id: Ia08496db92bd4a432db729d7734bc3bb3b9d6f0a
 2019-05-29 13:14:42 -07:00
Lei Yu
798b80e5ad Update SliceView when slice is null 
When it is null, we should also update SliceView, so SliceView can
update to be "invisible"

Fixes: 133790296
Test: RunSettingsRoboTests
Change-Id: I239405cce8bcadacbd374ccbb24d0fcbadc04880
 2019-05-29 13:11:57 -07:00
TreeHugger Robot
f010cb4034 Merge "Switch to using an intent for eSIM erasing" into qt-dev 2019-05-29 20:02:48 +00:00
Android Build Merger (Role)
b2a7a2c7bf Merge "Merge "Change title to "Alerting"" into qt-dev am: c64d41fd98 am: 03acd2962e" into qt-r1-dev-plus-aosp 2019-05-29 19:44:29 +00: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
0a06e6ca9b Merge "Change title to "Alerting"" into qt-dev am: c64d41fd98 
am: 03acd2962e

Change-Id: Ie5af78c77a3a40c9a47053d02714f3ad346f3cad
 2019-05-29 12:44:15 -07:00
Evan Laird
89c0cea838 Merge "Change title to "Alerting"" into qt-dev am: c64d41fd98 
am: f7ad71aab2

Change-Id: I1cda8875095d33653ffef77ef077a3c19bd689eb
 2019-05-29 12:44:14 -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
Amit Mahajan
e7c821a58d Merge "Allow renaming inactive subscriptions." into qt-dev am: d133a026cd 
am: 355340fd7e

Change-Id: If2fe3bfa6f4a4b78f818feb5dcf14b00415541ce
 2019-05-29 11:38:00 -07:00
Amit Mahajan
6d44aa5680 Merge "Allow renaming inactive subscriptions." into qt-dev am: d133a026cd 
am: 355340fd7e

Change-Id: Id71dc4661fba528adda9ba49edfb5001da46fd57
 2019-05-29 11:37:55 -07:00
Amit Mahajan
7670329876 Merge "Allow renaming inactive subscriptions." into qt-dev am: d133a026cd 
am: 38b3a56364

Change-Id: I565cca6519096a3b757a1c990d2cd6fb6e1f6ab9
 2019-05-29 11:32:05 -07:00
Amit Mahajan
355340fd7e Merge "Allow renaming inactive subscriptions." into qt-dev 
am: d133a026cd

Change-Id: Ic4d5cc450923ed422ef97761c8a16303a81268dc
 2019-05-29 11:28:42 -07:00
Amit Mahajan
38b3a56364 Merge "Allow renaming inactive subscriptions." into qt-dev 
am: d133a026cd

Change-Id: Ifb4aafad705860d12c02ad3d26a3a36019ad9847
 2019-05-29 11:28:13 -07:00
TreeHugger Robot
d133a026cd Merge "Allow renaming inactive subscriptions." into qt-dev 2019-05-29 18:16:40 +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
3077d8418c Merge "Add snooze notification setting" into qt-dev am: b8f7db90ce 
am: 75d207c364

Change-Id: I56ce68336af7ba504dc86734f8e370a2adb21e5f
 2019-05-29 10:33:19 -07:00
Mill Chen
3ae11224a9 Merge "Add EID as a synonym to SIM status" into qt-dev am: 994d7d63d3 
am: 7d5050f252

Change-Id: I5e026caee2fa852a4c5e4c9ddeab252b6364a9e7
 2019-05-29 10:30:31 -07:00
Julia Reynolds
ea147d788d Merge "Add snooze notification setting" into qt-dev am: b8f7db90ce 
am: 75034e5c20

Change-Id: Ica0a52e8c09471df96c414254fbcc90eae33f2b3
 2019-05-29 10:26:19 -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