PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
62,741 Commits 1 Branch 0 Tags
e23b91a9b386a9a080eaca27d7ddef44965900c0
Commit Graph

62741 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Julia Reynolds
e23b91a9b3 Merge "Notification history updates" into rvc-dev am: 8d3741fbca am: 31f9705a60 am: 7cad4c67df am: 465b7a2c95 
Change-Id: I39da1000218400d1c1253f5f42e88ba981fb8d04
 2020-03-24 21:59:32 +00:00
Julia Reynolds
465b7a2c95 Merge "Notification history updates" into rvc-dev am: 8d3741fbca am: 31f9705a60 am: 7cad4c67df 
Change-Id: I8babab360e43c5b28fd307ea3478510fa3d2d298
 2020-03-24 21:41:35 +00:00
Julia Reynolds
7cad4c67df Merge "Notification history updates" into rvc-dev am: 8d3741fbca am: 31f9705a60 
Change-Id: Iddede304e44b2526287d15a56acda47420855532
 2020-03-24 21:25:51 +00:00
Julia Reynolds
31f9705a60 Merge "Notification history updates" into rvc-dev am: 8d3741fbca 
Change-Id: If1386c89f4e0e90c84d57950351509c2b9a4173f
 2020-03-24 21:16:41 +00:00
Julia Reynolds
8d3741fbca Merge "Notification history updates" into rvc-dev 2020-03-24 21:07:35 +00:00
Julia Reynolds
8222a9a650 Notification history updates 
- New strings
- Fix a crash

Test: manual
Fixes: 151833727
Change-Id: I3b0ef5cd9b221be917c71043e5217a43bc5891d0
 2020-03-24 09:25:58 -04:00
TreeHugger Robot
2a29ae13c2 Merge "Re-enable ignored tests" into rvc-dev am: 87c0179c01 am: 875b0df3dd am: ed3f4c9d98 am: bc63cbf00b am: da46a71e30 
Change-Id: I57e227c75c59bbb173ed6e3ddc5f5b159cc54309
 2020-03-24 13:23:49 +00:00
Automerger Merge Worker
f966c9616e Merge "Merge "Re-enable ignored tests" into rvc-dev am: 87c0179c01 am: 168fe82aa5" into rvc-d1-dev-plus-aosp am: 0aec76e8ef am: 67cefa4b86 
Change-Id: I53bed3f4e036e04cb28dc927bab5640432509a99
 2020-03-24 13:23:33 +00:00
TreeHugger Robot
da46a71e30 Merge "Re-enable ignored tests" into rvc-dev am: 87c0179c01 am: 875b0df3dd am: ed3f4c9d98 am: bc63cbf00b 
Change-Id: I66284bc3fb8652aa233781b32be77778792121f2
 2020-03-24 13:23:28 +00:00
TreeHugger Robot
d18f4d248a Merge "Re-enable ignored tests" into rvc-dev am: 87c0179c01 am: 875b0df3dd am: 8247c93340 am: a76db9ae4c 
Change-Id: I57140ea1858a0b35d7c1f04031947eb99bbdc8a0
 2020-03-24 13:23:22 +00:00
Automerger Merge Worker
67cefa4b86 Merge "Merge "Re-enable ignored tests" into rvc-dev am: 87c0179c01 am: 168fe82aa5" into rvc-d1-dev-plus-aosp am: 0aec76e8ef 
Change-Id: Ic51e107ede190eab18b52672db751322ec445e3d
 2020-03-24 13:11:49 +00:00
TreeHugger Robot
bc63cbf00b Merge "Re-enable ignored tests" into rvc-dev am: 87c0179c01 am: 875b0df3dd am: ed3f4c9d98 
Change-Id: I5341052f7220a84b802fa800aeb86e7195e7e8f0
 2020-03-24 13:11:31 +00:00
TreeHugger Robot
a76db9ae4c Merge "Re-enable ignored tests" into rvc-dev am: 87c0179c01 am: 875b0df3dd am: 8247c93340 
Change-Id: Ia544421a79194d127311eb73e55960257862e137
 2020-03-24 13:11:30 +00:00
Automerger Merge Worker
0aec76e8ef Merge "Merge "Re-enable ignored tests" into rvc-dev am: 87c0179c01 am: 168fe82aa5" into rvc-d1-dev-plus-aosp 2020-03-24 12:49:51 +00:00
TreeHugger Robot
ed3f4c9d98 Merge "Re-enable ignored tests" into rvc-dev am: 87c0179c01 am: 875b0df3dd 
Change-Id: I79a8ebd1fd0fe103749fdbc7047b6ce9c7202b4a
 2020-03-24 12:49:48 +00:00
