PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
52,085 Commits 1 Branch 0 Tags
c68ac63585cc0cd8851144da1b1b157b5951ad5c
Commit Graph

52085 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Raff Tsai
c68ac63585 [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: dd7de36bbc -s ours 
am: 079ed79164 -s ours
am skip reason: change_id Ib7b878a23b4a99171c58b5de992fb87feca8a28a with SHA1 fe86a2a51f is in history

Change-Id: I8f4cb70c59e1b348d4d5d1d0a1cd45861da7022e
 2019-05-29 18:54:31 -07:00
Raff Tsai
079ed79164 [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: dd7de36bbc -s ours
am skip reason: change_id Ib7b878a23b4a99171c58b5de992fb87feca8a28a with SHA1 fe86a2a51f is in history

Change-Id: Ifac0cbe2dfe1b76012bf0d7a182f4eeca69a0e06
 2019-05-29 18:49:31 -07:00
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
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
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
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
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
TreeHugger Robot
f010cb4034 Merge "Switch to using an intent for eSIM erasing" into qt-dev 2019-05-29 20:02:48 +00: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
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
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
355340fd7e Merge "Allow renaming inactive subscriptions." into qt-dev 
am: d133a026cd

Change-Id: Ic4d5cc450923ed422ef97761c8a16303a81268dc
 2019-05-29 11:28:42 -07:00
TreeHugger Robot
d133a026cd Merge "Allow renaming inactive subscriptions." into qt-dev 2019-05-29 18:16:40 +00: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
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
750fd083b2 Merge "Add EID as a synonym to SIM status" into qt-dev am: 994d7d63d3 
am: 9ebf7e8ece

Change-Id: If63fdce6d7fd36d5fc4af242bc470e8c96fe2edb
 2019-05-29 10:08:12 -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
TreeHugger Robot
b8f7db90ce Merge "Add snooze notification setting" into qt-dev 2019-05-29 17:03:32 +00:00
Tsung-Mao Fang
fee493adeb Revert "Tweak title for "App content"" am: 685d247730 
am: 6705e45ca6

Change-Id: Ieebc3577674f4fcfc1fa5ab30d75c60fd5b263e8
 2019-05-29 10:00:41 -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
Tsung-Mao Fang
685d247730 Revert "Tweak title for "App content"" 
This reverts commit a00e725b0a.

Reason for revert: The string change only for Google Settings instead of
AOSP.

Test: visual
Bug: 133370964

Change-Id: Ib21bff1abc2fd169f957f10154914f85c71d22d1
 2019-05-29 17:19:36 +08:00
Mill Chen
a5bbb26dfe Add EID as a synonym to SIM status 
We can't use EID as keyword to search for it because EID info is located
in the SIM status dialog in which it's not searchable. EID is added as a
synonym of SIM status to support its search result.

Fixes: 133801685
Test: Settings > Search settings > type "eid"
      then will show "SIM status" search result
Change-Id: I03b49bf6f2951c468440f635d7b211266bb00d83
 2019-05-29 07:36:38 +00:00
Roshan Pius
420d742cd6 Merge "Developer settings: Disable wifi scan throttling" into qt-dev am: 7b2897ff93 
am: 0fbbad92f9

Change-Id: Ic1f2742209a59f1e30db7d272e10f38eaaac8493
 2019-05-28 16:31:29 -07:00
Roshan Pius
0fbbad92f9 Merge "Developer settings: Disable wifi scan throttling" into qt-dev 
am: 7b2897ff93

Change-Id: Idae682080e9d4ca0151132fbbcf23f3280f72d3f
 2019-05-28 16:25:30 -07:00
Amin Shaikh
be0002232e Merge "Remove theming developer settings." into qt-r1-dev 
am: aa3ae7291a

Change-Id: Ife40a74dfa89279aba3cf10a79fe7c6044824344
 2019-05-28 16:25:06 -07:00
TreeHugger Robot
aa3ae7291a Merge "Remove theming developer settings." into qt-r1-dev 2019-05-28 23:20:22 +00:00
Roshan Pius
7b2897ff93 Merge "Developer settings: Disable wifi scan throttling" into qt-dev 2019-05-28 23:13:03 +00:00
Amit Mahajan
e0285703b2 Allow renaming inactive subscriptions. 
Test: manual
Bug: 132922483
Change-Id: I30b4b88ddf53b917081a57bd9a917a51b4b44ec6
 2019-05-28 16:03:55 -07:00
Antony Sargent
c6e07c61d0 Switch to using an intent for eSIM erasing 
We initially landed support for erasing an eSIM subscription in
ag/7208624 for b/124254555 using our own confirmation/progress UI, and
calling the EuiccManager.deleteSubscription method to do the
deletion. It turns out this is a low-level API which doesn't handle some
important cases such as subscription grouping or the eSIM slot not being
active.

This CL changes Settings to just launch an intent to begin an eSIM
Manager flow to delete a subscription that provides its own
confirmation/progress UI, and should properly handle subscription
grouping and making the eSIM slot active as needed.

Bug: 132114333
Test: make RunSettingsRoboTests
Change-Id: Ie59fea37fa73c5e6573e1181e271ffb5d453bd08
 2019-05-28 15:31:51 -07:00
Antony Sargent
f880b098ac Merge "Add signal strength icons to multi-SIM header" into qt-dev am: 42c451610e 
am: d7bcf57ed8

Change-Id: Ida8e91d65ebee421ab899b5d5199c911d6dfe1e8
 2019-05-28 15:06:03 -07:00
Antony Sargent
d7bcf57ed8 Merge "Add signal strength icons to multi-SIM header" into qt-dev 
am: 42c451610e

Change-Id: Ice796e09d1821dedb0ad00ff8218afd1be205374
 2019-05-28 14:58:09 -07:00
TreeHugger Robot
42c451610e Merge "Add signal strength icons to multi-SIM header" into qt-dev 2019-05-28 21:54:12 +00:00
tmfang
5fc70637d3 Merge "Tweak title for "App content"" into qt-dev am: e40b0f7b8a 
am: f3327de8af

Change-Id: I5cc4c19cf855b50afb4d4b889286dd05305eb5ac
 2019-05-28 13:53:58 -07:00
tmfang
f3327de8af Merge "Tweak title for "App content"" into qt-dev 
am: e40b0f7b8a

Change-Id: Ic5b178957533091e409fbd1bf84807ab7cac3193
 2019-05-28 13:48:29 -07:00
TreeHugger Robot
e40b0f7b8a Merge "Tweak title for "App content"" into qt-dev 2019-05-28 20:31:51 +00:00
Fan Zhang
a61902963b Merge "Fix transparent view issue in page "Erase all data"" into qt-dev am: 317597ae6a 
am: 7c96c6549a

Change-Id: I2c197d0e68e5ad1039b7b4d03aaecc14a30055af
 2019-05-28 12:50:58 -07:00