PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
67,536 Commits 1 Branch 0 Tags
cedaad7fcc15343abfabddaf0d288220f04b05a6
Commit Graph

67536 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Automerger Merge Worker
cedaad7fcc Merge "Merge "Fix wrong line break in sub text on Bug report handler settings" into rvc-dev am: f1fb7fb7cf am: 4da1f84e33 am: 5cbb7a1eb7" into rvc-qpr-dev-plus-aosp 2020-05-27 05:37:39 +00:00
Paul Chang
ada3762118 Merge "Fix wrong line break in sub text on Bug report handler settings" into rvc-dev am: f1fb7fb7cf am: 4da1f84e33 am: 5cbb7a1eb7 
Change-Id: If217693ff6e0e0e72c3e899b5bfe86f1034fd106
 2020-05-27 05:37:35 +00:00
Paul Chang
47272f8cab Merge "Fix wrong line break in sub text on Bug report handler settings" into rvc-dev am: f1fb7fb7cf am: 4da1f84e33 am: 988b6fb813 
Change-Id: Ifefb16748f19b2b4fb74d14b8fd24f8b432c156e
 2020-05-27 05:37:32 +00:00
Paul Chang
988b6fb813 Merge "Fix wrong line break in sub text on Bug report handler settings" into rvc-dev am: f1fb7fb7cf am: 4da1f84e33 
Change-Id: Id0fc26c1bec4dd87b3ea5b5eda8a207465074461
 2020-05-27 05:16:21 +00:00
Paul Chang
5cbb7a1eb7 Merge "Fix wrong line break in sub text on Bug report handler settings" into rvc-dev am: f1fb7fb7cf am: 4da1f84e33 
Change-Id: I6eba1bc2cc500179579ab19b800b107d6be59845
 2020-05-27 05:16:20 +00:00
Paul Chang
4da1f84e33 Merge "Fix wrong line break in sub text on Bug report handler settings" into rvc-dev am: f1fb7fb7cf 
Change-Id: I8708a3ea80d1d030347a932c3d676ecf88c1d8bb
 2020-05-27 04:58:51 +00:00
Paul Chang
f1fb7fb7cf Merge "Fix wrong line break in sub text on Bug report handler settings" into rvc-dev 2020-05-27 04:46:21 +00:00
Automerger Merge Worker
70067d5c8c Merge "Merge "Create new WifiEntryPreference if WifiEntry object changes" into rvc-dev am: 6d93851386 am: 6c0e4e9e48 am: 3ba8caae95" into rvc-qpr-dev-plus-aosp 2020-05-27 04:29:14 +00:00
TreeHugger Robot
57dde34962 Merge "Create new WifiEntryPreference if WifiEntry object changes" into rvc-dev am: 6d93851386 am: 6c0e4e9e48 am: 3ba8caae95 
Change-Id: I19c1ee5f41777a829749e30dd587a12d4d63897a
 2020-05-27 04:29:10 +00:00
TreeHugger Robot
498c52c1ca Merge "Create new WifiEntryPreference if WifiEntry object changes" into rvc-dev am: 6d93851386 am: eb1f444fb1 am: 0c009aab13 
Change-Id: I13cd271f9769063b66547d2d77e16092eecc75f0
 2020-05-27 04:29:09 +00:00
TreeHugger Robot
74ffadfc24 Merge "Create new WifiEntryPreference if WifiEntry object changes" into rvc-dev am: 6d93851386 am: 6c0e4e9e48 am: 99b295c285 
Change-Id: I98d5554058226c1ae8ebc715ac1acd17efa35ab9
 2020-05-27 04:29:02 +00:00
TreeHugger Robot
0c009aab13 Merge "Create new WifiEntryPreference if WifiEntry object changes" into rvc-dev am: 6d93851386 am: eb1f444fb1 
Change-Id: I2f2c654d85306d405769bc1626202a03d6fb1f39
 2020-05-27 04:17:28 +00:00
