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

52861 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Raff Tsai
3bc902adbc [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: Idbf2372cefe12b76aeb9569fd09f54f6d6655afd
 2019-05-29 18:55:21 -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
Android Build Merger (Role)
9d5dbaf4b6 Merge "[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" into qt-r1-dev-plus-aosp 2019-05-30 01:48:59 +00:00
Raff Tsai
0da67bbf43 [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: I255e17faf09a97497de36c8928b7881da12c6f0a
 2019-05-29 18:48:49 -07:00
Raff Tsai
63d79583da [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: 3e6af30847 -s ours
am skip reason: change_id Ib7b878a23b4a99171c58b5de992fb87feca8a28a with SHA1 fe86a2a51f is in history

Change-Id: Ib69f2398c7489eb48583a37c38f8341680ab3096
 2019-05-29 18:48:45 -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
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
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
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
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
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
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
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
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
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
c301af9e32 Merge "Add EID as a synonym to SIM status" into qt-dev am: 994d7d63d3 
am: 9ebf7e8ece

Change-Id: I216cdc46be00d554c30a203588ccba505ffceb70
 2019-05-29 10:09:20 -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
Mill Chen
7d5050f252 Merge "Add EID as a synonym to SIM status" into qt-dev 
am: 994d7d63d3

Change-Id: If6eefc766dd97858b424ffcd2387106dbd270de9
 2019-05-29 10:04:24 -07:00
TreeHugger Robot
b8f7db90ce Merge "Add snooze notification setting" into qt-dev 2019-05-29 17:03:32 +00:00
Tsung-Mao Fang
7a794c3720 Revert "Tweak title for "App content"" am: 685d247730 
am: 6705e45ca6

Change-Id: I92db1e82bd8df3db0bcb1717e9c8632a615c6d4e
 2019-05-29 09:59:36 -07:00
Tsung-Mao Fang
103ac2d568 Revert "Tweak title for "App content"" am: 685d247730 
am: 8456765698

Change-Id: Ieda932a1ac2ef8ea8f03a3c3a293f5d9380150a4
 2019-05-29 09:57:04 -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