TreeHugger Robot
59f6f58fb5 Merge "Re-enable ignored tests" into rvc-dev am: 87c0179c01 am: 168fe82aa5 
Change-Id: Id7bf4ef08d686fac188855f200b361ce5b86f0d0
 2020-03-24 12:49:47 +00:00
TreeHugger Robot
8247c93340 Merge "Re-enable ignored tests" into rvc-dev am: 87c0179c01 am: 875b0df3dd 
Change-Id: I3f58f0252146a954d4d14a9b40e5cd12b50c496b
 2020-03-24 12:49:41 +00:00
TreeHugger Robot
168fe82aa5 Merge "Re-enable ignored tests" into rvc-dev am: 87c0179c01 
Change-Id: Ie80135ad3fe7078fee32de117e2c543e7c3de83a
 2020-03-24 12:36:43 +00:00
TreeHugger Robot
875b0df3dd Merge "Re-enable ignored tests" into rvc-dev am: 87c0179c01 
Change-Id: Ie3f31d838d91cf051524e81f1cac87dec0d84add
 2020-03-24 12:35:56 +00:00
TreeHugger Robot
87c0179c01 Merge "Re-enable ignored tests" into rvc-dev 2020-03-24 12:22:11 +00:00
Ben Murdoch
e00acfa56b Merge "Move strings related to user creation to SettingsLib." into rvc-dev am: 7afced3599 am: 7b2154d996 am: ffc010f55e am: 3e74710b10 am: 39796aae1c 
Change-Id: I2f0d4183e5285331b8d5e377a4c8769e49911793
 2020-03-24 11:30:00 +00:00
Automerger Merge Worker
9208aae194 Merge "Merge "Move strings related to user creation to SettingsLib." into rvc-dev am: 7afced3599 am: 7b2154d996" into rvc-d1-dev-plus-aosp am: 1c4765f6ee am: ae81e35a61 
Change-Id: I02920293d0ff89d62557c5391ab3fe935d7b6f1f
 2020-03-24 11:29:00 +00:00
Ben Murdoch
39796aae1c Merge "Move strings related to user creation to SettingsLib." into rvc-dev am: 7afced3599 am: 7b2154d996 am: ffc010f55e am: 3e74710b10 
Change-Id: I838336311d33fde17627f09c7a6a4c1a2774314f
 2020-03-24 11:28:47 +00:00
Ben Murdoch
16398e5564 Merge "Move strings related to user creation to SettingsLib." into rvc-dev am: 7afced3599 am: 63aded6f67 am: cdcf827947 am: 7c7b42d06d 
Change-Id: I03fb1a0f60fac8c8ce9260331894b947bf0cd371
 2020-03-24 11:28:22 +00:00
Automerger Merge Worker
ae81e35a61 Merge "Merge "Move strings related to user creation to SettingsLib." into rvc-dev am: 7afced3599 am: 7b2154d996" into rvc-d1-dev-plus-aosp am: 1c4765f6ee 
Change-Id: I74076b7d10f45a3ca56b39c2e76a210a96b7f62a
 2020-03-24 11:13:41 +00:00
Ben Murdoch
7c7b42d06d Merge "Move strings related to user creation to SettingsLib." into rvc-dev am: 7afced3599 am: 63aded6f67 am: cdcf827947 
Change-Id: I5e74700e6ce21ffc21ee1b13200c5741bf476de7
 2020-03-24 11:13:08 +00:00
Ben Murdoch
3e74710b10 Merge "Move strings related to user creation to SettingsLib." into rvc-dev am: 7afced3599 am: 7b2154d996 am: ffc010f55e 
Change-Id: I0665a3cdc28361591859a73748361002fa45d0b5
 2020-03-24 11:13:03 +00:00
Automerger Merge Worker
1c4765f6ee Merge "Merge "Move strings related to user creation to SettingsLib." into rvc-dev am: 7afced3599 am: 7b2154d996" into rvc-d1-dev-plus-aosp 2020-03-24 10:57:38 +00:00
Ben Murdoch
55ee7603e5 Merge "Move strings related to user creation to SettingsLib." into rvc-dev am: 7afced3599 am: 7b2154d996 
Change-Id: I199ea1ad09f5aaef63ffc9312d058a5c452e53d5
 2020-03-24 10:57:28 +00:00