TreeHugger Robot
3ba8caae95 Merge "Create new WifiEntryPreference if WifiEntry object changes" into rvc-dev am: 6d93851386 am: 6c0e4e9e48 
Change-Id: I26d740dfda098abe5be5cf90fc27d4f0a22dd704
 2020-05-27 04:17:14 +00:00
TreeHugger Robot
99b295c285 Merge "Create new WifiEntryPreference if WifiEntry object changes" into rvc-dev am: 6d93851386 am: 6c0e4e9e48 
Change-Id: Ibbf5efba18de6266f64a822dc022ede299c5ac60
 2020-05-27 04:17:14 +00:00
TreeHugger Robot
6c0e4e9e48 Merge "Create new WifiEntryPreference if WifiEntry object changes" into rvc-dev am: 6d93851386 
Change-Id: Idc6fe44f5c60e9bc82b6209a832b3d574e72a47a
 2020-05-27 04:00:47 +00:00
TreeHugger Robot
eb1f444fb1 Merge "Create new WifiEntryPreference if WifiEntry object changes" into rvc-dev am: 6d93851386 
Change-Id: I98da412048dc0dbe100826809173763c70d7a15e
 2020-05-27 04:00:38 +00:00
TreeHugger Robot
6d93851386 Merge "Create new WifiEntryPreference if WifiEntry object changes" into rvc-dev 2020-05-27 03:46:25 +00:00
Treehugger Robot
74c0a8c209 [automerger skipped] Merge "Fix NPE if CarrierConfigManager is not available" am: d01838d8ce am: 6ea2228e31 -s ours am: 5d03f7d60f -s ours am: 6cefd1c525 -s ours 
am skip reason: Change-Id Iecf3e385a88d18c7578eb520449f4042324e21f5 with SHA-1 e6fae38169 is in history

Change-Id: Ic138f677e92b12ce71116a7f2fc9d3c6a60ac4d7
 2020-05-27 02:20:48 +00:00
Treehugger Robot
6cefd1c525 [automerger skipped] Merge "Fix NPE if CarrierConfigManager is not available" am: d01838d8ce am: 6ea2228e31 -s ours am: 5d03f7d60f -s ours 
am skip reason: Change-Id Iecf3e385a88d18c7578eb520449f4042324e21f5 with SHA-1 e6fae38169 is in history

Change-Id: Id9b46e36d8665e6a2a15686ace384c05edc5ecff
 2020-05-27 02:12:18 +00:00
Treehugger Robot
5d03f7d60f [automerger skipped] Merge "Fix NPE if CarrierConfigManager is not available" am: d01838d8ce am: 6ea2228e31 -s ours 
am skip reason: Change-Id Iecf3e385a88d18c7578eb520449f4042324e21f5 with SHA-1 e6fae38169 is in history

Change-Id: Ib8683709fc213875d6e9357544b54bb404effc3e
 2020-05-27 02:03:37 +00:00
Treehugger Robot
6ea2228e31 Merge "Fix NPE if CarrierConfigManager is not available" am: d01838d8ce 
Change-Id: I5ff6cfcf79cfeec14571ae4f34ea74fd658025d3
 2020-05-27 01:52:00 +00:00
Treehugger Robot
d01838d8ce Merge "Fix NPE if CarrierConfigManager is not available" 2020-05-27 01:36:46 +00:00
Brad Ebinger
525a07ec7f Fix NPE if CarrierConfigManager is not available 
Fixes: 155147094
Fixes: 155819375
Test: m RunSettingsRoboTests ROBOTEST_FILTER=com.android.settings.network.telephony
Change-Id: Iecf3e385a88d18c7578eb520449f4042324e21f5
Merged-In: Iecf3e385a88d18c7578eb520449f4042324e21f5
 2020-05-26 15:50:41 -07:00
TreeHugger Robot
15a5d85ba0 [automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-d1-dev am: 209c1ebbaf -s ours am: daf783ef1b -s ours 
am skip reason: subject contains skip directive

Change-Id: Idbcb3559dd133d765e13b888b3614c7be93873bb
 2020-05-26 18:43:48 +00:00
TreeHugger Robot
416025d9cb [automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-d1-dev am: 209c1ebbaf -s ours am: 1aeb24b04c -s ours 
am skip reason: subject contains skip directive

Change-Id: I1bf6b3afaadc3a7f44b069020ac14c9fe3945838
 2020-05-26 18:38:51 +00:00
TreeHugger Robot
bbacebb475 [automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-d1-dev am: c6efa831c1 -s ours am: 4791614cc8 -s ours 
am skip reason: subject contains skip directive

Change-Id: I03e0f9a4f6072d69177f74014e8be46f1e08f527
 2020-05-26 18:38:35 +00:00
TreeHugger Robot
1aeb24b04c [automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-d1-dev am: 209c1ebbaf -s ours 
am skip reason: subject contains skip directive

Change-Id: I05e4192ecbce3aa066f82a3220cbc1aab8c4c4fc
 2020-05-26 18:37:21 +00:00
TreeHugger Robot
daf783ef1b [automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-d1-dev am: 209c1ebbaf -s ours 
am skip reason: subject contains skip directive

Change-Id: Ib8f8c750cba19e395efd692f750734fb0bed8857
 2020-05-26 18:37:19 +00:00
TreeHugger Robot
dc90982241 [automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-d1-dev am: c6efa831c1 -s ours am: d852aa4cc1 -s ours 
am skip reason: subject contains skip directive

Change-Id: Ia3246481999502078128fcf31fbbc42f3d01b9a9
 2020-05-26 18:37:12 +00:00
TreeHugger Robot
209c1ebbaf Merge "Import translations. DO NOT MERGE" into rvc-d1-dev 2020-05-26 18:25:43 +00:00
TreeHugger Robot
4791614cc8 [automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-d1-dev am: c6efa831c1 -s ours 
am skip reason: subject contains skip directive

Change-Id: I50bf5aae6d67a6e48450993102d032cfb07174e5
 2020-05-26 18:18:32 +00:00
TreeHugger Robot
d852aa4cc1 [automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-d1-dev am: c6efa831c1 -s ours 
am skip reason: subject contains skip directive

Change-Id: I4237cf2fb6634fd9b1981d6d673d2edc405cd673
 2020-05-26 18:18:26 +00:00
TreeHugger Robot
c6efa831c1 Merge "Import translations. DO NOT MERGE" into rvc-d1-dev 2020-05-26 18:05:31 +00:00
Automerger Merge Worker
0014daef07 Merge "Merge "Close and disable SIM lock dialogs when SIM removed from device." into rvc-dev am: 5c7f6d1b98 am: 8e8386c677" into rvc-d1-dev-plus-aosp am: 8eabaefd5d 
Change-Id: I9a97c3d11905995102bf06f3debb914e7b5c88cc
 2020-05-26 17:41:25 +00:00
Grace Jia
127357e532 Merge "Close and disable SIM lock dialogs when SIM removed from device." into rvc-dev am: 5c7f6d1b98 am: f29da1c2e7 am: 3f0d810913 
Change-Id: I1b80c78856082c14476cf0d51e08ba5e05f3c538
 2020-05-26 17:41:00 +00:00
Grace Jia
fb719ecfc8 Merge "Close and disable SIM lock dialogs when SIM removed from device." into rvc-dev am: 5c7f6d1b98 am: 8e8386c677 am: 224812552e 
Change-Id: I7c786a4480d58caecf407129997c593dc1741509
 2020-05-26 17:28:17 +00:00
Automerger Merge Worker
8eabaefd5d Merge "Merge "Close and disable SIM lock dialogs when SIM removed from device." into rvc-dev am: 5c7f6d1b98 am: 8e8386c677" into rvc-d1-dev-plus-aosp 2020-05-26 17:21:31 +00:00
Grace Jia
3f0d810913 Merge "Close and disable SIM lock dialogs when SIM removed from device." into rvc-dev am: 5c7f6d1b98 am: f29da1c2e7 
Change-Id: I422bea8785a02bcb68fb2d944099711393da0180
 2020-05-26 17:21:21 +00:00
Grace Jia
6c794a43bc Merge "Close and disable SIM lock dialogs when SIM removed from device." into rvc-dev am: 5c7f6d1b98 am: 8e8386c677 
Change-Id: I91a833771ed23ba08cd04aa309de3a2c23bee5de
 2020-05-26 17:21:11 +00:00
Grace Jia
224812552e Merge "Close and disable SIM lock dialogs when SIM removed from device." into rvc-dev am: 5c7f6d1b98 am: 8e8386c677 
Change-Id: I93ec678c89b048896e23a98a18cb33615b68b364
 2020-05-26 17:21:08 +00:00
Grace Jia
8e8386c677 Merge "Close and disable SIM lock dialogs when SIM removed from device." into rvc-dev am: 5c7f6d1b98 
Change-Id: I91349e1d1051aadd264d60f48d32076629ad8a88
 2020-05-26 17:08:09 +00:00
Grace Jia
f29da1c2e7 Merge "Close and disable SIM lock dialogs when SIM removed from device." into rvc-dev am: 5c7f6d1b98 
Change-Id: Iecbd2c0627c28b68e76440cc2430e753a95fc94b
 2020-05-26 17:08:06 +00:00
Grace Jia
5c7f6d1b98 Merge "Close and disable SIM lock dialogs when SIM removed from device." into rvc-dev 2020-05-26 16:52:42 +00:00
Edgar Wang
bc52524fff Merge "Change AppPicker theme from dialog to full screen" into rvc-dev am: f3ad1ec7b7 am: 857867b809 am: 8b10ab93d8 
Change-Id: I481139120b5c13fd461b31725fa09a9aa46becd9
 2020-05-26 15:32:28 +00:00
Automerger Merge Worker
97b605a58d Merge "Merge "Change AppPicker theme from dialog to full screen" into rvc-dev am: f3ad1ec7b7 am: e72f014903 am: 331e53aae7" into rvc-qpr-dev-plus-aosp 2020-05-26 15:32:13 +00:00
Edgar Wang
d97852db97 Merge "Change AppPicker theme from dialog to full screen" into rvc-dev am: f3ad1ec7b7 am: e72f014903 am: 331e53aae7 
Change-Id: I0aac80e6d9108dc7624551f6079c614a380bf004
 2020-05-26 15:32:05 +00:00
Edgar Wang
f446e34b15 Merge "Change AppPicker theme from dialog to full screen" into rvc-dev am: f3ad1ec7b7 am: e72f014903 am: 335ee91cae 
Change-Id: Ie6db2d1987c3d6964cdd09ed18a75a48367449e3
 2020-05-26 15:32:04 +00:00
Edgar Wang
8b10ab93d8 Merge "Change AppPicker theme from dialog to full screen" into rvc-dev am: f3ad1ec7b7 am: 857867b809 
Change-Id: I5273e41730d30b028389e2191d5fdca85fc29164
 2020-05-26 15:17:16 +00:00
Edgar Wang
335ee91cae Merge "Change AppPicker theme from dialog to full screen" into rvc-dev am: f3ad1ec7b7 am: e72f014903 
Change-Id: I6a453a9a4c17e7fb99250e37ebb81f9a1c5f415a
 2020-05-26 15:17:02 +00:00
Edgar Wang
331e53aae7 Merge "Change AppPicker theme from dialog to full screen" into rvc-dev am: f3ad1ec7b7 am: e72f014903 
Change-Id: I332b929c79d275251bcc5ee5a516cda4c094171d
 2020-05-26 15:17:01 +00:00