Ben Murdoch
ffc010f55e Merge "Move strings related to user creation to SettingsLib." into rvc-dev am: 7afced3599 am: 7b2154d996 
Change-Id: I08d7d6d5d17356c1903a814c68e572a7851657e0
 2020-03-24 10:57:24 +00:00
Ben Murdoch
cdcf827947 Merge "Move strings related to user creation to SettingsLib." into rvc-dev am: 7afced3599 am: 63aded6f67 
Change-Id: I6fec6b405557e9ad69ff875e890591be9a6d8d02
 2020-03-24 10:57:24 +00:00
Ben Murdoch
7b2154d996 Merge "Move strings related to user creation to SettingsLib." into rvc-dev am: 7afced3599 
Change-Id: I4a67e3a9d94d63f0cc9cb6942acabd1e9c32b936
 2020-03-24 10:45:49 +00:00
Ben Murdoch
63aded6f67 Merge "Move strings related to user creation to SettingsLib." into rvc-dev am: 7afced3599 
Change-Id: I822c63ede7d0f92dbfe724731350fc140db88ef5
 2020-03-24 10:45:25 +00:00
Ben Murdoch
7afced3599 Merge "Move strings related to user creation to SettingsLib." into rvc-dev 2020-03-24 10:25:21 +00:00
Zoey Chen
14ee313530 [automerger skipped] Merge "Merge "Fixed NullPointerException" am: 5fb16be925 am: cbe5bbdcd5 am: 456b2bf87b am: b301288cd7 am: 036496e2d0" into rvc-dev am: 61b66a28d9 am: 2a0dd6f700 am: 12952db603 am: 775ae6b0fd -s ours am: c961f3d239 -s ours 
am skip reason: Change-Id I6b363bd609d580d547cb59851f5bfaba57ef7154 with SHA-1 2b8bde162f is in history

Change-Id: I7e5f4de04aadfba7401ce4ab77fa3bcc2a0978d5
 2020-03-24 10:13:38 +00:00
Zoey Chen
c961f3d239 [automerger skipped] Merge "Merge "Fixed NullPointerException" am: 5fb16be925 am: cbe5bbdcd5 am: 456b2bf87b am: b301288cd7 am: 036496e2d0" into rvc-dev am: 61b66a28d9 am: 2a0dd6f700 am: 12952db603 am: 775ae6b0fd -s ours 
am skip reason: Change-Id I6b363bd609d580d547cb59851f5bfaba57ef7154 with SHA-1 2b8bde162f is in history

Change-Id: Idc759300e365de090d27e82aababed0725831758
 2020-03-24 10:04:29 +00:00
Zoey Chen
04c8b297c7 [automerger skipped] Merge "Merge "Fixed NullPointerException" am: 5fb16be925 am: cbe5bbdcd5 am: 456b2bf87b am: b301288cd7 am: 036496e2d0" into rvc-dev am: 61b66a28d9 am: c1f1682fbf -s ours am: 03e57ffd43 -s ours am: 7e6f34a300 -s ours 
am skip reason: Change-Id I6b363bd609d580d547cb59851f5bfaba57ef7154 with SHA-1 2b8bde162f is in history

Change-Id: Ib008edd4d35d518257aa2b1d477595d19dea48ff
 2020-03-24 10:04:22 +00:00
Zoey Chen
4af48a3a16 [automerger skipped] Merge "Merge "Fixed NullPointerException" am: 5fb16be925 am: cbe5bbdcd5 am: 456b2bf87b am: b301288cd7 am: 036496e2d0" into rvc-dev am: 61b66a28d9 am: 2a0dd6f700 am: c79289a585 am: fbf27aaf20 -s ours 
am skip reason: Change-Id I6b363bd609d580d547cb59851f5bfaba57ef7154 with SHA-1 7c62cbd97e is in history

Change-Id: I69eebcab794139a48e9977e8b0150da28747616c
 2020-03-24 10:04:15 +00:00
Zoey Chen
7e6f34a300 [automerger skipped] Merge "Merge "Fixed NullPointerException" am: 5fb16be925 am: cbe5bbdcd5 am: 456b2bf87b am: b301288cd7 am: 036496e2d0" into rvc-dev am: 61b66a28d9 am: c1f1682fbf -s ours am: 03e57ffd43 -s ours 
am skip reason: Change-Id I6b363bd609d580d547cb59851f5bfaba57ef7154 with SHA-1 2b8bde162f is in history

Change-Id: I225ac40b48c65512c7ec594c80fa391599a728dd
 2020-03-24 09:56:18 +00:00
Zoey Chen
775ae6b0fd Merge "Merge "Fixed NullPointerException" am: 5fb16be925 am: cbe5bbdcd5 am: 456b2bf87b am: b301288cd7 am: 036496e2d0" into rvc-dev am: 61b66a28d9 am: 2a0dd6f700 am: 12952db603 
Change-Id: Ia58afd40f773cb257267263639c1911d4e1fd086
 2020-03-24 09:55:50 +00:00
Zoey Chen
fbf27aaf20 Merge "Merge "Fixed NullPointerException" am: 5fb16be925 am: cbe5bbdcd5 am: 456b2bf87b am: b301288cd7 am: 036496e2d0" into rvc-dev am: 61b66a28d9 am: 2a0dd6f700 am: c79289a585 
Change-Id: I7cc552df9ddd490fc2c3a99dd3b925fa6ccca3cf
 2020-03-24 09:55:50 +00:00
Zoey Chen
03e57ffd43 [automerger skipped] Merge "Merge "Fixed NullPointerException" am: 5fb16be925 am: cbe5bbdcd5 am: 456b2bf87b am: b301288cd7 am: 036496e2d0" into rvc-dev am: 61b66a28d9 am: c1f1682fbf -s ours 
am skip reason: Change-Id I6b363bd609d580d547cb59851f5bfaba57ef7154 with SHA-1 2b8bde162f is in history

Change-Id: I5b266f4a55981afc9f1ebf2da326e6edcea4a783
 2020-03-24 09:33:33 +00:00
Zoey Chen
12952db603 Merge "Merge "Fixed NullPointerException" am: 5fb16be925 am: cbe5bbdcd5 am: 456b2bf87b am: b301288cd7 am: 036496e2d0" into rvc-dev am: 61b66a28d9 am: 2a0dd6f700 
Change-Id: I3a69d760a434d24130fad2abf4a5150a31087970
 2020-03-24 09:33:31 +00:00
Zoey Chen
c79289a585 Merge "Merge "Fixed NullPointerException" am: 5fb16be925 am: cbe5bbdcd5 am: 456b2bf87b am: b301288cd7 am: 036496e2d0" into rvc-dev am: 61b66a28d9 am: 2a0dd6f700 
Change-Id: I26dda4b26362bb94c48e1ad439af536d0353df16
 2020-03-24 09:33:08 +00:00
Zoey Chen
c1f1682fbf Merge "Merge "Fixed NullPointerException" am: 5fb16be925 am: cbe5bbdcd5 am: 456b2bf87b am: b301288cd7 am: 036496e2d0" into rvc-dev am: 61b66a28d9 
Change-Id: I2cf40657d94d445a3582f7b64f6e02dbf8e77aa2
 2020-03-24 09:16:42 +00:00
Zoey Chen
2a0dd6f700 Merge "Merge "Fixed NullPointerException" am: 5fb16be925 am: cbe5bbdcd5 am: 456b2bf87b am: b301288cd7 am: 036496e2d0" into rvc-dev am: 61b66a28d9 
Change-Id: I75a262c21d215f8669c81056b581c5ffd734accb
 2020-03-24 09:16:28 +00:00
Zoey Chen
61b66a28d9 Merge "Merge "Fixed NullPointerException" am: 5fb16be925 am: cbe5bbdcd5 am: 456b2bf87b am: b301288cd7 am: 036496e2d0" into rvc-dev 2020-03-24 09:05:00 +00:00
Arc Wang
5e65a6b786 Merge changes from topic "Fix ignored tests in WifiDetailPreferenceController2Test" into rvc-dev am: e4b0989766 am: f47f38c9a2 am: 6799768b24 am: 30966bffbc am: 3d40321d82 
Change-Id: I52473bdd5a475f73a0f3eb54a90d1c49c3b7b709
 2020-03-24 08:50:58 +00:00
Arc Wang
3d40321d82 Merge changes from topic "Fix ignored tests in WifiDetailPreferenceController2Test" into rvc-dev am: e4b0989766 am: f47f38c9a2 am: 6799768b24 am: 30966bffbc 
Change-Id: I79d74a0a2ce91b6189950333c85e0c7b631b46c0
 2020-03-24 08:33:31 +00:00
Automerger Merge Worker
2503511ae8 Merge "Merge changes from topic "Fix ignored tests in WifiDetailPreferenceController2Test" into rvc-dev am: e4b0989766 am: f47f38c9a2" into rvc-d1-dev-plus-aosp am: 5616f7632b am: 4a96bbb66d 
Change-Id: I819663835fcad40a924bf4ad5377374394474568
 2020-03-24 08:29:24 +00:00